jufubao-base 1.0.232-beta5 → 1.0.232-beta7

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -12,50 +12,77 @@
     }">
       <view class="content-box">
         <view class="logo-box">
-          <image src="https://img.js.design/assets/img/67e9ea4307c4c2e467435b30.jpeg#d0969ce63b2aef1069a03e984e9acd13"
-            class="logo"></image>
+          <image :src="userInfo['head_url']" class="logo"></image>
         </view>
-        <view v-if="!showMask&&showDialog">
+        <view v-if="isFlow">
           <view @click="handleToShop" class="shop">
-            <view>门店名称</view>
+            <view>{{shopName}}</view>
             <XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
           </view>
-          <image mode="aspectFit" class="bar-code"
-            src="http://www.expba.com/cgi-bin/GInfo.dll?MfcISAPICommand=BarCode&ccode=464564655&ih=60&ntype=10"></image>
-          <view class="bar-code-text">N328490214783094723</view>
-          <image mode="aspectFit" class="qrcode"
-            src="">
-          </image>
-          <view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
-          <view class="vip">
-            <view class="vip-title">
-              <view class="vip-title-left">PLUS会员专享</view>
-              <view class="vip-title-right">
-                <text>8</text>折
+          <view class="verification-item">
+            <view class="verification-item-label">提货标签</view>
+            <view class="verification-item-tags">
+              <view :style="{color:tag_id===item.value?mainColor:'',borderColor: tag_id===item.value?mainColor:''}"
+                v-for="(item,index) in settle_tag_list" :key="index" @click="handlerTagRadio(item)">{{item.label}}
               </view>
             </view>
-            <view class="vip-open" @click="handleToOpen">
-              <xd-font-icon color="#FCBF28" size="20" icon="iconjinhangzhong"></xd-font-icon>
-              <text>立即开通</text>
-              <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
+            <view class="nodata" v-if="settle_tag_list_status">结算标签为空，请联系店员设置后重试</view>
+          </view>
+          <view class="verification-item">
+            <view class="verification-item-label">提货点数</view>
+            <view class="verification-item-input">
+              <input v-model="total_price" @input="(value)=>handlerPrice(value)" type="text">
+              <xd-number v-if="curTag.is_static_price" class="xd-number" :min="1" :max="999" v-model="num"
+                @change="handleNumberChange"></xd-number>
+              <view :style="{color:mainColor}" class="tip">*提货点数请咨询店员，提货成功后无法退换</view>
             </view>
           </view>
+          <XdButton v-if="btnDisabled" style="margin-top: 200rpx" width="260rpx" type="primary" disabled>下一步</XdButton>
+          <XdButton v-else style="margin-top: 200rpx" width="260rpx" type="primary" @click="toPayOrder">下一步</XdButton>
         </view>
-        <view class="mask-box" v-else>
-          <view class="mask">
-            <view class="mask-title">为了给您提供更好的服务需要获取您的位置信息</view>
-            <view class="mask-open">
-              PLUS会员专享 <span :style="{color:mainColor,marginLeft:'8rpx'}">8</span>折 <span @click="handleToOpen"
-                :style="{color:mainColor,marginLeft:'15rpx'}">立即开通</span>
+        <view v-else>
+          <view v-if="!showMask">
+            <view @click="handleToShop" class="shop">
+              <view>{{shopName}}</view>
+              <XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
+            </view>
+            <image mode="aspectFit" class="bar-code" :src="barcode_url">
+            </image>
+            <view class="bar-code-text">{{barCode}}</view>
+            <image mode="aspectFit" class="qrcode" :src="code_url">
+            </image>
+            <view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
+            <view class="vip" v-if="plusDiscount">
+              <view class="vip-title">
+                <view class="vip-title-left">PLUS会员专享</view>
+                <view class="vip-title-right">
+                  <text>{{plusDiscount/1000}}</text>折
+                </view>
+              </view>
+              <view class="vip-open" @click="handleToOpen">
+                <xd-font-icon color="#FCBF28" size="20" icon="iconjinhangzhong"></xd-font-icon>
+                <text>立即开通</text>
+                <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
+              </view>
+            </view>
+          </view>
+          <view class="mask-box" v-else>
+            <view class="mask">
+              <view class="mask-title">{{tip}}</view>
+              <!-- <view class="mask-open">
+                PLUS会员专享 <span :style="{color:mainColor,marginLeft:'8rpx'}">8</span>折 <span @click="handleToOpen"
+                  :style="{color:mainColor,marginLeft:'15rpx'}">立即开通</span>
+              </view> -->
             </view>
           </view>
         </view>
+
       </view>
     </view>
     <XdDialog :show.sync="showDialog" :showClose="false" :showTitle="false">
       <view class="dialog-title" slot="title">门店确认</view>
       <view class="dialog-content">
-        <view>当前门店：<span :style="{color:mainColor}">xxxxxxx门店</span></view>
+        <view>当前门店：<span :style="{color:mainColor}">{{shopName}}</span></view>
         <view>请确认您是否在当前门店中</view>
       </view>
       <view class="dialog-btns" slot="btn">
@@ -72,6 +99,7 @@
   import XdButton from "@/components/XdButton/XdButton";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseConsumpCodeMixin from "./JfbBaseConsumpCodeMixin";
+  import getServiceUrl from "@/common/getServiceUrl";
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
@@ -92,17 +120,33 @@
         openPath: "",
         shopPath: "",
         successPath: "",
+        cashPayPath: "",
         showDialog: false,
-        showMask: false,
+        showMask: true,
         shop_id: '',
         secondTimer: null,
         expiration_sec: '',
         code_url: '',
+        barcode_url: '',
+        barCode: '',
         statusTimer: null,
         validTimer: null,
         payChannels: [],
         channel_provider_id: "",
-        options: {}
+        options: {},
+        canEdit: true,
+        settle_tag_list: [],
+        settle_tag_list_status: false,
+        tag_id: "",
+        price: "",
+        total_price: "",
+        num: 1,
+        tip: '',
+        shopName: '',
+        isFlow: false,
+        xnamespace: '',
+        plusDiscount: 0,
+        userInfo: {}
       }
     },
     watch: {
@@ -131,28 +175,61 @@
         let sec = second % 60;
         return `${min}分${sec}秒`;
       },
