jufubao-base 1.0.297-beta2 → 1.0.297-beta23

package/package.json

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

package/src/components/JfbBaseChangeCompany/JfbBaseChangeCompany.vue

@@ -10,7 +10,9 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-change-company__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-change-company__edit-icon" @click="delEdit"
+        >删除</view
+      >
     </view>
     <!-- #endif -->
     <view class="jfb-base-change-company__body">

package/src/components/JfbBaseChoseCompany/JfbBaseChoseCompany.vue

@@ -10,7 +10,9 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-chose-company__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-chose-company__edit-icon" @click="delEdit"
+        >删除</view
+      >
     </view>
     <!-- #endif -->
     <view
@@ -255,11 +257,9 @@ export default {
           company_source_from: item.company_source_from,
         },
       }).then((res) => {
-
         //#ifdef MP-WEIXIN
         if (this.jfbAuthorize !== null) {
-          this.jfbAuthorize.setAllToken(res);//只返回用户登陆信息，无卡登陆信息
-          this.jfbAuthorize.removeAllCardToken();
+          this.jfbAuthorize.setAllToken(res);
         }
         //#endif
 

package/src/components/JfbBaseConsumpCode/Attr.js

@@ -1,108 +1,20 @@
 'use strict';
+import style from "./cusAttr/style";
+import advanced from "./cusAttr/advanced";
+import content from "./cusAttr/content";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style: [],
-  content: (data) => {
+  advanced: [],
+  content: (data, gValue, gColor, oldData={})=>{
+
     return [
-      {
-        label: "是否展示优先支付账户：",
-        ele: "xd-radio",
-        valueKey: "isShowPaySoft",
-        value: data.isShowPaySoft || "N",
-        groupKey: "content",
-        list: [
-          { label: "展示", value: "Y" },
-          { label: "不展示", value: "N" }
-        ]
-      },
-      {
-        label: '背景图片:', //label
-        ele: 'xd-upload', //package 名称
-        valueKey: 'bodyBgImg', //form[valueKey]
-        value: data.bodyBgImg || null, //v-model
-        defaultValue: data.bodyBgImg || null, //默认图片对象
-        groupKey: "content",
-        slot: true, //按钮是否使用slot
-        oneWidth: 200, //单个图片显示宽度
-        oneHeight: 350, //单个图片显示高度
-        elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
-        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
-        size: 5, //5M
-        action: 'aliyun',
-        sort: true, //当上传图片列表时候，是否启用排序
-        maxlen: 100, //当上传图片列表时候，最大数量数量
-        rules: [
-          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
-        ]
-      },
-      {
-        label: '开通路径:',
-        groupKey:'advanced',
-        className: 'input100',
-        ele: 'xd-select-pages-path',
-        valueKey: 'openPath',
-        value: data['openPath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-      },
-      {
-        label: '切换门店路径:',
-        groupKey:'advanced',
-        className: 'input100',
-        ele: 'xd-select-pages-path',
-        valueKey: 'shopPath',
-        value: data['shopPath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-      },
-      {
-        label: '支付成功跳转路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'successPath',
-        value: data.successPath || null,
-        placeholder: '请选择支付成功跳转路径',
-        className: 'input100',
-        groupKey:'advanced',
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-        inline: false,
-      },
-      {
-        label: '核销支付路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'cash_pay_path',
-        placeholder: '请选择核销支付路径',
-        value: data.cash_pay_path || null,
-        className: 'input100',
-        groupKey:'advanced',
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-        inline: false,
-      },
-      {
-        label: '选取城市路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'cityPath',
-        placeholder: '请选择选取城市路径',
-        value: data.cityPath || null,
-        className: 'input100',
-        groupKey:'advanced',
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-        inline: false,
-      },
+      ...content(data, gValue,gColor,oldData),
+      ...style(data, gValue,gColor,oldData),
+      ...advanced(data),
     ].filter(i=>i)
   },
-  advanced: [],
 };

package/src/components/JfbBaseConsumpCode/JHDMixin.js

@@ -0,0 +1,176 @@
+'use strict';
+import { jfbRootExec } from "@/utils/xd.event";
+export default {
+  data() {
+    return {
+      settle_tag_list: [],
+      settle_tag_list_status: false,
+      tag_id: "",
+      price: "",
+      total_price: "",
+      num: 1,
+    }
+  },
+  computed: {
+    curTag() {
+      return this.settle_tag_list.find(item => item.value === this.tag_id) || {}
+    },
+    curTagPrice() {
+      const curTag = this.curTag;
+      if (this.$xdUniHelper.isEmpty(curTag)) return 0;
+      if (curTag.is_static_price) {
+        return curTag.price_yuan;
+      } else {
+        return this.total_price;
+      }
+    },
+  },
+  methods: {
+    // 核销金额输入框事件
+    handlerPrice(e) {
+      this.$nextTick(() => {
+        this.total_price = e.detail.value.replace(/^\D*([0-9]\d*\.?\d{0,2})?.*$/, '$1');
+        if (this.total_price > 10000) {
+          this.total_price = 10000
+          uni.showToast(
+            {
+              title: '核销金额不能超过10000',
+              icon: 'none'
+            }
+          )
+        }
+      })
+    },
+    //选卡弹出项
+    useCardPop(data) {
+      return new Promise((resolve, reject) => {
+        uni.showModal({
+          title: '提示',
+          content: data.msg,
+          // confirmText: data.confirm_text,
+          // cancelText: data.cancel_text,
+          success: function (res) {
+            if (res.confirm) {
+              resolve(2);
+            } else if (res.cancel) {
+              resolve();
+            }
+          },
+          fail: function (res) {
+            reject(res);
+          }
+        });
+      })
+    },
+    //聚好兑 - 创建临时订单数据，并跳转支付页面
+    toPayOrder(options = {}) {
+      let { tag_id, total_price, curTag, num = 1, shop_id } = this;
+      let err_tip = "";
+      if (!curTag.is_static_price) this.price = total_price;
+      if (curTag.is_static_price) {
+        if (total_price > 10000) {
+          err_tip = '金额不能超过10000'
+        }
+      }
+      let price = this.price;
+      if (!price) err_tip = "请填写正确的提货金额";
+      if (!tag_id) err_tip = "请选择结算标签";
+      if (err_tip) {
+        uni.showToast({
+          title: err_tip,
+          icon: 'none'
+        });
+        return false;
+      }
+      if (this.total_price == 0) {
+        uni.showToast(
+          {
+            title: '核销金额不能为0',
+            icon: 'none'
+          }
+        )
+        return
+      }
+      jfbRootExec("addConsumpCashierTempOrderData", {
+        vm: this,
+        data: {
+          shop_id: this.shop_id,
+          settle_tag_id: this.tag_id,
+          num: this.num,
+          settle_tag_price: this.curTagPrice,
+          total_price: this.total_price,
+          ...options
+        }
+      })
+        .then(res => {
+          if (res.confirm_notice) {
+            return this.useCardPop(res).then(data => {
+              if (data == 2) {
+                this.toPayOrder({
+                  is_ignore_unique_check: "Y"
+                })
+              }
+            })
+          } else {
+            this.price = "";
+            let params = {
+              ...this.options,
+              price: price,
+              num: num,
+              tag: tag_id,
+              shop_id: shop_id,
+              cart_order_id: res.cart_order_id
+            };
+            params = this.$xdUniHelper.jsonToParams(params)
+            this.$xdUniHelper.navigateTo({
+              url: this.cashPayPath + `?${params}`
+            })
+          }
+        })
+        .catch(error => {
+          console.error(error);
+        })
+    },
+    //固定标签数量变化
+    handleNumberChange(num) {
+      let curTag = this.curTag;
+      this.total_price = this.$xdUniHelper.multiplyFloatNumber(curTag.price_yuan, num);
+    },
+    //选择核销标签
+    handlerTagRadio(item) {
+      this.tag_id = item.value;
+      this.canEdit = !item.is_static_price;
+      this.num = 1;
+      if (item.is_static_price) {
+        this.total_price = item.price_yuan
+        this.price = item.price_yuan
+      } else {
+        this.total_price = "";
+        this.price = "";
+      }
+    },
+    //门店核销 - 展示主界面数据 - 核销标签列表
+    getSettleTagList() {
+      this.$xdShowLoading({});
+
+      jfbRootExec("getConsumpSettleMainInfo", {
+        vm: this,
+        data: {
+          shop_id: this.shop_id,
+        }
+      }).then(res => {
+        this.$xdHideLoading();
+        const { settle_tag_list } = res;
+        this.settle_tag_list = settle_tag_list;
+        if (settle_tag_list.length > 0) {
+          this.handlerTagRadio(settle_tag_list[0]);
+          this.settle_tag_list_status = false;
+        }
+        else this.settle_tag_list_status = true;
+      }).catch(err => {
+        this.$xdHideLoading();
+        this.$xdLog.catch(error)
+      })
+    },
+  }
+}