jufubao-base 1.0.415-beta2 → 1.0.416

package/get.package.path.js

@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * @description 第三方库
+ * @param threePackagePath {String} 第三方库所在项目路径存放路径路
+ * @param packname {String} 包名字
+ * @returns {string|*}
+ */
+const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
+  if(packname === 'gxd-commands-bussiness') {
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
+  }
+
+  if (packname === 'gxd-uni-library-editx') {
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
+  }
+
+};
+
+module.exports = {
+  getPackagePath
+}

package/package.json

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

package/src/components/CusCouponChose/CusCouponChose.vue

@@ -38,8 +38,8 @@
           </view>
           <view class="column-item">
             <view class="column_label">
-              仍需兑换
-              <view class="label_sub">（可使用多张优惠券兑换）</view>
+              仍需支付
+              <view class="label_sub">（可使用多张优惠券支付）</view>
             </view>
             <view class="column_value text-primary">
               <xd-unit
@@ -100,7 +100,7 @@
             type="primary"
             radius="50rpx"
             @click="doTicketPay"
-            >确认兑换</xd-button
+            >确认支付</xd-button
           >
         </view>
       </view>

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -506,7 +506,7 @@ export default {
 
     handleOnForget() {
       this.editShow = true;
-      this.editTitle = "请验证您的手机并修改兑换密码";
+      this.editTitle = "请验证您的手机并修改支付密码";
     },
 
     handlePwdClose() {

package/src/components/JfbBaseCardDetail/XdEditPwd.vue

@@ -3,7 +3,7 @@
     <xd-dailog
       :show.sync="uiShow"
       width="90%"
-      title="设置兑换密码"
+      title="设置支付密码"
       :cancel="false"
       :confirm="false"
       :zIndex="1100"
@@ -60,7 +60,7 @@
           </view>
 
           <view class="pwd__form-item">
-            <view>设置兑换密码：</view>
+            <view>设置支付密码：</view>
             <view>
               <input
                 type="password"
@@ -73,7 +73,7 @@
           </view>
 
           <view class="pwd__form-item">
-            <view>确认兑换密码：</view>
+            <view>确认支付密码：</view>
             <view>
               <input
                 type="password"

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -640,7 +640,7 @@ export default {
 
     handleOnForget() {
       this.editShow = true;
-      this.editTitle = "请验证您的手机并修改兑换密码";
+      this.editTitle = "请验证您的手机并修改支付密码";
     },
 
     handlePwdClose() {

package/src/components/JfbBaseCardDetailEntry/XdEditPwd.vue

@@ -3,7 +3,7 @@
     <xd-dailog
       :show.sync="uiShow"
       width="90%"
-      title="设置兑换密码"
+      title="设置支付密码"
       :cancel="false"
       :confirm="false"
       :zIndex="1100"
@@ -60,7 +60,7 @@
           </view>
 
           <view class="pwd__form-item">
-            <view>设置兑换密码：</view>
+            <view>设置支付密码：</view>
             <view>
               <input
                 type="password"
@@ -73,7 +73,7 @@
           </view>
 
           <view class="pwd__form-item">
-            <view>确认兑换密码：</view>
+            <view>确认支付密码：</view>
             <view>
               <input
                 type="password"

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -32,7 +32,7 @@
               </view>
               <view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
               <view v-if="isShowPaySoft === 'Y'" class="pay_way">
-                <view class="pay_title">此二维码优先使用以下账户进行兑换</view>
+                <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>

package/src/components/JfbBaseConsumpCode/QPMixin.js

@@ -68,7 +68,7 @@ export default {
           this.refresh = false;
           this.$xdLog.setARMSInfo({ options: this.options, res }, 'pay_success');
           uni.showToast({
-            title: "兑换成功",
+            title: "支付成功",
           });
           cb(res);
         },
@@ -76,7 +76,7 @@ export default {
           this.onRefreshPage();
           this.$xdLog.setARMSInfo(this.options, 'cancel_pay');
           uni.showToast({
-            title: "取消兑换",
+            title: "取消支付",
           });
         },
         fail: (error) => {
@@ -85,7 +85,7 @@ export default {
           if (window['jwxJfbSDKParams']) error = Object.assign(error, paySignData, window['jwxJfbSDKParams'])
           this.$xdLog.setARMSError(error)
           uni.showToast({
-            title: "兑换失败",
+            title: "支付失败",
           });
         },
       });
@@ -97,7 +97,7 @@ export default {
           this.refresh = false;
           this.$xdLog.setARMSInfo({ options: this.options, res }, 'pay_success');
           uni.showToast({
-            title: "兑换成功",
+            title: "支付成功",
             icon: "none",
           });
           cb(res);
@@ -109,7 +109,7 @@ export default {
             error: JSON.stringify(err)
           });
           uni.showToast({
-            title: "兑换失败",
+            title: "支付失败",
             icon: "none",
           });
         },
@@ -198,7 +198,7 @@ export default {
         } else if (hand_status === 'F') {
           this.handlerOderFail();
           this.$xdAlert({
-            content: hand_status_msg || '兑换失败',
+            content: hand_status_msg || '支付失败',
             time: 3000,
             isClose: false,
             zIndex: 5000

package/src/components/JfbBaseConsumpCode/XdDeductSort.vue

@@ -1,13 +1,13 @@
 <template>
   <view class="xd-deduct-sort">
     <view class="sort_header">
-      <view class="sort_title">优先兑换管理</view>
+      <view class="sort_title">优先支付管理</view>
       <view @click="handleClose">
         <xd-font-icon icon="iconguanbi" :size="40"></xd-font-icon>
       </view>
     </view>
     <view class="drag_header">
-      <view>将按以下顺序兑换</view>
+      <view>将按以下顺序支付</view>
       <!-- #ifdef H5  -->
       <view>长按拖动</view>
       <!-- #endif -->

package/src/components/JfbBaseMy/JfbBaseMy.vue

@@ -34,7 +34,7 @@
         <view class="jfb-base-my__body-card">
           <view class="jfb-base-my__body-card-num">
             <view>可用票券：1</view>
-            <view @click="handleToLink(pwd_url)">设置兑换密码
+            <view @click="handleToLink(pwd_url)">设置支付密码
               <xd-font-icon size="24" icon="iconxiangyou_xian"></xd-font-icon>
             </view>
           </view>

package/src/components/JfbBaseOpenVipDetail/JfbBaseOpenVipDetail.vue

@@ -28,7 +28,7 @@
       
       <view class="fixed_bottom" :style="fixed_bottom">
         <view class="pay_btn" @click="p_createVipOrder">
-          立即兑换
+          立即支付
           ￥{{ $xdUniHelper.divisionFloatNumber(vipInfo.sale_price, 100) }} 
           {{ vipInfo.vip_card_life_cycle_unit ? '/'+vipInfo.vip_card_life_cycle_unit:'' }}
           <!-- <xd-unit style="margin-left: 16rpx;"

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -731,6 +731,60 @@ export default {
           { label: '隐藏', value: '0' },
         ]
       },
+      {
+        label: '订单来源:',
+        ele: 'xd-radio',
+        valueKey: 'showOrderSource',
+        value: data['showOrderSource'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择',
+        list: [
+          { label: '显示', value: 'Y' },
+          { label: '隐藏', value: 'N' },
+        ],
+      },
+      {
+        label: '快递提示',
+        ele: 'xd-cus-switch',
+        valueKey: 'showLogisticsTip',
+        value: dataVal({ data, key: 'showLogisticsTip', dValue: 'Y', gValue }),
+        className: 'input100',
+        groupKey:'content',
+        labelInline:true,
+        inline: false,
+        cusStyle:{marginBottom: '10px'},
+        setting: {
+          tips:['显示','不显示'],
+          isBackType: 'string'
+        },
+        notice:'仅针对配送方式为快递的商品展示',
+      },
+      { ele: 'group_start' },
+      {
+        label: "展示方式",
+        ele: "xd-radio",
+        valueKey: "logisticsTipType",
+        value: dataVal({ data, key: 'logisticsTipType', dValue: 'shop', gValue }),
+        groupKey:'content',
+        list: [
+          { label: "按拆单展示", value: "shop"},
+          { label: "按商品展示", value: "prod"},
+        ],
+        hidden: data.showLogisticsTip === 'N',
+        labelInline: true,
+      },
+      {
+        label: "",
+        ele: "el-input",
+        valueKey: "logisticsTipText",
+        value: dataVal({ data, key: 'logisticsTipText', dValue: '', gValue }),
+        hidden: data.showLogisticsTip === 'N',
+        labelInline: true,
+        className: 'input100',
+        placeholder: '订单生成后72小时发货，如遇节假日发货顺延',
+        groupKey:'content',
+      },
+      { ele: 'group_end' },
       {
         label: "核销订单样式",
         ele: "xd-radio",

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -227,6 +227,14 @@
                 <view> {{ Fitem.label }}： </view>
                 <view> {{ Fitem.value }} </view>
               </view>
+              <!-- 订单来源 -->
+              <view v-if="showOrderSource==='Y' && Sitem.special_names" class="postage_tip">
+                订单来源：{{ Sitem.special_names }}
+              </view>
+              <!-- 配送提示 -->
+              <view v-if="showLogisticsTip==='Y' && logisticsTipType==='prod'" class="postage_tip">
+                <view>{{ Sitem.postage_tip ||  logisticsTipText}}</view>
+              </view>
             </view>
             <view
               class="jfb-base-order-detail__body-delivery-bottom"
@@ -1248,6 +1256,10 @@ export default {
       refundPath: "",
       refundFastPath: "",
       btnTextSize: 20,
+      showOrderSource: "",
+      showLogisticsTip: "",
+      logisticsTipType: "",
+      logisticsTipText: "",
       order_from: "",
 
       showSupplement: false,
@@ -1412,6 +1424,8 @@ export default {
           is_show_product: this.is_show_product === "Y" ? 1 : 0,
           version: 'v2',
           is_show_after_btn: this.showApplyAfter === 'Y' ? 1 : 0,
+          is_show_sub_order_postage_tip: (this.showLogisticsTip === 'Y' && this.logisticsTipType === 'shop') ? 1 : 2,
+          default_sub_order_postage_tip: this.logisticsTipText,
           style: this.qrcodeLayout
         },
       })
@@ -1446,7 +1460,9 @@ export default {
             res.pay_info.goods_amount,
             100
           );
-          res.shop.brand_icon = getServiceUrl(res.shop.brand_icon, 'size5');
+          if(res.shop && res.shop.brand_icon){
+            res.shop.brand_icon = getServiceUrl(res.shop.brand_icon, 'size5');
+          }
           res.pay_info.base =
             res.pay_info.base &&
             res.pay_info.base.map((item) => {
@@ -1771,6 +1787,10 @@ export default {
           this.showPreviewCode = true;
         }
       }
+      this.showOrderSource = getContainerPropsValue(container, "content.showOrderSource", 'N');
+      this.showLogisticsTip = getContainerPropsValue(container, "content.showLogisticsTip", 'Y');
+      this.logisticsTipType = getContainerPropsValue(container, "content.logisticsTipType", 'shop');
+      this.logisticsTipText = getContainerPropsValue(container, "content.logisticsTipText", '订单生成后72小时发货，如遇节假日发货顺延');
       this.is_show_invoice = getContainerPropsValue(container, "content.is_show_invoice", "N");
       this.showService = getContainerPropsValue(container, "content.showService", "");
       this.serviceIcon = getContainerPropsValue(container, "content.serviceIcon", 'iconkefu');
@@ -1884,7 +1904,7 @@ export default {
             return;
           }
         }catch (e) {
-          console.error('兑换跳转解析失败:', e);
+          console.error('支付跳转解析失败:', e);
         }
       }
       //#endif
@@ -2366,6 +2386,12 @@ export default {
   }
 }
 
+.postage_tip{
+  color: rgb(229, 116, 112);
+  font-size: 24rpx;
+  margin: 10px 0;
+}
+
 .code-url {
   display: flex;
   justify-content: flex-start;

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -472,7 +472,7 @@ export default {
               return;
             }
           }catch (e) {
-            console.error('兑换跳转解析失败:', e);
+            console.error('支付跳转解析失败:', e);
           }
         }
         //#endif

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -157,7 +157,7 @@
               radius="50rpx"
               @click="doThirdPay"
             >
-              确认兑换
+              确认支付
               ￥{{ $xdUniHelper.divisionFloatNumber(payInfo.channel_amount, 100) }}
             </xd-button>
           </view>
@@ -474,7 +474,7 @@ export default {
       console.log(this.projectAttr)
       if (+payInfo.channel_amount > 0 && !this.channel_provider_id) {
         this.$xdAlert({
-          content: '请选择兑换方式',
+          content: '请选择支付方式',
           time: 2500,
           isClose: false,
           zIndex: 5000
@@ -568,7 +568,7 @@ export default {
           this.$xdLog.setARMSInfo({options:this.options, res}, 'pay_success');
           console.log("pay success", res);
           this.$xdAlert({
-            content: '兑换成功',
+            content: '支付成功',
             time: 2500,
             isClose: false,
             zIndex: 5000
@@ -578,7 +578,7 @@ export default {
         cancel: () => {
           this.$xdLog.setARMSInfo(this.options, 'cancel_pay');
           this.$xdAlert({
-            content: '取消兑换',
+            content: '取消支付',
             time: 2500,
             isClose: false,
             zIndex: 5000
@@ -589,7 +589,7 @@ export default {
           if (window['jwxJfbSDKParams']) error = Object.assign(error, paySignData, window['jwxJfbSDKParams'])
           this.$xdLog.setARMSError(error)
           this.$xdAlert({
-            content: '兑换失败',
+            content: '支付失败',
             time: 2500,
             isClose: false,
             zIndex: 5000
@@ -603,7 +603,7 @@ export default {
         success: (res) => {
           this.$xdLog.setARMSInfo({options: this.options, res}, 'pay_success');
           this.$xdAlert({
-            content: '兑换成功',
+            content: '支付成功',
             time: 2500,
             isClose: false,
             zIndex: 5000
@@ -616,7 +616,7 @@ export default {
             error: JSON.stringify(err)
           });
           this.$xdAlert({
-            content: '兑换失败',
+            content: '支付失败',
             time: 2500,
             isClose: false,
             zIndex: 5000
@@ -644,7 +644,7 @@ export default {
               this.$xdLog.setARMSInfo({options: this.options, res}, 'alipay_pay_success');
               if(res.resultStatus == '9000'){
                 this.$xdAlert({
-                  content: '兑换成功',
+                  content: '支付成功',
                   time: 2500,
                   isClose: false,
                   zIndex: 5000
@@ -656,7 +656,7 @@ export default {
               }else if (res.resultStatus == '6001'){
                 // 用户取消支付
                 this.$xdAlert({
-                  content: '取消兑换',
+                  content: '取消支付',
                   time: 2500,
                   isClose: false,
                   zIndex: 5000
@@ -665,7 +665,7 @@ export default {
               }else {
                 // 支付失败
                 this.$xdAlert({
-                  content: '兑换失败',
+                  content: '支付失败',
                   time: 2500,
                   isClose: false,
                   zIndex: 5000
@@ -677,7 +677,7 @@ export default {
               this.$xdLog.setARMSError({options: this.options, err});
               // 支付失败
               this.$xdAlert({
-                content: '兑换失败',
+                content: '支付失败',
                 time:
                 2500,
                 isClose: false,

package/src/components/JfbBaseRecharge/JfbBaseRecharge.vue

@@ -32,7 +32,7 @@
                     fontSize: '24rpx',
                     paddingBottom: '32rpx',
                   }"
-                >兑换金额：{{ amount }} 元</view>
+                >支付金额：{{ amount }} 元</view>
                 <xd-button
                   size="medium"
                   type="primary"

package/src/components/JfbBaseRechargeNew/JfbBaseRechargeNew.vue

@@ -73,7 +73,7 @@ export default {
     return {
       closeMask: true,
       isPreview: false,
-      buyBtnName: '立即兑换' ,
+      buyBtnName: '立即购买' ,
       newCardList:[],
     };
   },
@@ -97,7 +97,7 @@ export default {
      */
     init(container) {
       this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
-      this.buyBtnName = getContainerPropsValue(container, 'content.buyBtnName', '立即兑换')
+      this.buyBtnName = getContainerPropsValue(container, 'content.buyBtnName', '立即购买')
     },
 
     //==套餐购买=============
@@ -165,7 +165,7 @@ export default {
       if(!this.payPath) {
         this.$xdAlert({
           time: 3000,
-          content: '兑换路径未设置，清检查配置',
+          content: '支付路径未设置，清检查配置',
           type: 'error',
           isClose: false
         })

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -97,7 +97,7 @@
                 :bgColor="mainColor"
                 @click.stop="handleToPay(item)"
               >
-                {{ item.pay_status === "3007" ? "去兑换" : "重新兑换" }}
+                {{ item.pay_status === "3007" ? "去支付" : "重新支付" }}
               </xd-button>
             </view>
           </view>

package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetail.vue

@@ -94,7 +94,7 @@
           style="padding-top: 0"
           class="jfb-base-recharge-order-detail__body-order-item"
         >
-          <view>兑换方式：微信</view>
+          <view>支付方式：微信</view>
         </view>
         <view class="jfb-base-recharge-order-detail__body-order-item">
           <view>充值金额：{{ info.pay_amount / 100 }} </view>

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccess.vue

@@ -136,11 +136,11 @@ export default {
       } else if (info.pay_status === "3007") {
         info.icon = "icondengdai";
         info.iconColor = this.mainColor;
-        info.btn = [{ label: "去兑换", type: "pay", radius: "12rpx" }];
+        info.btn = [{ label: "去支付", type: "pay", radius: "12rpx" }];
       } else if (info.pay_status === "3010") {
         info.icon = "iconshibai";
         info.iconColor = "#FA5C5C";
-        info.btn = [{ label: "重新兑换", type: "pay", radius: "12rpx" }];
+        info.btn = [{ label: "重新支付", type: "pay", radius: "12rpx" }];
       }
       this.info = info;
       //订单完成

package/src/components/JfbBaseSetPwd/JfbBaseSetPwd.vue

@@ -24,7 +24,7 @@
             background:noticeBackgroundColor,
             color: warningColor
           }"
-        >您暂未设置平台兑换密码，请设置</view>
+        >您暂未设置平台支付密码，请设置</view>
         <view class="jfb-base-set-pwd__body-form">
           <view class="jfb-base-set-pwd__body-form-label">手机号</view>
           <view class="jfb-base-set-pwd__body-form-value">
@@ -48,11 +48,11 @@
         </view>
         <view class="jfb-base-set-pwd__body-form">
           <view class="jfb-base-set-pwd__body-form-label">输入密码</view>
-          <input class="jfb-base-set-pwd__body-form-input" type="text" v-model="pwd" placeholder="请输入兑换密码">
+          <input class="jfb-base-set-pwd__body-form-input" type="text" v-model="pwd" placeholder="请输入支付密码">
         </view>
         <view class="jfb-base-set-pwd__body-form">
           <view class="jfb-base-set-pwd__body-form-label">确认密码</view>
-          <input class="jfb-base-set-pwd__body-form-input" type="text" v-model="confirmPwd" placeholder="请再次输入兑换密码">
+          <input class="jfb-base-set-pwd__body-form-input" type="text" v-model="confirmPwd" placeholder="请再次输入支付密码">
         </view>
         <view
           class="jfb-base-set-pwd__body-footer"

package/src/components/JfbBaseUserCenter/JfbBaseUserCenter.vue

@@ -56,7 +56,7 @@
           <view class="my-card-add__link-num" v-if="0">
             <view :style="{color: color}">可用{{cardName}}：1</view>
             <view @click="handleToLink(pwd_url)">
-              <text :style="{color: color}">设置兑换密码</text>
+              <text :style="{color: color}">设置支付密码</text>
               <xd-font-icon size="24" icon="iconxiangyou_xian" :color="color"></xd-font-icon>
             </view>
           </view>

package/.claude/settings.local.json

@@ -1,8 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(node *)",
-      "Bash(git *)"
-    ]
-  }
-}