jufubao-base 1.0.297-beta23 → 1.0.298

package/src/components/JfbBaseConsumpCode/Mock.js

@@ -1,220 +1,22 @@
-"use strict";
+'use strict';
 
 module.exports = {
-  getConsumpCode: {
-    payment_code: "h.161.v80313631074495",
-    expiration_time: 1763083163,
-    expiration_sec: 60,
-    temp_order_id: "quickpay-5000433-XhWJn-MdO8Iheuu6lgSAX",
-    confirm_notice: true,
-    notice: "请询问店员核销金额",
-    cash_order_id: "",
-    code_url:
-      "/common/v1/image/qrcode?code_content=h.161.v80313631074495&size=240",
-    plus_discount: 8100,
-    is_st_flow: "Y",
-    barcode_url: "/common/v1/image/barcode?code_content=h.161.v80313631074495",
-    shop_name: "分账测试门店-固定标签",
-    resource_shop_name: "分账测试门店-固定标签",
-    qrcode_icon:
-      "https://img1.jufubao.cn/uploads/20230802/7a4f98f153282ef1cb089393c5b7f64e.png?x-oss-process=style/size8&ver=1735028642567",
-    shop_icon: "/uploads/20230710/44f645b06fe4da358f7b0ee06259afcd.jpg",
-    consume_options: [
-      {
-        consume_mode: "WB",
-        desc: "到店扫码消费任意金额可用",
-        icon: "iconduihuan",
-        show_price: ""
-      },
-      {
-        consume_mode: "JHD",
-        desc: "到店消费任意金额可用",
-        icon: "iconduihuan",
-        show_price: ""
-      },
-      {
-        consume_mode: "QP",
-        desc: "到店展码消费任意金额可用",
-        icon: "iconduihuan",
-        show_price: ""
-      }
-    ],
-    default_consume_type: "QP",
-    request_id: "3346ee37f1347085"
-  },
 
-  getConsumpCodeScanStatus: {
-    status: "P",
-    message: "",
-    order_data:
-      '{"total_amount":"0","pay_expire_time":"0","message":"","status":"P","cash_order_id":"","user_id":"5000358","channel_order_id":"","cart_order_id":""}',
-    seconds: 0,
-    request_id: "a54ac53ad31312d6"
-  },
+  getConsumpCode: { "payment_code": "h.161.v71913434717194", "expiration_time": 1744971193, "expiration_sec": 60, "temp_order_id": "quickpay-5000358-DBeMnvrvInuINYeTqbCXw", "confirm_notice": false, "notice": "", "cash_order_id": "", "code_url": "\/common\/v1\/image\/qrcode?code_content=h.161.v71913434717194&size=240", "plus_discount": 0, "is_st_flow": "张三", "barcode_url": "\/common\/v1\/image\/barcode?code_content=h.161.v71913434717194", "shop_name": "六九豆浆饺子(石门市场店)", "request_id": "52ebf80c255ebcb5" },
 
-  getConsumpListUserPayChannel: {
-    list: [
-      {
-        channel_provider_id: "1rRq74ACKJj5nIx5CgLpb",
-        channel_provider_name: "微信",
-        channel_code: "wxpay",
-        channel_logo:
-          "https://jfb-public-images.oss-cn-qingdao.aliyuncs.com/system-paychannel-logo-wxpay.png?x-oss-process=style/200_200"
-      }
-    ],
-    request_id: "e142d26c3d24c060"
-  },
+  getConsumpCodeScanStatus: { "status": "P", "message": "", "order_data": "{\"total_amount\":\"0\",\"pay_expire_time\":\"0\",\"message\":\"\",\"status\":\"P\",\"cash_order_id\":\"\",\"user_id\":\"5000358\",\"channel_order_id\":\"\",\"cart_order_id\":\"\"}", "seconds": 0, "request_id": "a54ac53ad31312d6" },
 
-  batchConsumpUseCardCreated: {
-    request_order_id: "quickpay-5000358-DBeMnvrvInuINYeTqbCXw",
-    request_id: "e17499843ece44b1"
-  },
+  getConsumpListUserPayChannel: { "list": [{ "channel_provider_id": "1rRq74ACKJj5nIx5CgLpb", "channel_provider_name": "微信", "channel_code": "wxpay", "channel_logo": "https:\/\/jfb-public-images.oss-cn-qingdao.aliyuncs.com\/system-paychannel-logo-wxpay.png?x-oss-process=style\/200_200" }], "request_id": "e142d26c3d24c060" },
 
-  getConsumpAsyncSubmitStatus: {
-    hand_status: "U",
-    hand_status_msg: "异步下单中",
-    order_id: "",
-    pay_order_id: "",
-    need_pay_price: "0",
-    request_id: "fddff0af4216825d"
-  },
+  batchConsumpUseCardCreated: { "request_order_id": "quickpay-5000358-DBeMnvrvInuINYeTqbCXw", "request_id": "e17499843ece44b1" },
 
-  getConsumpShopList: {
-    categories: [
-      { label: "商超", value: 100518 },
-      { label: "蛋糕店", value: 100519 }
-    ],
-    namespaces: [{ label: "蛋糕(勿改)", value: "cake" }],
-    brands: [
-      {
-        label: "测试1111",
-        value: 14,
-        icon: "/uploads/20230324/3265afeb6a1f2a94f25c968a09275574.png"
-      },
-      {
-        label: "好利来",
-        value: 3,
-        icon: "/uploads/20230524/b18190a6d80ae31a84a1ed53fc0dc8aa.jpg"
-      }
-    ],
-    list: [
-      {
-        brand_id: 14,
-        brand_name: "测试1111",
-        brand_type: "MA",
-        business_status: "OPEN_BUSINESS",
-        consume_mode: ["SELL"],
-        consume_mode_name: "",
-        distance: "37km",
-        distance_conversion: "36.8km",
-        default_consume_type: "CV",
-        consume_type: ["CV"],
-        is_support_jhd: false,
-        address: "通州区马驹桥镇北京通州区",
-        province_name: "",
-        city_name: "",
-        area_name: "",
-        street_name: "",
-        phone: "13152565898",
-        resource_shop_id: 8003538,
-        exts_params:
-          "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAzNTM4LCJzaG9wX2lkIjoxMDUwMzQyLCJ2ZXJzaW9uIjoyfQ",
-        resource_shop_name: "新建559",
-        shop_icon:
-          "https://sandbox-img2.jufubao.cn/uploads/20230324/3265afeb6a1f2a94f25c968a09275574.png",
-        shop_id: 1050342,
-        shop_tags: [],
-        stars: 0,
-        time_slot_name: "-",
-        business_code: "",
-        longitude: "116.6634126629373",
-        latitude: "39.91601857510662",
-        discount_ratio: 7200
-      },
-      {
-        brand_id: 14,
-        brand_name: "测试1111",
-        brand_type: "MA",
-        business_status: "CLOSED",
-        consume_mode: ["SELL"],
-        consume_mode_name: "",
-        distance: "38km",
-        distance_conversion: "37.9km",
-        default_consume_type: "CV",
-        consume_type: ["CV"],
-        is_support_jhd: true,
-        address: "顺义区东六环与顺于路交叉口东150米",
-        province_name: "",
-        city_name: "",
-        area_name: "",
-        street_name: "",
-        phone: "(010)89430806",
-        resource_shop_id: 8003489,
-        exts_params:
-          "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAzNDg5LCJzaG9wX2lkIjoxMTUzNTIwLCJ2ZXJzaW9uIjoyfQ",
-        resource_shop_name: "六九豆浆饺子(石门市场店)",
-        shop_icon:
-          "https://sandbox-img2.jufubao.cn/uploads/20230324/3265afeb6a1f2a94f25c968a09275574.png",
-        shop_id: 1153520,
-        shop_tags: [],
-        stars: 0,
-        time_slot_name: "-",
-        business_code: "",
-        longitude: "116.65307505295904",
-        latitude: "40.07088305940431",
-        discount_ratio: 7200
-      }
-    ],
-    total_size: 6,
-    next_page_token: "2",
-    request_id: "d7071936733ed3f5"
-  },
+  getConsumpAsyncSubmitStatus: { "hand_status": "U", "hand_status_msg": "异步下单中", "order_id": "", "pay_order_id": "", "need_pay_price": "0", "request_id": "fddff0af4216825d" },
+  
+  getConsumpShopList: {"categories":[{"label":"商超","value":100518},{"label":"蛋糕店","value":100519}],"namespaces":[{"label":"蛋糕(勿改)","value":"cake"}],"brands":[{"label":"测试1111","value":14,"icon":"\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png"},{"label":"好利来","value":3,"icon":"\/uploads\/20230524\/b18190a6d80ae31a84a1ed53fc0dc8aa.jpg"}],"list":[{"brand_id":14,"brand_name":"测试1111","brand_type":"MA","business_status":"OPEN_BUSINESS","consume_mode":["SELL"],"consume_mode_name":"","distance":"37km","distance_conversion":"36.8km","default_consume_type":"CV","consume_type":["CV"],"is_support_jhd":false,"address":"通州区马驹桥镇北京通州区","province_name":"","city_name":"","area_name":"","street_name":"","phone":"13152565898","resource_shop_id":8003538,"exts_params":"eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAzNTM4LCJzaG9wX2lkIjoxMDUwMzQyLCJ2ZXJzaW9uIjoyfQ","resource_shop_name":"新建559","shop_icon":"https://sandbox-img2.jufubao.cn\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png","shop_id":1050342,"shop_tags":[],"stars":0,"time_slot_name":"-","business_code":"","longitude":"116.6634126629373","latitude":"39.91601857510662","discount_ratio":7200},{"brand_id":14,"brand_name":"测试1111","brand_type":"MA","business_status":"CLOSED","consume_mode":["SELL"],"consume_mode_name":"","distance":"38km","distance_conversion":"37.9km","default_consume_type":"CV","consume_type":["CV"],"is_support_jhd":true,"address":"顺义区东六环与顺于路交叉口东150米","province_name":"","city_name":"","area_name":"","street_name":"","phone":"(010)89430806","resource_shop_id":8003489,"exts_params":"eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAzNDg5LCJzaG9wX2lkIjoxMTUzNTIwLCJ2ZXJzaW9uIjoyfQ","resource_shop_name":"六九豆浆饺子(石门市场店)","shop_icon":"https://sandbox-img2.jufubao.cn\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png","shop_id":1153520,"shop_tags":[],"stars":0,"time_slot_name":"-","business_code":"","longitude":"116.65307505295904","latitude":"40.07088305940431","discount_ratio":7200}],"total_size":6,"next_page_token":"2","request_id":"d7071936733ed3f5"},
 
-  getConsumpSettleMainInfo: {
-    shop_id: 1037266,
-    shop_logo: "/uploads/20230710/44f645b06fe4da358f7b0ee06259afcd.jpg",
-    shop_name: "a加盟商-185",
-    shop_brand: 100003,
-    shop_partner_name: "A加盟商-余额测试",
-    settle_tag_list: [
-      {
-        label: "幸福西饼、goodlike品牌",
-        value: 262,
-        price: 0,
-        price_yuan: "0.00",
-        is_static_price: false,
-        icon_url:
-          "https://sandbox-img.jufubao.cn/uploads/20230728/70f4dd90cdf2681e71ccf41d332d71a0.jpeg"
-      }
-    ],
-    request_id: "a4a6cfe9db905597"
-  },
+  getConsumpSettleMainInfo: { "shop_id": 1037266, "shop_logo": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_name": "a加盟商-185", "shop_brand": 100003, "shop_partner_name": "A加盟商-余额测试", "settle_tag_list": [{ "label": "幸福西饼、goodlike品牌", "value": 262, "price": 0, "price_yuan": "0.00", "is_static_price": false, "icon_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230728\/70f4dd90cdf2681e71ccf41d332d71a0.jpeg" }], "request_id": "a4a6cfe9db905597" },
 
-  getConsumpBaseUserInfo: {
-    user_name: "",
-    user_code: "WuE5Wotf08",
-    nickname: "张三",
-    real_name: "",
-    head_url:
-      "https://thirdwx.qlogo.cn/mmopen/vi_32/AOqEDeiaxss8GR4jD1GicIgyqWSOZV8xN23Iw3DOzFjVBzTFbdv21X7u9ZASQJYsTNm07XSq6ebzp4K4qu1JT26qGZ0qYFMe1nHdQjFZib83Fg/132",
-    province_code: "",
-    city_code: "",
-    province_name: "",
-    city_name: "",
-    sex: "1",
-    sex_name: "男",
-    birthday_date: "2025-04-16",
-    phone_number: "177****7945",
-    show_user_name: "张三",
-    user_level: "VIP",
-    vip_expire_time: 1776157293,
-    request_id: "f1dbb1c0bb8da893"
-  },
+  getConsumpBaseUserInfo: { "user_name": "", "user_code": "WuE5Wotf08", "nickname": "张三", "real_name": "", "head_url": "https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/AOqEDeiaxss8GR4jD1GicIgyqWSOZV8xN23Iw3DOzFjVBzTFbdv21X7u9ZASQJYsTNm07XSq6ebzp4K4qu1JT26qGZ0qYFMe1nHdQjFZib83Fg\/132", "province_code": "", "city_code": "", "province_name": "", "city_name": "", "sex": "1", "sex_name": "男", "birthday_date": "2025-04-16", "phone_number": "177****7945", "show_user_name": "张三", "user_level": "VIP", "vip_expire_time": 1776157293, "request_id": "f1dbb1c0bb8da893" },
 
-  addConsumpCashierTempOrderData: {
-    cart_order_id: "c08f38347ec8bc5b",
-    request_id: "779bf62e988587ce"
-  },
-
-  getMyPayOrderConfig: {"configs":[{"pay_method":"card","pay_method_name":"会享卡","priority_rules":["end_time","bind_time"],"options":[{"label":"优先使用即将到期","value":"end_time","wallet_amount":0},{"label":"按绑定时间","value":"bind_time","wallet_amount":0}],"wallet_amount":0},{"pay_method":"wallet","pay_method_name":"余额","priority_rules":[],"options":[{"label":"综合元宝","value":"fVun9HAuF47_waUq8F0RA","wallet_amount":0}],"wallet_amount":0}],"request_id":"5365d0f0e73f8c69"}
-};
+  addConsumpCashierTempOrderData: { "cart_order_id": "c08f38347ec8bc5b", "request_id": "779bf62e988587ce" }
+}

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -26,7 +26,10 @@
           </view>
         </view>
         <view v-else class="entry_list" :style="entryStyle">
