jufubao-base 1.0.169-beta20 → 1.0.169-beta22

package/package.json

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

package/src/components/JfbBaseLogin/Attr.js

@@ -775,6 +775,16 @@ export default {
         className: "input70",
         hidden: data.previewCurrent !== "account",
       },
+      {
+        label: '密码图标:',
+        ele: "el-input",
+        valueKey: "passwordIcon",
+        value: data.passwordIcon || "",
+        groupKey:'style',
+        placeholder: "请输入密码图标",
+        className: "input70",
+        hidden: data.previewCurrent !== "account",
+      },
       {
         label: "标签字体样式设置:",
         ele: "xd-font",

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -175,6 +175,7 @@
               class="form-item"
               :class="[inputStyle]"
               label="密码"
+              :leftIcon="passwordIcon"
               :labelWidth="labelWidth"
               content-align="left"
             >
@@ -398,6 +399,7 @@ export default {
       },
       phoneIcon: "", //手机号登录输入框图标
       codeIcon: "", //验证码登录输入框图标
+      passwordIcon: "", //密码登录输入框图标
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
       formBorderWidth: 1, //表单边框宽度
@@ -658,6 +660,7 @@ export default {
       this.authBtnPadding = getContainerPropsValue(value, "content.authBtnPadding", {top: 20, left: 20, right: 20, bottom: 20});
       this.phoneIcon = getContainerPropsValue(value, "content.phoneIcon", '');
       this.codeIcon = getContainerPropsValue(value, "content.codeIcon", '');
+      this.passwordIcon = getContainerPropsValue(value, "content.passwordIcon", '');
       this.inputStyle = getContainerPropsValue(value, "content.inputStyle", 'linear');
       this.formBorderColor = getContainerPropsValue(value, "content.formBorderColor", '#F9F9F9');
       this.formBorderWidth = getContainerPropsValue(value, "content.formBorderWidth", '1');

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

@@ -198,7 +198,6 @@
         valid_token: "",
         formRenderKey: "formRenderKey",
         hasCon: "", //是否有优惠券
-        jwxSDK: null,
        
         //todo
         tips: "",
@@ -269,7 +268,8 @@
     },
     computed: {
       ...mapState({
-        brandInfo: state => state.brandInfo
+        brandInfo: state => state.brandInfo,
+        jwxSDK: (state) => state.jwxSDK,
       }),
       cardFormStyle(){
         let padding = `${this.checkValue(this.formPadding.top, 20)}rpx`;
@@ -377,15 +377,21 @@
       this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
       this.valid_token = this.$xdUniHelper.randomChar(20);
       //todo
-      // #ifdef H5
-      jfbRootExec("getH5WxAuthorize", {
-        vm: this,
-        data: {
-          jsApiList: ["chooseWXPay"],
-        }
-      }).then(res => {
-        this.jwxSDK = res.jwxSDK;
-      })
+      //#ifdef H5
+      if (!this.$configProject.isPreview) {
+        jfbRootExec("getH5WxAuthorize", {
+          vm: this,
+          data: {site_id: "wx_pub"},
+        })
+          .then(res => {
+            console.log(0)
+          })
+          .catch(error=>{
+            this.$xdAlert({
+              content: error,
+            });
+          })
+      }
       // #endif
     },
     methods: {
@@ -461,6 +467,7 @@
       },
       switchShowType(type){
         this.menuType = type;
+        this.formRenderKey = Date.now();
       },
       handlerAfterBindCard(res){
         //已绑定卡券处理
@@ -582,21 +589,47 @@
         let valid_token = this.$xdUniHelper.randomChar(20);
         this.valid_token = valid_token;
       },
+      p_qrCardBind(result){
+        jfbRootExec("qrCardBind", {
+          vm: this,
+          data: {
+            card_qrcode: result,
+            is_show_pop: "Y"
+          }
+        }).then(res => {
+          console.log(res);
+          this.handlerAfterBindCard(res)
+        }).catch(err => {
+          console.log(err);
+          this.$xdLog.catch(err)
+        })
+      },
       doScanCode(){
         console.log("开始扫码");
         // #ifdef H5
         this.jwxSDK.scanQRCode({
           needResult: 1,
+          scanType: ["qrCode"],
           success: res => {
-            this.$set(this.form, 'card_number', res.resultStr)
+            // this.$set(this.form, 'card_number', res.resultStr)
+            this.p_qrCardBind(res.resultStr)
+          },
+          fail: (error) => {
+            if (typeof error === 'string') error = {error: error}
+            if (window['jwxJfbSDKParams']) error = Object.assign(error, window['jwxJfbSDKParams'])
+            this.$xdLog.setARMSError(error)
           }
         })
         // #endif
         // #ifdef MP
         uni.scanCode({
           success: res => {
-            this.$set(this.form, 'card_number', res.result)
-          }
+            // this.$set(this.form, 'card_number', res.result)
+            this.p_qrCardBind(res.result)
+          },
+          fail: (error) => {
+            this.$xdLog.setARMSError(error)
+          },
         })
         // #endif
       },

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -109,7 +109,7 @@
               <view v-if="!hasCardList" class="no_more_card" @click="toDisableUrl">没有更多券了，查看失效的票券 ></view>
             </view>
             <view v-else>
-              暂无数据
+              <!-- 暂无数据 -->
             </view>
           </view>
         </template>

package/src/components/JfbBaseTfkCardLogin/XdNotice.vue

@@ -55,7 +55,7 @@
                 <xd-content-xss
                   v-for="(item, i) in contentList"
                   :key="item.content_id"
-                  :html="item.content"
+                  :html="$xdUniHelper.filterHtml(item.content)"
                   :font-sizes="fontSize"
                   style="display: flex;align-items: center;"
                 ></xd-content-xss>
@@ -114,7 +114,7 @@
               <view class="xd-xss_wrap">
                 <xd-content-xss
                   :key="contentKey"
-                  :html="content"
+                  :html="$xdUniHelper.filterHtml(content)"
                   :font-sizes="fontSize"
                   style="display: flex;align-items: center;"
                 ></xd-content-xss>

package/src/components/JfbBaseTfkSearch/AllList.vue

@@ -51,7 +51,7 @@
         <view v-for="(item, i) in parent.items" :key="item.key"
           class="module_cont_inner"
           :style="[moduleItemContStyle, {
-            width: getProductCell(parent.tab) == 2 ? `calc(50% - ${allStyle.allModuleItemContMargin/2}rpx)`: '100%',
+            width: getProductCell(parent.tab) == 2 ? `calc(50% - ${listItemStyle.outSpacing/2}rpx)`: '100%',
           }]"
         >
           <content-product v-if="parent.type === 'product'"
