jufubao-base 1.0.311-beta3 → 1.0.312-beta1

package/package.json

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

package/src/components/JfbBaseAfterSalesDetail/JfbBaseAfterSalesDetail.vue

@@ -145,6 +145,9 @@
   import extsMixins from "@/mixins/extsMixins";
   import getServiceUrl from "@/common/getServiceUrl";
   export default {
+    // #ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    // #endif
     name: "JfbBaseAfterSalesDetail",
     components: {
       XdFontIcon,
@@ -468,6 +471,11 @@
 
           .sec_prod + .sec_prod{
             margin-top: 24rpx;
+            // #ifdef MP-WEIXIN
+            ::v-deep .prod_item{
+              margin-top: 24rpx;
+            }
+            // #endif
           }
         }
         .sec_body{
@@ -475,6 +483,11 @@
           font-weight: 400;
           .sec_prod + .sec_prod{
             margin-top: 24rpx;
+            // #ifdef MP-WEIXIN
+            ::v-deep .prod_item{
+              margin-top: 24rpx;
+            }
+            // #endif
           }
           .sec_item{
             display: flex;

package/src/components/JfbBaseCardDetail/Attr.js

@@ -16,17 +16,5 @@ export default {
       },
       inline: false,
     },
-    {
-      label: '收集手机号地址:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'collect_phone_url',
-      groupKey:'advanced',
-      placeholder: '请选择收集手机号地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
   ],
 };

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -94,49 +94,6 @@
       <!--        @onClose="handlePwdClose"-->
       <!--      ></xd-pw-pay>-->
     </view>
-    <xd-down-drawer
-    :show.sync="showDialog"
-    height="50vh"
-  >
-    <template>
-      <view class="top_title">请务必先关联，否则影响此卡使用</view>
-      <view class="method_item">
-        <view class="method_item_top">
-          <view class="method_title">方法一</view>
-          <view>复制文本，打开支付宝APP</view>
-        </view>
-        <view class="method_item_bottom">
-          <view class="method_item_bottom_left">吱口令：{{share_code}}</view>
-          <view class="method_item_bottom_right" @click="copy(share_code)">复制吱口令</view>
-        </view>
-      </view>
-      <view class="method_item">
-        <view class="method_item_top">
-          <view class="method_title">方法二</view>
-          <view>复制链接，在默认浏览器打开</view>
-        </view>
-        <view class="method_item_bottom">
-          <view class="method_item_bottom_left">{{sign_url}}</view>
-          <view class="method_item_bottom_right" @click="copy(sign_url)">复制链接</view>
-        </view>
-      </view>
-      <view class="method_item">
-        <view class="method_item_top">
-          <view class="method_title">方法三</view>
-          <view>保存图片，使用支付宝APP扫码</view>
-        </view>
-        <view class="method_item_bottom code_img">
-          <view>打开支付宝APP，点击扫一扫直接扫码或点击相册中保存图片</view>
-          <view class="code_box">
-            <view class="qr_code">
-              <image mode="aspectFit" :src="sign_url_qrcode"></image>
-            </view>
-            <view>长按保存二维码</view>
-          </view>
-        </view>
-      </view>
-    </template>
-  </xd-down-drawer>
   </view>
 </template>
 
@@ -153,7 +110,6 @@ import getBusinessImageUrl from "@/common/getBusinessImageUrl";
 import { Base64 } from "js-base64";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import {mapState} from 'vuex';
-import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer"
 
 export default {
   name: "JfbBaseCardDetail",
@@ -162,7 +118,6 @@ export default {
     XdPwPay,
     XdEditPwd,
     XdUnit,
-    XdDownDrawer,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseCardDetailMixin],
   computed:{
@@ -216,25 +171,9 @@ export default {
       isBrandLogo: false,
 
       isShowUnbind: false, //是否启动绑定按钮
-      collect_phone_url: "",//收集手机号地址
-      showDialog:false,
-      sign_url:'',
-      share_code:'',
-      sign_url_qrcode:'',
-      toCollectPhoneUrl:'',
     };
   },
-  created() {
-     // ifDef小程序拼接问题
-    let url = this.$xdUniHelper.parseURL();
-    // #ifdef MP-WEIXIN
-    this.toCollectPhoneUrl = url.relative
-    // #endif
-    // #ifdef H5
-    this.toCollectPhoneUrl = '@site_domain@'+''+url.relative
-    // #endif
-    console.log(this.toCollectPhoneUrl,encodeURIComponent(this.toCollectPhoneUrl),'this.toCollectPhoneUrl')
-  },
+  created() {},
   methods: {
     onJfbLoad(options) {
       if (options["x-params"]) {
@@ -445,8 +384,6 @@ export default {
         this.timeStr = "01分19秒"
       }
       this.backUrl = getContainerPropsValue( this.container,  "content.back_url", { value: "" }).value;
-      this.collect_phone_url = getContainerPropsValue(this.container,  "content.collect_phone_url", { value: "" }).value;
-      console.log(this.collect_phone_url,'collect_phone_url')
     },
 
     /**
@@ -476,19 +413,6 @@ export default {
           }
 
           this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
-           //支付宝弹框
-          if(res.enterprise_info&&res.enterprise_info.is_need_activate==='Y'){
-            this.share_code = res.enterprise_info.share_code;
-            this.sign_url = res.enterprise_info.sign_url;
-            this.sign_url_qrcode = res.enterprise_info.sign_url_qrcode;
-            if(res.enterprise_info.is_need_collect_phone_number==='Y'){
-              let url = `${this.collect_phone_url}?callback_url=${encodeURIComponent(this.toCollectPhoneUrl)}`
-              this.$xdUniHelper.navigateTo({
-                url:url,
-              });
-            }
-            this.showDialog = true;
-          }
         })
         .catch((err) => {
           // this.$refs["pwPay"].clearPwd();
@@ -512,26 +436,6 @@ export default {
     handlePwdClose() {
       this.$helper.navigateBack();
     },
-    /**
-     *@description 复制功能
-     * @param  text
-     */
-    copy(text) {
-      // #ifdef H5
-      this.$copyText(text).then((res) => {
-        this.$xdAlert({ content: "复制成功" });
-      });
-      // #endif
-      // #ifndef H5
-      uni.setClipboardData({
-        data: text,
-        showToast: false,
-        success: () => {
-          //this.$xdAlert({ content: "复制成功" });
-        },
-      });
-      // #endif
-    },
   },
 };
 </script>
@@ -691,70 +595,5 @@ export default {
       }
     }
   }
