jufubao-base 1.0.162-beta5 → 1.0.162-beta7

package/package.json

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

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -268,6 +268,8 @@ export default {
       jfbAuthorize: (state) => state.jfbAuthorize,
     }),
 
+
+
     //布局2特殊样式，布局1在行内样式
     loginStyle(){
       let style = { backgroundColor: '#FFFFFF'};
@@ -275,6 +277,7 @@ export default {
       if(this.login_text_color) style['color'] = this.login_text_color;
       if(this.login_text_bg_color) style['backgroundColor'] = this.login_text_bg_color;
       if(this.login_text_radius) style['borderRadius'] = this.login_text_radius + 'rpx'
+      if(this.cardLayout === '2') return style;
       return  this.styleObjectToString(style);
     },
 
@@ -284,6 +287,7 @@ export default {
       if(this.look_text_color) style['color'] = this.look_text_color;
       if(this.look_text_bg_color) style['backgroundColor'] = this.look_text_bg_color;
       if(this.look_text_radius) style['borderRadius'] = this.look_text_radius + 'rpx';
+      if(this.cardLayout === '2') return style;
       return this.styleObjectToString(style);
     }
   },

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -63,7 +63,7 @@
 
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-import { jfbRootExec } from "@/utils/xd.event";
+import { jfbRootExec, jfbRootFnExec } from "@/utils/xd.event";
 import JfbBaseCardSweepInfoMixin from "./JfbBaseCardSweepInfoMixin";
 import XdButton from "@/components/XdButton/XdButton";
 import XdUnit from "@/components/XdUnit/XdUnit";
@@ -109,6 +109,7 @@ export default {
 
       inCallbackUrlOrg:'',//是否带有回调地址
       is_show_balance: "N", //是否显示余额
+      hasCon: "", //是否有优惠券
     };
   },
   watch: {
@@ -141,6 +142,11 @@ export default {
 
   },
   methods: {
+    toShowCouponDialog(){
+      if(this.info){
+        jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.info.card_number})
+      }
+    },
     handleToLink(path) {
       if (this.pa) {
         jfbRootExec("qrCardBind", {
@@ -150,30 +156,56 @@ export default {
           },
         })
           .then((res) => {
-            this.$xdAlert({
-              content: "绑定成功",
-              close: () => {
-                //#ifdef H5
-                let base = this.jfbAuthorize.getBasePath(this);
-                let url = `${location.origin}${base}${this.backUrl}`;
-                url = this.getUrlCallback(url)
-                this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
+            //有优惠券处理
+            if(this.hasCon){
+              this.toShowCouponDialog();
+              this.$bus.$on("onCloseConDialog",(container_id) => {
+                if(container_id === this.hasCon){
+                  //#ifdef H5
+                  let base = this.jfbAuthorize.getBasePath(this);
+                  let url = `${location.origin}${base}${this.backUrl}`;
+                  url = this.getUrlCallback(url)
+                  this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
 
-                setTimeout(()=>{
-                  window.location.href = url;
-                },50);
-                // #endif
+                  setTimeout(()=>{
+                    window.location.href = url;
+                  },50);
+                  // #endif
 
-                //#ifndef H5
-                let wPath = this.getUrlCallback(this.backUrl)
-                this.$xdUniHelper.redirectTo({
-                  url:wPath,
-                });
-                // #endif
+                  //#ifndef H5
+                  let wPath = this.getUrlCallback(this.backUrl)
+                  this.$xdUniHelper.redirectTo({
+                    url:wPath,
+                  });
+                  // #endif
+                }
+              })
+            } else {
+              this.$xdAlert({
+                content: "绑定成功",
+                close: () => {
+                  //#ifdef H5
+                  let base = this.jfbAuthorize.getBasePath(this);
+                  let url = `${location.origin}${base}${this.backUrl}`;
+                  url = this.getUrlCallback(url)
+                  this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
 
+                  setTimeout(()=>{
+                    window.location.href = url;
+                  },50);
+                  // #endif
 
-              },
-            });
+                  //#ifndef H5
+                  let wPath = this.getUrlCallback(this.backUrl)
+                  this.$xdUniHelper.redirectTo({
+                    url:wPath,
+                  });
+                  // #endif
+
+
+                },
+              });
+            }
           })
           .catch();
       }
@@ -232,6 +264,12 @@ export default {
     onJfbShow(options) {
       this.onJfbLoad(options);
     },
+    onJfbCustomEvent({action, data}){
+      if(action === 'baseConDialog@hasCon'){
+        this.hasCon = data;
+      }
+      console.log('onJfbCustomEvent',action, data);
+    }
   },
 };
 </script>

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -69,11 +69,23 @@
               :color="item.iconColor"
               :icon="item.icon"
             ></xd-font-icon>
