jufubao-base 1.0.268 → 1.0.269-beta2

package/package.json

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

package/src/components/JfbBaseCard/Attr.js

@@ -307,6 +307,17 @@ export default {
           { label: "否", value: "N" }
         ],
       },
+      {
+        label: '登录按钮是否隐藏:',
+        ele: "xd-radio",
+        valueKey: 'hide_login_btn',
+        groupKey: 'content',
+        value: data.hide_login_btn || 'N',
+        list: [
+          { label: "否", value: "N" },
+          { label: "是", value: "Y" }
+        ],
+      },
       {
         ele: 'title',
         label: '登录样式设置',

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -150,7 +150,7 @@
                 border:`1px solid ${item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}`
               }"
             >
-              <view class="jfb-base-card__body-card-item-left">
+              <view class="jfb-base-card__body-card-item-left" v-if="showLoginBtn">
                 <xd-font-icon
                   size="100"
                   :color="mainColor"
@@ -198,7 +198,7 @@
                       class="jfb-base-card__body-card-item-right-bottom-info-deduction"
                     >购买其他物品可抵：{{ item.other_card_point }}</view>
                   </view>
-                  <view @click.stop="toDetail(item)" :style="lookStyle">{{look_name}}</view>
+                  <view v-if='showLoginBtn' @click.stop="toDetail(item)" :style="lookStyle">{{look_name}}</view>
                 </view>
               </view>
             </view>
@@ -300,7 +300,9 @@ export default {
       jfbAuthorize: (state) => state.jfbAuthorize,
     }),
 