@@ -151,32 +151,19 @@
         return this.styleObjectToString(style);
       },
       moduleItemContStyle(){
-        let {
-          allModuleItemContBorder, allModuleItemContShadow, allModuleItemContPadding, allModuleItemContMargin,
-          allModuleItemContRadius, allModuleItemContBgColor
-        } = this.allStyle;
-        let border = "none";
-        let boxShadow = "none";
-        if(allModuleItemContBorder && allModuleItemContBorder.type === 'Y'){
-          let { width, color } = allModuleItemContBorder.value;
-          border = `${width}rpx solid ${color}`;
-        }
-        if(allModuleItemContShadow && allModuleItemContShadow.type === 'Y'){
-          let { width, color } = allModuleItemContShadow.value;
-          boxShadow = `0 0 ${width}rpx ${color}`;
-        }
-        let padding = `${this.checkValue(allModuleItemContPadding.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(allModuleItemContPadding.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(allModuleItemContPadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(allModuleItemContPadding.left, 20)}rpx`;
-        console.log("allModuleItemContShadow", allModuleItemContShadow)
+        const { contBgColor, contShadow, contBorder, contMargin, contRradius, outSpacing } = this.listItemStyle;
+    
+        let padding = `${this.checkValue(contMargin.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(contMargin.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(contMargin.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(contMargin.left, 20)}rpx`;
         return this.styleObjectToString({
           padding: padding,
-          border: border,
-          borderRadius: allModuleItemContRadius + 'rpx',
-          boxShadow: boxShadow,
-          marginBottom: allModuleItemContMargin + 'rpx',
-          background: allModuleItemContBgColor,
+          border: contBorder,
+          borderRadius: contRradius + 'rpx',
+          boxShadow: contShadow,
+          marginBottom: outSpacing + 'rpx',
+          background: contBgColor,
         })
       },
       moduleMoreStyle(){

package/src/components/JfbBaseTfkSearch/Attr.js

@@ -239,83 +239,83 @@ 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: "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: '选择综合入口类型:',