+      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;
+        }
+      },
+      btnDisabled() {
+        return this.total_price === '' || !this.tag_id;
+      }
     },
     created() {
       this.init(this.container);
     },
     methods: {
-      onJfbLoad(options) {
+      async onJfbLoad(options) {
+        this.xnamespace = this.projectAttr.business_code
+        this.getUserInfo()
         this.options = options
         if (!this.isPreview) {
           if (Object.keys(this.stateLocation).length === 0) {
+            this.tip = '为了给您提供更好的服务需要获取您的位置信息'
             this.showMask = true;
             this.showDialog = false;
             return
           }
         }
-        this.shop_id = options.shop_id;
-        if (this.shop_id) {
-          this.showDialog = false;
-          //todo 通过shop_id获取数据
-          this.p_getAsyncStep();
-          this.p_getListUserPayChannel();
+        if (!this.options.shop_id) {
+          jfbRootExec("getConsumpShopList", {
+            vm: this,
+            data: {
+              city_code: this.stateCity.city_code,
+              consume_mode: 'SELL',
+              latitude: this.stateLocation.latitude + '',
+              longitude: this.stateLocation.longitude + '',
+            },
+          }).then(res => {
+            if (res && res.list.length > 0) {
+              this.shop_id = res.list[0].shop_id;
+              this.shopName = res.list[0].resource_shop_name;
+              this.showMask = true;
+              this.showDialog = true;
+            } else {
+              this.tip = '您的附近暂时没有支持的店铺'
+              this.showDialog = false;
+            }
+          })
         } else {
-          this.showDialog = true;
+          this.shop_id = this.options.shop_id;
+          this.p_getAsyncStep();
         }
       },
       /**
@@ -175,14 +252,27 @@
           "content.successPath",
           { value: "" }
         ).value;
+        this.cashPayPath = getContainerPropsValue(container, 'content.cash_pay_path', { value: "" }
+        ).value;
+      },
+      getUserInfo() {
+        jfbRootExec("getConsumpBaseUserInfo", {
+          vm: this,
+          data: {},
+        }).then(res => {
+          this.userInfo = res || {};
+        })
       },
       async p_getAsyncStep() {
         await this.p_getQuickPayQRCode();
-        this.p_getQRCodeStatus();
+        if (!this.isFlow) {
+          this.p_getQRCodeStatus();
+          this.p_getListUserPayChannel();
+        }
       },
       p_getListUserPayChannel() {
         const { pay_channels } = this.projectAttr;
-        jfbRootExec("getListUserPayChannel", {
+        jfbRootExec("getConsumpListUserPayChannel", {
           vm: this,
           data: {
             providers: pay_channels && pay_channels.join(","),
@@ -195,30 +285,45 @@
       },
       p_getQuickPayQRCode() {
         return new Promise((resolve, reject) => {
-          // this.$xdShowLoading({});
-          jfbRootExec("getQuickPayQRCode", {
+          this.$xdShowLoading({});
+          jfbRootExec("getConsumpCode", {
             vm: this,
             data: {
               shop_id: this.shop_id,
-              temp_order_id: this.temp_order_id
+              temp_order_id: this.temp_order_id,
             }
           }).then(res => {
-            // this.$xdHideLoading();
-            this.temp_order_id = res.temp_order_id;
-
-            let code_url = this.brandInfo['api_host'] + res.code_url;
-            if (this.isPreview) code_url = res.code_url;
-            this.code_url = code_url;
-            this.expiration_sec = res.expiration_sec;
-            clearInterval(this.secondTimer);
-            this.secondTimer = setInterval(() => {
-              this.expiration_sec--;
-              if (this.expiration_sec <= 0) {
-                clearInterval(this.secondTimer);
-                this.p_getQuickPayQRCode();
-              }
-            }, 1000);
-            resolve();
+            this.$xdHideLoading();
+            this.plusDiscount = res.plus_discount
+            if (res.is_st_flow === 'Y') {
+              //水牌
+              this.isFlow = true
+              this.shopName = res.shop_name;
+              this.getSettleTagList()
+            } else {
+              // 消费码
+              this.temp_order_id = res.temp_order_id;
+              let code_url = this.brandInfo['api_host'] + res.code_url;
+              let barcode_url = this.brandInfo['api_host'] + res.barcode_url;
+              if (this.isPreview) code_url = res.code_url;
+              if (this.isPreview) barcode_url = res.barcode_url;
+              this.code_url = code_url;
+              this.barcode_url = barcode_url;
+              this.barCode = res.payment_code
+              this.expiration_sec = res.expiration_sec;
+              this.showMask = false;
+              this.shopName = res.shop_name;
+              clearInterval(this.secondTimer);
+              this.secondTimer = setInterval(() => {
+                this.expiration_sec--;
+                if (this.expiration_sec <= 0) {
+                  clearInterval(this.secondTimer);
+                  this.p_getQuickPayQRCode();
+                }
+              }, 1000);
+              resolve();
+            }
+
           }).catch(err => {
             console.error(err);
             reject(err);
@@ -226,7 +331,7 @@
         })
       },
       p_getQRCodeStatus() {
-        jfbRootExec("getQRCodeStatus", {
+        jfbRootExec("getConsumpCodeScanStatus", {
           vm: this,
           data: {
             temp_order_id: this.temp_order_id,
@@ -265,7 +370,7 @@
         })
       },
       p_createOrder() {
-        jfbRootExec("batchUseCardCreated", {
+        jfbRootExec("batchConsumpUseCardCreated", {
           vm: this,
           data: {
             temp_order_id: this.temp_order_id,
@@ -279,7 +384,7 @@
         })
       },
       p_getOrderStatus() {
-        jfbRootExec("getAsyncSubmitStatus", {
+        jfbRootExec("getConsumpAsyncSubmitStatus", {
           vm: this,
           data: {
             request_order_id: this.request_order_id
@@ -371,6 +476,131 @@
         if (this.validTimer) clearInterval(this.validTimer)
         this.p_getAsyncStep();
       },
+      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)
+        })
+      },
+      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);
+          })
+      },
+      //选卡弹出项
+      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);
+            }
+          });
+        })
+      },
+      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'
+              }
+            )
+          }
+        })
+      },
       handleThirdPay(pay_order_id, main_order_id) {
         let { login_providers = [] } = this.projectAttr;
         let data = {
@@ -387,7 +617,7 @@
           data['pay_success_url'] += this.successPath + `?order_id=${main_order_id}`;
         }
 
-        jfbRootExec("setThirdPlace", {
+        jfbRootExec("setConsumpThirdPlace", {
           vm: this,
           data,
         })
@@ -396,7 +626,7 @@
             const { channel_data } = res;
             const paySignData = JSON.parse(Base64.decode(channel_data));
             this.openTemplatePay(paySignData, (ps) => {
-              jfbRootExec("updatePay", {
+              jfbRootExec("updateConsumpPay", {
                 vm: this,
                 data: {
                   main_order_id: main_order_id,
@@ -432,21 +662,36 @@
         });
       },
       handleConfirm() {
-        //todo 经纬度获取第一个门店
         this.showDialog = false;
         this.p_getAsyncStep();
       },
+      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 = "";
+        }
+      },
+      handleNumberChange(num) {
+        let curTag = this.curTag;
+        this.total_price = this.$xdUniHelper.multiplyFloatNumber(curTag.price_yuan, num);
+      },
       onJfbUnload(options) {
         console.log('event.onJfbUnload', options)
-        if(this.secondTimer) clearInterval(this.secondTimer);
-        if(this.statusTimer) clearTimeout(this.statusTimer);
-        if(this.orderTimer) clearTimeout(this.orderTimer);
+        if (this.secondTimer) clearInterval(this.secondTimer);
+        if (this.statusTimer) clearTimeout(this.statusTimer);
+        if (this.orderTimer) clearTimeout(this.orderTimer);
       },
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
-        if(this.secondTimer) clearInterval(this.secondTimer);
-        if(this.statusTimer) clearTimeout(this.statusTimer);
-        if(this.orderTimer) clearTimeout(this.orderTimer);
+        if (this.secondTimer) clearInterval(this.secondTimer);
+        if (this.statusTimer) clearTimeout(this.statusTimer);
+        if (this.orderTimer) clearTimeout(this.orderTimer);
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
@@ -459,6 +704,9 @@
       },
       onJfbHide(options) {
         console.log('event.onJfbHide', options)
+        if (this.secondTimer) clearInterval(this.secondTimer);
+        if (this.statusTimer) clearTimeout(this.statusTimer);
+        if (this.orderTimer) clearTimeout(this.orderTimer);
       },
       onJfbUpdate(...data) {
         console.log('event.onJfbUpdate', data)
@@ -477,9 +725,9 @@
   .jfb-base-consump-code {
     &__body {
       .content-box {
-        margin: 180rpx 30rpx 0 30rpx;
+        margin: 158rpx 30rpx 0 30rpx;
         background-color: #fff;
-        padding: 90rpx 40rpx 60rpx 40rpx;
+        padding: 81rpx 32rpx 32rpx 32rpx;
         border-radius: 24rpx;
         position: relative;
         display: flex;
@@ -488,11 +736,11 @@
         justify-content: center;
 
         .logo-box {
-          width: 130rpx;
-          height: 130rpx;
+          width: 154rpx;
+          height: 154rpx;
           background-color: #fff;
           position: absolute;
-          top: -65rpx;
+          top: -100rpx;
           left: 50%;
           transform: translate(-50%, 0);
           display: flex;
@@ -501,8 +749,8 @@
           border-radius: 50%;
 
           .logo {
-            width: 120rpx;
-            height: 120rpx;
+            width: 144rpx;
+            height: 144rpx;
             border-radius: 50%;
           }
         }
@@ -511,10 +759,10 @@
 
       .shop {
         border: 2rpx solid #E6E6E6;
-        padding: 32rpx 40rpx;
+        padding: 30rpx 40rpx;
         border-radius: 24rpx;
         color: #fff;
-        font-size: 28rpx;
+        font-size: 26rpx;
         display: flex;
         justify-content: space-between;
         align-items: center;
@@ -526,7 +774,7 @@
       .bar-code {
         height: 120rpx;
         width: 600rpx;
-        margin: 40rpx 0 16rpx 0;
+        margin: 38rpx 0 0 0;
 
         &-text {
           color: #999999;
@@ -536,19 +784,23 @@
       }
 
       .qrcode {
-        width: 300rpx;
-        height: 300rpx;
-        margin: 50rpx 0 20rpx 0;
+        width: 272rpx;
+        height: 272rpx;
+        margin: 54rpx auto 18rpx auto;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
       }
 
       .code-refresh {
         color: #999;
         font-size: 24rpx;
-        margin-bottom: 40rpx;
+        margin-bottom: 36rpx;
         border-bottom: 2rpx dashed #E5E5E5;
         width: 95%;
         text-align: center;
-        padding-bottom: 40rpx;
+        padding-bottom: 36rpx;
       }
 
       .vip {
@@ -565,9 +817,9 @@
           &-left {
             background: linear-gradient(90deg, #665646 0%, #473D34 52.05%, #2B2623 100%);
             color: #EFD5C3;
-            font-size: 24rpx;
+            font-size: 22rpx;
             border-radius: 74rpx 0rpx 0rpx 74rpx;
-            padding: 20rpx 20rpx 20rpx 24rpx;
+            padding: 18rpx 18rpx 18rpx 22rpx;
             display: flex;
             align-items: center;
             justify-content: center;
@@ -576,16 +828,16 @@
           &-right {
             background: linear-gradient(270deg, #FCD6B8 0%, #FCEDD7 100%);
             border-radius: 0px 80rpx 80rpx 0px;
-            padding: 6rpx 36rpx;
-            font-size: 24rpx;
+            padding: 5rpx 32rpx;
+            font-size: 22rpx;
             display: flex;
             align-items: center;
             justify-content: center;
 
-            &>span {
+            &>text {
               color: #D10300;
               font-weight: 700;
-              font-size: 48rpx;
+              font-size: 43rpx;
               margin-right: 5rpx;
             }
           }
@@ -597,7 +849,7 @@
           font-size: 28rpx;
           align-items: center;
 
-          &>span {
+          &>text {
             margin: 0 8rpx;
           }
         }
@@ -614,7 +866,7 @@
           align-items: center;
           justify-content: center;
           background: url('https://img-b.jufubao.cn/uploads/20250407/11e6e600ab4395c44d42489bc7b25034.jpg') no-repeat;
-          background-size: contain;
+          background-size: 100% 100%;
 
           &-title {
             font-size: 26rpx;
@@ -629,6 +881,58 @@
           }
         }
       }
+
+      .verification {
+        &-item {
+          display: flex;
+          margin-top: 60rpx;
+
+          &-label {
+            color: #999999;
+            font-size: 30rpx;
+            margin-right: 64rpx;
+          }
+
+          &-tags {
+            display: flex;
+            align-items: flex-start;
+
+            &>view {
+              margin-right: 32rpx;
+              font-size: 28rpx;
+              border-radius: 12rpx;
+              padding: 16rpx 24rpx;
+              border: 2rpx solid #EEEEEE;
+              color: #CCCCCC;
+            }
+
+          }
+
+          &-input {
+            display: flex;
+            flex-direction: column;
+            text-align: center;
+            font-size: 28rpx;
+
+            &>input {
+              border-radius: 10rpx;
+              border: 2rpx solid #EEEEEE;
+              padding: 20rpx 24rpx;
+            }
+
+            .tip {
+              font-size: 18rpx;
+              margin-top: 12rpx;
+            }
+          }
+        }
+      }
+
+      .nodata {
+        color: #f00;
+        line-height: unit(68, rpx);
+        font-size: unit(28, rpx);
+      }
     }
 
     .dialog-title {