-
+    showLoginBtn(){
+      return this.hide_login_btn === 'N'
+    },
 
     //布局2特殊样式，布局1在行内样式
     loginStyle(){
@@ -408,6 +410,7 @@ export default {
 
       dialogEvent: false,
       show_coupon_tab: "N",
+      hide_login_btn: 'N',
       // is_show_change: false,
       popup: "https://img.zcool.cn/community/01784158abe781a801219c77e981ee.jpg?x-oss-process=image/auto-orient,1/resize,m_lfit,w_1280,limit_1/sharpen,100",
       buy_name: '',
@@ -475,6 +478,7 @@ export default {
       this.buy_name = getContainerPropsValue(container, "content.buy_name", "购买新卡");
       this.buy_new_url = getContainerPropsValue(container,"content.buy_new_url",{value: ""}).value;
       this.show_coupon_tab = getContainerPropsValue(container, "content.show_coupon_tab", "N");
+      this.hide_login_btn = getContainerPropsValue(container, "content.hide_login_btn", "N");
     },
 
     handleToLink(path) {
@@ -565,6 +569,7 @@ export default {
      */
     handleBindLogin(item) {
       if(this.$configProject.isPreview) return;
+      if(!this.showLoginBtn) return;
       //普通卡
       if (this.tabIndex === 1) {
         //无效卡

package/src/components/JfbBaseConsumpCode/Api.js

@@ -30,6 +30,28 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    path: "/pay/v1/quickpay/list-my-config",
+    title: "快捷支付-获取我的支付顺序",
+    mapFnName: "getMyPayOrderConfig",
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    path: "/pay/v1/quickpay/save-my-config",
+    title: "保存支付顺便配置",
+    mapFnName: "saveMyPayOrderConfig",
+    isRule: false,
+    data: {
+      configs: ['支付顺序配置', 'String', '必选'],
+      pay_method: ['支付方式 card=卡,coupon=优惠券,wallet=钱包', 'String', '必选'],
+      priority_rules: ['优先级规则', 'array[string]', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
   {
     mapFnName: "getConsumpListUserPayChannel",
     title: "获取用户可用支付渠道",

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -12,7 +12,7 @@
     }">
       <view class="content-box">
         <view class="logo-box">
-          <image v-if="userInfo['head_url']" :src="userInfo['head_url']" class="logo"></image>
+          <image v-if="shopLogo" :src="shopLogo" class="logo"></image>
           <image v-else class="logo" src="https://img1-b.jufubao.cn/uploads/20250528/e88bb70d4ccdcdd01a277bdf6b66c488.jpg"></image>
         </view>
         <view v-if="isFlow">
@@ -33,8 +33,8 @@
             <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>
+              <!-- <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>
@@ -42,7 +42,7 @@
             下一步</XdButton>
           <XdButton v-else style="margin-top: 200rpx;display:block" width="260rpx" type="primary" @click="toPayOrder">
             下一步</XdButton>
-          <view v-if="plusDiscount">
+          <view v-if="plusDiscount" style="margin-top: 40rpx;">
             <view class="vip" v-if="is_vip==='N'">
               <view class="vip-title">
                 <view class="vip-title-left">PLUS会员专享</view>
@@ -71,11 +71,18 @@
             </image>
             <view class="bar-code-text">{{barCode}}</view>
             <view style="position: relative">
-              <image mode="aspectFit" class="qrcode" :src="code_url">
+              <image mode="aspectFit" class="qrcode" :src="code_url"></image>
               <image v-if="qrcode_icon" class="logo-icon" :src="qrcode_icon"></image>
             </view>
-            </image>
+            
             <view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
+            <view class="pay_way">
+              <view class="pay_title">此二维码优先使用以下账户进行支付</view>
+              <view class="pay_select" @click="showSortDialog">
+                <view>{{ curPaySelectShow }}</view>
+                <xd-font-icon icon="iconxia_down" size="28" style="margin-left: 24rpx;"></xd-font-icon>
+              </view>
+            </view>
             <view v-if="plusDiscount">
               <view class="vip" v-if="is_vip==='N'">
                 <view class="vip-title">
@@ -134,6 +141,34 @@
         <XdButton @click="handleToCity" size="small" type="primary">允许</XdButton>
       </view>
     </XdDialog>
+    <xd-down-drawer
+      :show.sync="showShopList"
+      :isClose="false"
+      :isBodyClose="false"
+      height="60vh"
+    >
+      <shop-list
+        v-if="showShopList"
+        :getList="p_getShopList"
+        @handleCityDone="handleCityDone"
+        @handleCityChange="handleCityChange"
+        @onChose="handleChoseShop"
+        @toChoseOther="handleToShop"
+      ></shop-list>
+    </xd-down-drawer>
+
+    <!-- 扣费排序弹框  -->
+    <view class="deduct_dialog" v-if="deductDialog">
+      <view class="deduct_mask" @touchmove.stop.prevent="moveHandle"></view>
+      <view class="deduct_content">
+        <view class="deduct_body">
+          <xd-deduct-sort :list="paySortList" @onChange="handleDeductSort" @onClose="handleSortClose"></xd-deduct-sort>
+        </view>
+        <view class="deduct_foot">
+          <view class="deduct_btn" @click="doConfirmSortPay">确定</view>
+        </view>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -141,6 +176,9 @@
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import XdDialog from "@/components/XdDailog/XdDailog";
   import XdButton from "@/components/XdButton/XdButton";
+  import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer"
+  import ShopList from "./shopList.vue"
+  import XdDeductSort from "./XdDeductSort.vue"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseConsumpCodeMixin from "./JfbBaseConsumpCodeMixin";
   import getServiceUrl from "@/common/getServiceUrl";
@@ -157,7 +195,10 @@
     components: {
       XdFontIcon,
       XdDialog,
-      XdButton
+      XdButton,
+      XdDownDrawer,
+      ShopList,
+      XdDeductSort
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseConsumpCodeMixin
@@ -171,6 +212,7 @@
         showDialog: false,
         showMask: true,
         shop_id: '',
+        showShopList: true,
         secondTimer: null,
         expiration_sec: '',
         code_url: '',
@@ -190,6 +232,7 @@
         num: 1,
         tip: '',
         shopName: '',
+        shopLogo: "",
         isFlow: false,
         xnamespace: '',
         plusDiscount: 0,
@@ -202,6 +245,9 @@
         cityPath: '',
         resource_shop_id: '',
         qrcode_icon: '',
+        deductDialog: false,
+        paySortList: [],
+        tempList: [],
       }
     },
     watch: {
@@ -245,6 +291,10 @@
       },
       btnDisabled() {
         return this.total_price === '' || !this.tag_id;
+      },
+      curPaySelectShow(){
+        let curPay = this.paySortList[0];
+        return curPay.pay_method_name + (curPay.wallet_amount ? `: ${$xdUniHelper.divisionFloatNumber(curPay.wallet_amount, 100)}` : '')
       }
     },
     created() {
@@ -276,31 +326,39 @@
           }
         }
         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.resource_shop_id = res.list[0].resource_shop_id;
-              this.shopName = res.list[0].resource_shop_name;
-              this.showMask = true;
-              this.showDialog = true;
-            } else {
-              this.tip = '您的附近暂时没有支持的店铺'
-              this.showDialog = false;
-            }
-          })
+          // 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.resource_shop_id = res.list[0].resource_shop_id;
+          //     this.shopName = res.list[0].resource_shop_name;
+          //     // this.showMask = true;
+          //     // this.showDialog = true;
+          //   } else {
+          //     this.tip = '您的附近暂时没有支持的店铺'
+          //     this.showDialog = false;
+          //   }
+          // })
         } else {
           this.shop_id = this.options.shop_id;
           this.resource_shop_id = this.options.resource_shop_id;
-          this.p_getAsyncStep();
+          this.p_getAsyncStep((err) => {
+            if(err === 'error'){
+            }else{
+              this.showShopList = false;
+              this.showMask = false;
+            }
+
+          });
         }
+        this.p_getMyPayOrderConfig();
       },
       /**
        * @description 监听事件变化
@@ -332,6 +390,67 @@
         this.cityPath = getContainerPropsValue(container, 'content.cityPath', { value: "" }
         ).value;
       },
+      handleSortClose(){
+        this.deductDialog = false;
+      },
+      handleChoseShop(shop){
+        this.shop_id = shop.shop_id;
+        this.resource_shop_id = shop.resource_shop_id;
+        this.shopName = shop.resource_shop_name;
+        this.p_getAsyncStep((err) => {
+          if(err === 'error'){
+          }else{
+            this.showShopList = false;
+            this.showMask = false;
+          }
+        });
+      },
+      moveHandle(){},
+      handleCityChange(){
+        this.$xdUniHelper.navigateTo({
+          url: this.cityPath
+        })
+      },
+      handleCityDone(city){
+        console.log("handleCityDone", city);
+      },
+      showSortDialog(){
+        this.deductDialog = true;
+      },
+      handleDeductSort(list){
+        console.log("handleDeductSort",list);
+        this.tempList = list;
+      },
+      doConfirmSortPay(){
+        if(this.tempList.length === 0){
+          this.deductDialog = false;
+          return false;
+        }
+        let configs = this.tempList.map(item => {
+          return {
+            pay_method: item.pay_method,
+            priority_rules: item.options.map(ii => ii.value)
+          }
+        })
+        console.log('configs',configs);
+        jfbRootExec("saveMyPayOrderConfig", {
+          vm: this,
+          data: {
+            configs: configs
+          }
+        }).then(res => {
+          this.deductDialog = false;
+          this.paySortList = this.tempList;
+        })
+      },
+      p_getMyPayOrderConfig(){
+        jfbRootExec("getMyPayOrderConfig", {
+          vm: this,
+          data: {},
+        }).then(res => {
+          this.paySortList = res.configs;
+        })
+      },
       getUserInfo() {
         jfbRootExec("getConsumpBaseUserInfo", {
           vm: this,
@@ -342,8 +461,32 @@
           this.userInfo = res;
         })
       },
-      async p_getAsyncStep() {
-        await this.p_getQuickPayQRCode();
+      p_getShopList(params = {}, cb){
+        return new Promise((resolve, reject) => {
+          jfbRootExec("getConsumpShopList", {
+            vm: this,
+            data: {
+              consume_mode: 'SELL',
+              latitude: this.stateLocation.latitude + '',
+              longitude: this.stateLocation.longitude + '',
+              ...params,
+            }
+          }).then(res => {
+            if(cb) cb(res.list);
+            resolve(res.list);
+          }).catch(err => {
+            reject(err);
+          })
+        })
+      },
+      async p_getAsyncStep(cb) {
+        try{
+          await this.p_getQuickPayQRCode();
+        }catch(e){
+          if(cb) cb('error');
+          return;
+        }
+        if(cb) cb();
         if (!this.isFlow) {
           this.p_getQRCodeStatus();
           this.p_getListUserPayChannel();
@@ -399,6 +542,7 @@
               this.showMask = false;
               this.shopName = res.resource_shop_name;
               this.getSettleTagList()
+              resolve();
             } else {
               // 消费码
               this.temp_order_id = res.temp_order_id;
@@ -417,6 +561,7 @@
               this.expiration_sec = res.expiration_sec;
               this.showMask = false;
               this.shopName = res.resource_shop_name;
+              this.shopLogo = getServiceUrl(res.shop_icon)
               clearInterval(this.secondTimer);
               this.secondTimer = setInterval(() => {
                 this.expiration_sec--;
@@ -918,6 +1063,28 @@
         font-size: 24rpx;
         width: 95%;
         text-align: center;
+        margin-bottom: 40rpx;
+      }
+      .pay_way{
+        display: flex;
+        flex-direction: column;
+        padding: 40rpx 0;
+        align-items: center;
+        border-top: 1px dashed  rgba(229, 229, 229, 1);
+        .pay_title{
+          font-size: 28rpx;
+          margin-bottom: 24rpx;
+          color: #333333;
+        }
+        .pay_select{
+          display: flex;
+          font-size: 28rpx;
+          align-items: center;
+          padding: 20rpx 40rpx;
+          border-radius: 100rpx;
+          background-color: #000;
+          color: #FFFFFF;
+        }
       }
 
       .is-vip {
@@ -943,7 +1110,6 @@
         justify-content: space-between;
         width: 100%;
         padding-top: 40rpx;
-        margin-top: 40rpx;
         border-top: 1px dashed rgba(229, 229, 229, 1);
 
         &-title {
@@ -1133,5 +1299,54 @@
       transform: translate(-40rpx, -40rpx);
       margin-top: 0;
     }
+    .deduct_dialog{
+      position: fixed;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      z-index: 3000;
+      .deduct_mask{
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background: rgba(0, 0, 0, 0.3);
+      }
+      .deduct_content{
+        width: 590rpx;
+        background-color: #FFFFFF;
+        box-sizing: border-box;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        display: flex;
+        flex-direction: column;
+        border-radius: 16rpx;
+        overflow: hidden;
+        .deduct_foot{
+          border-top: 1px solid #F5F9FA;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          background-color: #FFFFFF;
+          padding: 24rpx 0;
+          border-radius: 0 0 16rpx 16rpx;
+          .deduct_btn{
+            width: 300rpx;
+            height: 72rpx;
+            font-size: 28rpx;
+            color: #FFFFFF;
+            background-color: #333333;
+            border-radius: 50rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+          }
+        }
+      }
+    }
   }
 </style>