-          <view v-for="(item,i) in entryList" :key="i"
+          <view
+            v-if="entryList.length > 0"
+            v-for="(item,i) in entryList"
+            :key="i"
             class="entry_item"
             :class="'row_num_'+rowNum"
             @click="toLink(item)"
@@ -35,6 +38,11 @@
             <image v-if="rowNum == 2" :src="item.image_url2" mode="widthFix"/>
             <image v-if="rowNum == 3" :src="item.image_url3" mode="widthFix"/>
           </view>
+          <xd-no-data
+            icon-type="empty"
+            :scale-size="2"
+            v-if="entryList.length === 0"
+          >暂无数据</xd-no-data>
         </view>
       </view>
     </view>
@@ -49,11 +57,13 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import getServiceUrl from "@/common/getServiceUrl";
+  import XdNoData from "@/components/XdNoData/XdNoData.vue";
   import {mapState} from "vuex";
   export default {
     name: "JfbBaseEntry",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdNoData
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseEntryMixin

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -491,6 +491,11 @@
         //登录成功调整地址优先级
         this.inCallback = inCallback || this.allEntryPath || this.settings.index;
 
+        //检查是否为小程序环境
+        //#ifdef H5
+        if(this.jfbAuthorize.checkIsH5ToMpEnv(this, this.inCallback ,'card')) return;
+        // #endif
+
         this.getCardList();
       },
       /**

package/src/components/JfbBaseConsumpCode/JHDMixin.js

@@ -1,176 +0,0 @@
-'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)
-      })
-    },
-  }
-}