-  .method_item{
-    padding: unit(32, rpx);
-    border-bottom: 1px solid #F8F8F8;
-    color: #333333;
-    font-size: unit(28,rpx);
-    &_top{
-      display: flex;
-      align-items: center;
-    }
-    &_bottom{
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-start;
-      margin-top: unit(16, rpx);
-      height: unit(32,rpx);
-      line-height: unit(32,rpx);
-      font-size: unit(24,rpx);
-      color: #666666;
-      &_right{
-        min-width: unit(180,rpx);
-        text-align: right;
-        color: #FF8D1A;
-      }
-      &_left{
-        color: #666666;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-    }
-    .code_img{
-      height: auto!important;
-    }
-
-  }
-  .method_title{
-    color: #fff;
-    background-color: #FF8D1A;
-    width: unit(120,rpx);
-    height: unit(50,rpx);
-    line-height: unit(50,rpx);
-    border-radius: unit(25,rpx);
-    text-align: center;
-    margin-right: unit(20,rpx);
-    font-size: unit(24,rpx);
-  }
-  .top_title{
-    height: unit(100,rpx);
-    text-align: center;
-    line-height:unit(100,rpx);
-    color:#333333;
-    font-size:unit(32,rpx);
-    border-bottom: 1px solid #F8F8F8;
-  }
-  .code_box{
-    text-align: center;
-    .qr_code{
-      width: unit(168,rpx);
-      height: unit(168,rpx);
-      image{
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
 }
 </style>

package/src/components/JfbBaseCardDetailEntry/Attr.js

@@ -73,17 +73,5 @@ export default {
       },
       inline: false,
     },
-    {
-      label: '收集手机号地址:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'collect_phone_url',
-      groupKey:'advanced',
-      placeholder: '请选择收集手机号地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
   ],
 };

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -108,49 +108,6 @@
         </view>
       </view>
     </view>
-  <xd-down-drawer
-    :show.sync="showDialog"
-    height="50vh"
-  >
-    <template>
-      <view class="top_title">请务必先关联，否则影响此卡使用</view>
-      <view class="method_item">
-        <view class="method_item_top">
-          <view class="method_title">方法一</view>
-          <view>复制文本，打开支付宝APP</view>
-        </view>
-        <view class="method_item_bottom">
-          <view class="method_item_bottom_left">吱口令：{{share_code}}</view>
-          <view class="method_item_bottom_right" @click="copy(share_code)">复制吱口令</view>
-        </view>
-      </view>
-      <view class="method_item">
-        <view class="method_item_top">
-          <view class="method_title">方法二</view>
-          <view>复制链接，在默认浏览器打开</view>
-        </view>
-        <view class="method_item_bottom">
-          <view class="method_item_bottom_left">{{sign_url}}</view>
-          <view class="method_item_bottom_right" @click="copy(sign_url)">复制链接</view>
-        </view>
-      </view>
-      <view class="method_item">
-        <view class="method_item_top">
-          <view class="method_title">方法三</view>
-          <view>保存图片，使用支付宝APP扫码</view>
-        </view>
-        <view class="method_item_bottom code_img">
-          <view>打开支付宝APP，点击扫一扫直接扫码或点击相册中保存图片</view>
-          <view class="code_box">
-            <view class="qr_code">
-              <image mode="aspectFit" :src="sign_url_qrcode"></image>
-            </view>
-            <view>长按保存二维码</view>
-          </view>
-        </view>
-      </view>
-    </template>
-  </xd-down-drawer>
   </view>
 </template>
 
@@ -169,7 +126,6 @@ import XdPwPay from "./XdPwPay";
 import XdEditPwd from "./XdEditPwd";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import XdButton from '@/components/XdButton/XdButton'
-import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer"
 import {parsePath} from "@/utils/linkUrl";
 export default {
   name: "JfbBaseCardDetailEntry",
@@ -178,8 +134,7 @@ export default {
     XdPwPay,
     XdEditPwd,
     XdUnit,
-    XdButton,
-    XdDownDrawer,
+    XdButton
   },
   mixins: [
     componentsMixins,extsMixins,JfbBaseCardDetailEntryMixin,colorCardMixins,
@@ -221,13 +176,7 @@ export default {
       isBrandLogo: false,
       isShowUnbind: false, //是否启动绑定按钮
       headerBg: {},
-      give_url: "",
-      collect_phone_url: "",//收集手机号地址
-      showDialog:false,
-      sign_url:'',
-      share_code:'',
-      sign_url_qrcode:'',
-      toCollectPhoneUrl:'',
+      give_url: ""
     };
   },
   watch: {
@@ -244,15 +193,6 @@ export default {
     },
   },
   created() {
-    // ifDef小程序拼接问题
-    let url = this.$xdUniHelper.parseURL();
-    // #ifdef MP-WEIXIN
-    this.toCollectPhoneUrl = url.relative
-    // #endif
-    // #ifdef H5
-    this.toCollectPhoneUrl = '@site_domain@'+''+url.relative
-    // #endif
-    console.log(this.toCollectPhoneUrl,encodeURIComponent(this.toCollectPhoneUrl),'this.toCollectPhoneUrl')
     this.init(this.container)
   },
   methods: {
@@ -288,8 +228,6 @@ export default {
       this.backUrl = getContainerPropsValue(container,  "content.back_url", { value: "" }).value;
       this.shift_url = getContainerPropsValue(container,  "content.shift_url", { value: "" }).value;
       this.give_url = getContainerPropsValue(container,  "content.give_url", { value: "" }).value;
-      this.collect_phone_url = getContainerPropsValue(container,  "content.collect_phone_url", { value: "" }).value;
-      console.log(this.collect_phone_url,'collect_phone_url')
       //'wechat_mini_program|default'
       this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },
@@ -341,19 +279,6 @@ export default {
           this.show = false;
           console.log(this.getCardThemes(res.card_type_name),'this.getCardThemes(res.card_type_name)');
           this.headerBg = this.getCardThemes(res.card_type_name);
-          //支付宝弹框
-          if(res.enterprise_info&&res.enterprise_info.is_need_activate==='Y'){
-            this.share_code = res.enterprise_info.share_code;
-            this.sign_url = res.enterprise_info.sign_url;
-            this.sign_url_qrcode = res.enterprise_info.sign_url_qrcode;
-            if(res.enterprise_info.is_need_collect_phone_number==='Y'){
-              let url = `${this.collect_phone_url}?callback_url=${encodeURIComponent(this.toCollectPhoneUrl)}`
-              this.$xdUniHelper.navigateTo({
-                url:url,
-              });
-            }
-            this.showDialog = true;
-          }
         })
         .catch((err) => {
           // this.$refs["pwPay"].clearPwd();
@@ -633,26 +558,6 @@ export default {
         clearTimeout(this.refrushTimeer);
       }
     },
-    /**
-     *@description 复制功能
-     * @param  text
-     */
-    copy(text) {
-      // #ifdef H5
-      this.$copyText(text).then((res) => {
-        this.$xdAlert({ content: "复制成功" });
-      });
-      // #endif
-      // #ifndef H5
-      uni.setClipboardData({
-        data: text,
-        showToast: false,
-        success: () => {
-          //this.$xdAlert({ content: "复制成功" });
-        },
-      });
-      // #endif
-    },
   },
 };
 </script>
@@ -1103,71 +1008,5 @@ export default {
 
     }
   }
-  .method_item{
-    padding: unit(32, rpx);
-    border-bottom: 1px solid #F8F8F8;
-    color: #333333;
-    font-size: unit(28,rpx);
-    &_top{
-      display: flex;
-      align-items: center;
-    }
-    &_bottom{
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-start;
-      margin-top: unit(16, rpx);
-      height: unit(32,rpx);
-      line-height: unit(32,rpx);
-      font-size: unit(24,rpx);
-      color: #666666;
-      &_right{
-        min-width: unit(180,rpx);
-        text-align: right;
-        color: #FF8D1A;
-      }
-      &_left{
-        color: #666666;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-    }
-    .code_img{
-      height: auto!important;
-    }
-
-  }
-  .method_title{
-    color: #fff;
-    background-color: #FF8D1A;
-    width: unit(120,rpx);
-    height: unit(50,rpx);
-    line-height: unit(50,rpx);
-    border-radius: unit(25,rpx);
-    text-align: center;
-    margin-right: unit(20,rpx);
-    font-size: unit(24,rpx);
-  }
-  .top_title{
-    height: unit(100,rpx);
-    text-align: center;
-    line-height:unit(100,rpx);
-    color:#333333;
-    font-size:unit(32,rpx);
-    border-bottom: 1px solid #F8F8F8;
-  }
-  .code_box{
-    text-align: center;
-    .qr_code{
-      width: unit(168,rpx);
-      height: unit(168,rpx);
-      image{
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-  
 }
 </style>

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -248,7 +248,7 @@ export default {
         return;
       }
 
-      let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${this.card_number}`;
+      let path = this.getUrlCallback(this.my_card_url || this.backUrl);
       //有优惠券处理
       if(this.hasCon){
         this.toShowCouponDialog();
@@ -285,7 +285,7 @@ export default {
         showClose: false,
         success: (res) => {
           if (res.confirm) {
-            let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${this.card_number}`;
+            let path = this.getUrlCallback(this.my_card_url || this.backUrl);
             this.$xdUniHelper.redirectTo({ url: path});
           }else{
           }

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -271,7 +271,7 @@ export default {
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
           if(container_id === this.hasCon){
-            let path = this.getUrlCallback(this.backUrl)+`?card_number=${this.card_number}`
+            let path = this.getUrlCallback(this.backUrl)
             this.$xdUniHelper.redirectTo({
               url: path,
             });
@@ -281,7 +281,7 @@ export default {
         this.$xdAlert({
           content: "票券绑定成功",
           close: () => {
-            let path = this.getUrlCallback(this.backUrl)+`?card_number=${this.card_number}`
+            let path = this.getUrlCallback(this.backUrl)
             this.$xdUniHelper.redirectTo({
               url: path,
             });
@@ -300,7 +300,7 @@ export default {
         showClose: false,
         success: (res) => {
           if (res.confirm) {
-            let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${this.card_number}`
+            let path = this.getUrlCallback(this.my_card_url || this.backUrl)
             this.$xdUniHelper.redirectTo({
               url: path,
             });

package/src/components/JfbBaseCodeOpenVip/Api.js

@@ -8,10 +8,12 @@ module.exports = [
   {
     mapFnName: "getExchangeCode",
     title: "兑换码",
-    path: "/member/v1/exchange/:exchange_code",
+    path: "/member/v1/card",
     isRule: true,
     params: {
-      exchange_code: ['兑换码', 'String', '必选']
+      card_number: ['券号', 'String', '可选'],
+      card_password: ['密码', 'String', '可选'],
+      card_qrcode: ['二维码', 'String', '可选'],
     },
     isConsole: true,
     disabled: true,
@@ -19,7 +21,7 @@ module.exports = [
   {
     mapFnName: "createVipOrder",
     title: "创建VIP订单",
-    path: "/member/v1/order/submit",
+    path: "/member/v1/new-order/submit",
     isRule: false,
     data: {
       business_code: ['业务编码', 'String', '必选'],
@@ -31,5 +33,14 @@ module.exports = [
     },
     isConsole: true,
     disabled: true,
-  }
+  },
+  {
+    mapFnName: 'getOpenBaseUserInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    params: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  },
 ];