-            <view class="btn">
+            <view class="btn" v-if="item.can_take_num!=='Y'">
               <xd-button
+                v-if="item.remain_card_count == 0"
+                size="small"
+                type="primary"
+                :disabled="true"
+                :style="{
+                  backgroundImage: item.btnImage,
+                  backgroundSize: '100% 100%',
+                }"
+                @click="getCoupont(item)"
+                >{{ item.btn_txt }}</xd-button
+              >
+              <xd-button
+                v-else                
                 size="small"
                 type="primary"
-                :disabled="item.remain_card_count == 0"
                 :style="{
                   backgroundImage: item.btnImage,
                   backgroundSize: '100% 100%',

package/src/components/JfbBaseSweep/Api.js

@@ -0,0 +1,13 @@
+'use strict';
+
+/**
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
+ * @type {*[]}
+ */
+module.exports = [];

package/src/components/JfbBaseSweep/Attr.js

@@ -0,0 +1,34 @@
+'use strict';
+
+export default {
+  style: [],
+  advanced: [],
+  content: (data) => {
+    return [
+      {
+        label: '门店核销首页:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'change_url',
+        groupKey:'advanced',
+        placeholder: '请选择门店核销首页跳转路径',
+        value: data.change_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '卡绑定:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'bind_url',
+        groupKey:'advanced',
+        placeholder: '请选择卡绑定跳转路径',
+        value: data.bind_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+    ].filter(i => i)
+  },
+};

package/src/components/JfbBaseSweep/JfbBaseSweep.vue

@@ -0,0 +1,317 @@
+<template>
+  <view
+    class="jfb-base-sweep"
+    @click="handleEditxSelect"
+    :class="{ editx: isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-sweep__edit"
+      :class="{ editx: isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-sweep__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view
+      :style="{ height: layoutInfo.bodyMinHeightRpx + 'rpx' }"
+      class="jfb-base-sweep__body"
+    >
+      <view
+        :style="{ background: backgroundColor, color: warningColor }"
+        class="jfb-base-sweep__body-pop"
+        v-if="isPreview"
+        >设置背景模式方便编辑(占位)，在线上此模块不显</view
+      >
+      <view class="jfb-base-sweep__body-other" v-if="other">
+        <view>
+          <xd-font-icon
+            color="red"
+            size="240"
+            icon="iconmingchengtubiao"
+          ></xd-font-icon>
+          <view class="jfb-base-sweep__body-other-text">无法识别该界面</view>
+        </view>
+        <view class="jfb-base-sweep__body-footer" :style="prod_bottom">
+          <XdButton @click="scan" type="primary" radius="20" width="40%"
+            >重试</XdButton
+          >
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import XdButton from "@/components/XdButton/XdButton";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseSweepMixin from "./JfbBaseSweepMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+import { mapState } from "vuex";
+import { parseNetworkURL } from "@/utils/linkUrl";
+const Color = require("color");
+
+export default {
+  name: "JfbBaseSweep",
+  components: {
+    XdFontIcon,
+    XdButton,
+  },
+  mixins: [componentsMixins, extsMixins, JfbBaseSweepMixin],
+  data() {
+    return {
+      isPreview: false,
+      backgroundColor: "",
+      other: false,
+    };
+  },
+  computed: {
+    ...mapState({
+      jwxSDK: (state) => state.jwxSDK,
+    }),
+    prod_bottom() {
+      return this.fixedStyle({ height: 0, zIndex: 111 });
+    },
+  },
+  watch: {
+    container(value) {
+      this.init(value);
+    },
+    jwxSDK(value) {
+      //#ifdef H5
+      if (value) {
+        this.$xdHideLoading();
+        this.scan();
+      }
+      //#endif
+    },
+  },
+  created() {
+    console.log(this.layoutInfo, "layoutInfo");
+    this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();
+    this.isPreview = this.$configProject["isPreview"];
+    this.init(this.container);
+
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      if (!this.isPreview) {
+        this.$xdShowLoading({});
+        //#ifdef MP-WEIXIN
+        this.$xdHideLoading();
+        this.scan();
+        //#endif
+      }
+    },
+    extractDomain(hostname) {
+      // 匹配并提取顶级域名后的两个标签（例如：.com、.co.uk）
+      const matches = hostname.match(/[^.]+\.[^.]+$/);
+      return matches ? matches[0] : hostname;
+    },
+    handleH5() {
+      // 判断jwxSDK是否为空
+      if (this.jwxSDK !== null) {
+        // 调用jwxSDK的scanQRCode方法，扫描二维码
+        this.jwxSDK.scanQRCode({
+          // 需要返回结果
+          needResult: 1,
+          // 扫描类型为二维码
+          scanType: ["qrCode"],
+          // 扫描成功后的回调函数
+          success: (res) => {
+            // 定义一个变量params，将url按照"?"进行分割，获取到参数部分
+            let params = res.resultStr.split("?")[1]
+              ? res.resultStr.split("?")[1]
+              : "";
+            // 将参数部分按照"&"进行分割，获取到每个参数
+            const queryArr = params.split("&");
+            // 定义一个空对象queryobjArr，用于存储参数
+            let queryobjArr = {};
+            // 遍历参数数组，将参数名和参数值存储到queryobjArr中
+            queryArr.forEach((item, index) => {
+              const Strindex = item.indexOf("=");
+              queryobjArr[item.slice(0, Strindex)] = item.slice(Strindex + 1);
+            });
+            // 判断queryobjArr中是否存在"x-params"参数
+            if (queryobjArr["x-params"]) {
+              // 如果存在，则将参数拼接到url中，并跳转到该url
+              let path = `${this.change_url}?x-params=${queryobjArr["x-params"]}&refrom=official`;
+              this.$xdUniHelper.navigateTo({
+                url: path,
+              });
+              return;
+            }
+            if (queryobjArr["pa"]) {
+              // 如果queryobjArr中有pa属性，则获取pa属性的值，并将其拼接到bind_url后面，然后使用navigateTo方法跳转到该路径
+              let path = `${this.bind_url}?pa=${queryobjArr["pa"]}`;
+              this.$xdUniHelper.navigateTo({
+                url: path,
+              });
+              return;
+            }
+            // 如果res.resultStr是以http或https开头的字符串，则进行以下操作
+            if (/^https?:/.test(res.resultStr)) {
+              // 获取res.resultStr中的host属性
+              let host = this.$xdUniHelper.parseURL(res.resultStr).host;
+              // 获取当前页面的域名
+              let domain = document.domain;
+              // 如果host属性以当前页面的域名结尾，则进行以下操作
+              if (host.substr(-domain.length) === domain) {
+                // 获取res.resultStr的值
+                let path = res.resultStr;
+                // 使用navigateTo方法跳转到该路径
+                this.$xdUniHelper.navigateTo({
+                  url: path,
+                });
+                return;
+              }
+            }
+            this.other = true;
+          },
+          // 扫描失败后的回调函数
+          fail: (error) => {
+            // 如果error是字符串类型，则将其转换为对象类型
+            if (typeof error === "string") error = { error: error };
+            // 如果window["jwxJfbSDKParams"]存在，则将error对象与window["jwxJfbSDKParams"]合并
+            if (window["jwxJfbSDKParams"])
+              error = Object.assign(error, window["jwxJfbSDKParams"]);
+            // 调用$xdLog的setARMSError方法，记录错误信息
+            this.$xdLog.setARMSError(error);
+          },
+        });
+      }
+    },
+    handleMP() {
+      // 调用uni.scanCode方法，扫描二维码
+      uni.scanCode({
+        scanType: ["qrCode"],
+        success: (res) => {
+          // 定义一个变量params，将url按照"?"进行分割，获取到参数部分
+          let params = res.result.split("?")[1] ? res.result.split("?")[1] : "";
+          // 将参数部分按照"&"进行分割，获取到每个参数
+          const queryArr = params.split("&");
+          // 定义一个空对象queryobjArr，用于存储参数
+          let queryobjArr = {};
+          // 遍历参数数组，将参数名和参数值存储到queryobjArr中
+          queryArr.forEach((item, index) => {
+            const Strindex = item.indexOf("=");
+            queryobjArr[item.slice(0, Strindex)] = item.slice(Strindex + 1);
+          });
+          // 判断queryobjArr中是否存在"x-params"参数
+          if (queryobjArr["x-params"]) {
+            // 如果存在，则将参数拼接到url中，并跳转到该url
+            let path = `${this.change_url}?x-params=${queryobjArr["x-params"]}&refrom=official`;
+            this.$xdUniHelper.navigateTo({
+              url: path,
+            });
+            return;
+          }
+          if (queryobjArr["pa"]) {
+            // 如果queryobjArr中有pa属性，则获取pa属性的值，并将其拼接到bind_url后面，然后使用navigateTo方法跳转到该路径
+            let path = `${this.bind_url}?pa=${queryobjArr["pa"]}`;
+            this.$xdUniHelper.navigateTo({
+              url: path,
+            });
+            return;
+          }
+          // 如果res.result是以http或https开头的字符串，则进行以下操作
+          if (/^https?:/.test(res.result)) {
+            // 获取res.result中的host属性
+            let host = parseNetworkURL(res.result).host;
+            // 获取当前页面的域名
+            console.log(host, 2222);
+            let domain = this.extractDomain(this.projectAttr.host);
+            console.log(this.extractDomain(this.projectAttr.host), 333);
+            // 如果host属性以当前页面的域名结尾，则进行以下操作
+            if (host.substr(-domain.length) === domain) {
+              // 获取res.resultStr的值
+              let path = res.result;
+              // 使用navigateTo方法跳转到该路径
+              this.$xdUniHelper.navigateTo({
+                url: path,
+              });
+              return;
+            }
+          }
+          this.other = true;
+        },
+        fail: (error) => {
+          // 如果扫描失败，则调用$xdLog.setARMSError方法记录错误信息
+          this.$xdLog.setARMSError(error);
+        },
+      });
+    },
+    scan() {
+      try {
+        //#ifdef H5
+        this.handleH5();
+        //#endif
+        //#ifdef MP-WEIXIN
+        this.handleMP();
+        //#endif
+      } catch (err) {
+        this.$xdLog.setARMSError(err);
+      }
+    },
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      this.change_url = getContainerPropsValue(
+        container,
+        "content.change_url",
+        { value: "" }
+      ).value;
+      this.bind_url = getContainerPropsValue(container, "content.bind_url", {
+        value: "",
+      }).value;
+    },
+    onJfbShow(options) {
+      console.log("event.onJfbShow", options);
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+@import "./JfbBaseSweepLess.less";
+
+.jfb-base-sweep {
+  &__body {
+    min-height: 100rpx;
+    &-other {
+      display: flex;
+      justify-content: space-between;
+      padding-top: 300rpx;
+      align-items: center;
+      flex-direction: column;
+      height: 100%;
+      &-text {
+        margin-top: 40rpx;
+        color: #666;
+        font-size: unit(24, rpx);
+        text-align: center;
+      }
+    }
+    &-pop {
+      min-height: 100rpx;
+      text-align: center;
+      vertical-align: middle;
+      color: #666;
+      font-size: unit(24, rpx);
+      line-height: 100rpx;
+    }
+    &-footer {
+      position: fixed;
+      left: 0;
+      right: 0;
+      height: unit(110, rpx);
+    }
+  }
+}
+</style>

package/src/components/JfbBaseSweep/JfbBaseSweepLess.less

@@ -0,0 +1,79 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-sweep {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-sweep {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseSweep/JfbBaseSweepMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-sweep'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseSweep/Mock.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = {}