jufubao-base 1.0.237-beta6 → 1.0.237-beta7

package/package.json

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

package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue

@@ -28,7 +28,7 @@
         </view>
         <view class="fixed_bottom" :style="fixed_bottom">
           <xd-button type="primary" width="600rpx" @click="searchCode">查询</xd-button>
-          <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')"></text>《共享PLUS会员用户协议》</view>
+          <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')">《共享PLUS会员用户协议》</text></view>
         </view>
       </view>
       <view v-else class="vip_panel">
@@ -40,7 +40,7 @@
         </view>
         <view class="fixed_bottom" :style="fixed_bottom">
           <xd-button type="primary" width="600rpx" @click="p_createVipOrder">立即兑换</xd-button>
-          <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')"></text>《共享PLUS会员用户协议》</view>
+          <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')">《共享PLUS会员用户协议》</text></view>
         </view>
       </view>
     </view>

package/src/components/JfbBaseHeaderColumn/Attr.js

@@ -404,6 +404,13 @@ export default {
         type: "number",
         groupKey: "style",
       },
+      data.showQrcode === 'Y' && {
+        label: "二维码图标颜色:",
+        ele: 'xd-color',
+        valueKey: "qrCodeColor",
+        groupKey:'style',
+        value: data.qrCodeColor || '',
+      },
       data.showScan === 'Y' && {
         ele: "title",
         label: "扫一扫样式设置",

package/src/components/JfbBaseHeaderColumn/JfbBaseHeaderColumn.vue

@@ -88,7 +88,7 @@
             >{{searchBtnText || '搜索'}}</view>
           </view>
           <view v-if="showQrcode==='Y'" class="qr_code" @click="handleQrCodeClick">
-            <xd-font-icon :size="qrcodeSize" icon="iconerweima"></xd-font-icon>
+            <xd-font-icon :size="qrcodeSize" icon="iconerweima" :color="qrCodeColor"></xd-font-icon>
           </view>
           <view v-if="showSearchBtn==='Y' && searchBtnPosition==='out'"
             class="search_btn_out"
@@ -221,6 +221,7 @@
         showQrcode: "",
         qrcodeSize: 32,
         qrcodePath: "",
+        qrCodeColor: "",
         showScan: "",
         scanIconColor: "",
         scanPath: "",
@@ -257,6 +258,7 @@
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;
         this.showQrcode = getContainerPropsValue(container, "content.showQrcode", "");
         this.qrcodeSize = getContainerPropsValue(container, "content.qrcodeSize", 32);
+        this.qrCodeColor = getContainerPropsValue(container, "content.qrCodeColor", "#333");
         this.showScan = getContainerPropsValue(container, "content.showScan", "");
         this.scanIconColor = getContainerPropsValue(container, "content.scanIconColor", "#333");
         //基础

package/src/components/JfbBaseOpenVipDetail/JfbBaseOpenVipDetail.vue

@@ -29,11 +29,13 @@
       <view class="fixed_bottom" :style="fixed_bottom">
         <view class="pay_btn" @click="p_createVipOrder">
           立即支付
-          <xd-unit style="margin-left: 16rpx;"
+          ￥{{ $xdUniHelper.divisionFloatNumber(vipInfo.sale_price, 100) }} 
+          {{ vipInfo.vip_card_life_cycle_unit ? '/'+vipInfo.vip_card_life_cycle_unit:'' }}
+          <!-- <xd-unit style="margin-left: 16rpx;"
             :price="vipInfo.sale_price"
             :isOld="false"
             colorNew="#FFFFFF"
-          ></xd-unit>
+          ></xd-unit> -->
         </view>
         <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')"></text>《共享PLUS会员用户协议》</view>
       </view>

package/src/components/JfbBasePay/Attr.js

@@ -18,10 +18,22 @@ export default {
         className: "input80",
       },
       {
+        label: "【（可使用多张票券点数）】是否展示",
+        ele: 'xd-radio',
+        valueKey: "showText2",
+        value: data.showText2 || 'Y',
+        groupKey: "content",
+        inline: true,
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "不展示", value: "N" },
+        ],
+      },
+      data.showText2 === 'Y' && {
         label: "【（可使用多张票券点数）】文案:",
         ele: "el-input",
         valueKey: "text2",
-        value: data.text2 || '',
+        value: data.text2 || '（可使用多张票券点数）',
         placeholder: '（可使用多张票券点数）',
         groupKey: "content",
         inline: false,

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -100,7 +100,7 @@
       <view class="remain_pay" v-if="payInfo.channel_amount > 0">
         <view style="border-bottom: 2rpx solid #eee;" class="column-group">
           <view class="column-item" style="padding: 30rpx 60rpx">
-            <view class="column_label">{{text1}}<text class="label_sub">{{ text2 }}</text></view>
+            <view class="column_label">{{text1}}<text v-if="showText2==='Y'" class="label_sub">{{ text2 }}</text></view>
             <view class="column_value text-primary">
               <xd-unit
                 :price="payInfo.channel_amount"
@@ -216,6 +216,7 @@ export default {
       text1: "",
       text2: "",
       text3: "",
+      showText2: "Y",
       showContinuePay: "",
     };
   },
@@ -266,9 +267,10 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.text1 = getContainerPropsValue(container, 'content.text1', "");
-      this.text2 = getContainerPropsValue(container, 'content.text2', "");
-      this.text3 = getContainerPropsValue(container, 'content.text3', "");
+      this.text1 = getContainerPropsValue(container, 'content.text1', "仍需扣点");
+      this.text2 = getContainerPropsValue(container, 'content.text2', "（可使用多张票券点数）");
+      this.text3 = getContainerPropsValue(container, 'content.text3', "选择以下补差方式");
+      this.showText2 = getContainerPropsValue(container, 'content.showText2', "Y");
       this.showContinuePay = getContainerPropsValue(container, 'content.showContinuePay', 'Y');
       this.paySuccessPath = getContainerPropsValue(
         container,

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -207,6 +207,7 @@ export default {
       callback_url: "",
       isCollectUsername: false,
       showDialog: false,
+      share_code: "",
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -367,6 +368,7 @@ export default {
       this.auth_code = options.auth_code;
       this.provider_id = options.provider_id;
       this.callback_url = options.callback_url;
+      this.share_code = options.share_code;
     },
     /**
      * @description 监听事件变化
@@ -562,6 +564,7 @@ export default {
           auth_code,
           provider_id,
           phone_number,
+          share_code,
         }
       }).then(res => {
         this.$xdHideLoading();