jufubao-base 1.0.243-beta1001 → 1.0.243-beta1003

package/package.json

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

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -329,7 +329,9 @@
           vm: this,
           data: {},
         }).then(res => {
-          this.userInfo = res || {};
+          res = res || {};
+          if(res['head_url']) res['head_url'] = getServiceUrl(res['head_url'], 'size2')
+          this.userInfo = res;
         })
       },
       async p_getAsyncStep() {
@@ -1106,4 +1108,4 @@
       line-height: inherit;
     }
   }
-</style>
+</style>

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -50,7 +50,6 @@
             v-if="hasAuthLogin"
             :disabled="!panelIsChecked"
             type="primary"
-            open-type="getUserInfo"
             :radius="btnRadius + 'rpx'"
             @click="doWxMpLogin"
             >
@@ -784,18 +783,12 @@ export default {
       uni.login({
         provider: "weixin",
         success: (loginRes) => {
-          let raw_data = {
-            encryptedData:detail.encryptedData,
-            iv:detail.iv,
-            signature: detail.signature
-          }
           jfbRootExec("loginThirdLogin", {
             vm: this,
             data: {
               third_auth_code: loginRes.code,
               provider_id: this.quickLogin.provider_id,
               share_code: this.share_code,
-              raw_data
             },
           })
             .then((res) => {

package/src/components/JfbBaseOpenVip/Api.js

@@ -15,7 +15,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: "getVipList",
+    mapFnName: "getOpenVipList",
     title: "会员中心 - 会员卡列表",
     path: "/member/v1/vip-card",
     isRule: false,

package/src/components/JfbBaseOpenVip/JfbBaseOpenVip.vue

@@ -74,7 +74,7 @@
           </view>
         </view> -->
       </view>
-      
+
       <xd-vip-list v-if="!isVip" :list="showVipCardList"
         @handlePrivacy="handlePrivacy"
         @toVipDetail="toVipDetail"
@@ -188,6 +188,8 @@
           vm: this,
           data: {}
         }).then(res => {
+          res = res || {};
+          if(res['head_url']) res['head_url'] = getServiceUrl(res['head_url'], 'size2')
           this.uInfo = res;
           this.vip_expire_time = this.$xdUniHelper.getDate(res.vip_expire_time * 1000 ).fullDate;
         })
@@ -201,7 +203,7 @@
         })
       },
       p_getVipList(){
-        jfbRootExec("getVipList", {
+        jfbRootExec("getOpenVipList", {
           vm: this,
           data: {}
         }).then(res => {

package/src/components/JfbBaseOpenVip/Mock.js

@@ -2,6 +2,6 @@
 
 module.exports = {
   getOpenBaseUserInfo: {"user_name":"","user_code":"Uf4zx6EPfV","nickname":"未来～","real_name":"","head_url":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/Q0j4TwGTfTJsajZzh53IB56crRSdmKvRbjT4V1Ha8v5uCOkASbWS0GibgLeic8OKBzAwUyBa3vZGhjwmd6RfpG9g\/132","province_code":"","city_code":"","province_name":"","city_name":"","sex":"","sex_name":"未知","birthday_date":"","phone_number":"13611111111","show_user_name":"未来～","user_level":"","vip_expire_time":1745026677,"request_id":"250e5709e6c95066"},
-  getVipList: {"total_size":3,"next_page_token":"","list":[{"vip_card_id":3,"product_id":60038520,"product_name":"体验卡","sale_price":200,"vip_card_icon":""},{"vip_card_id":2,"product_id":60038519,"product_name":"月卡","sale_price":2678,"vip_card_icon":""},{"vip_card_id":1,"product_id":60038515,"product_name":"测1","sale_price":20085,"vip_card_icon":""}],"request_id":"6b4aef5e06411d8a"},
+  getOpenVipList: {"total_size":3,"next_page_token":"","list":[{"vip_card_id":3,"product_id":60038520,"product_name":"体验卡","sale_price":200,"vip_card_icon":""},{"vip_card_id":2,"product_id":60038519,"product_name":"月卡","sale_price":2678,"vip_card_icon":""},{"vip_card_id":1,"product_id":60038515,"product_name":"测1","sale_price":20085,"vip_card_icon":""}],"request_id":"6b4aef5e06411d8a"},
   getVipMoneySaving: { "save_amount": 100 , "request_id": "6b4aef5e06411d8a" }
 }

package/src/components/JfbBaseOpenVip/XdVipList.vue

@@ -6,7 +6,7 @@
         @click="handleChoseVip(item.vip_card_id)"
       >
         <view class="vip_name">{{ item.product_name}}</view>
-        <view class="vip_price">{{ $xdUniHelper.divisionFloatNumber(item.sale_price, 100) }}</view>
+        <view class="vip_price">￥{{ $xdUniHelper.divisionFloatNumber(item.sale_price, 100).toFixed(2) }}</view>
       </view>
     </view>
     <view class="vip_pay">
@@ -14,7 +14,6 @@
         <template v-if="vip_card_id===-1">0元开通</template>
         <template v-else>
           立即支付 ￥{{ $xdUniHelper.divisionFloatNumber(curVipCard.sale_price, 100) }} 
-          {{ curVipCard.vip_card_life_cycle_unit ? '/'+curVipCard.vip_card_life_cycle_unit:'' }}
         </template>
       </view>
       <view class="vip_tip">开通视为同意<text @click.stop="handlePrivacy('privacy_service')">《共享PLUS会员用户协议》</text></view>

package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue

@@ -8,7 +8,13 @@
     <view class="jfb-base-personal-data__body" v-if="info">
       <view class="jfb-base-personal-data__body-item">
         <view class="jfb-base-personal-data__body-item-label">头像</view>
-        <image class="profile" :src="info.head_url"  ></image>
+        <view class="profile">
+          <image :src="info.head_url"></image>
+          <!--#ifdef MP-->
+          <button type="default" open-type="chooseAvatar" @chooseavatar="handleChooseAvatar"></button>
+          <!-- #endif -->
+        </view>
+
       </view>
       <view class="jfb-base-personal-data__body-item">
         <view class="jfb-base-personal-data__body-item-label">账号</view>
@@ -16,19 +22,45 @@
       </view>
       <view class="jfb-base-personal-data__body-item">
         <view class="jfb-base-personal-data__body-item-label">名称</view>
-        <input @blur="handleSetInfo" @confirm="handleSetInfo" class="jfb-base-personal-data__body-item-value"
-          v-model="info.nickname" type="text">
+        <!--#ifdef MP-->
+        <input
+          @change="handleWxSetInfo"
+          class="jfb-base-personal-data__body-item-value"
+          v-model="info.nickname"
+          type="nickname"
+        >
+        <!-- #endif -->
+        <!--#ifdef H5-->
+        <input
+          @blur="handleSetInfo"
+          @confirm="handleSetInfo"
+          class="jfb-base-personal-data__body-item-value"
+          v-model="info.nickname"
+          type="text"
+        >
+        <!-- #endif -->
       </view>
       <view class="jfb-base-personal-data__body-item">
         <view class="jfb-base-personal-data__body-item-label">性别</view>
-        <XdSelect @change="handleSetSex" padding="0" color="#999" class="select" :defaultValue="info.sex"
-          v-model="info.sex" :list="sexList">
+        <XdSelect
+          @change="handleSetSex"
+          padding="0"
+          color="#999"
+          class="select"
+          :defaultValue="info.sex"
+          v-model="info.sex"
+          :list="sexList"
+        >
           <template>
             <view class="jfb-base-personal-data__body-item-value">
-              <XdFontIcon class="icon" color="#999999" size="24" icon="iconxiangyou_xian"></XdFontIcon>
+              <XdFontIcon
+                class="icon"
+                color="#999999"
+                size="24"
+                icon="iconxiangyou_xian"
+              ></XdFontIcon>
             </view>
           </template>
-
         </XdSelect>
       </view>
       <view class="jfb-base-personal-data__body-item">
@@ -54,6 +86,8 @@
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
+  import {mapActions} from "vuex";
+  import getServiceUrl from "@/common/getServiceUrl";
   export default {
     name: "JfbBasePersonalData",
     components: {
@@ -91,6 +125,45 @@
       this.init(this.container);
     },
     methods: {
+      //#ifdef MP
+      ...mapActions(['getUploadParams']),
+
+      handleChooseAvatar({detail}){
+        this.info.head_url = detail.avatarUrl;
+        let temp = detail.avatarUrl.split('.')
+        let ext = temp[temp.length -1];
+        let name = `${this.info.nickname}.${ext}`;
+        this.$xdShowLoading({});
+        this.getUploadParams({name,type: 'public'})
+          .then(res=>{
+            uni.uploadFile({
+              url: res.action,
+              filePath: detail.avatarUrl,
+              name: 'file',
+              formData: this.$xdUniHelper.cloneDeep(res),
+              success: (uploadFileRes) => {
+                this.handleSetInfo({head_url: res.url}, ()=>{
+                  this.$xdHideLoading()
+                })
+
+              },
+              error:()=>{
+                this.$xdHideLoading()
+              }
+            });
+          })
+          .catch(err=>{
+            this.$xdHideLoading()
+          });
+      },
+
+      handleWxSetInfo(){
+        if(this.info.nickname) {
+          this.handleSetInfo();
+        }
+      },
+      //#endif
+
       onJfbLoad(options) {
         this.getInfo()
       },
@@ -100,59 +173,46 @@
        */
       init(container) {
       },
+
       getInfo() {
         jfbRootExec("getBasePersonInfo", {
           vm: this,
           data: {},
         }).then(res => {
           this.info = res
+          if(this.info.head_url) this.info.head_url = getServiceUrl(this.info.head_url,'size2')
         })
       },
       confirmDate(e) {
-        console.log(e, 'confirmDate');
         this.info.birthday_date = e.fulldate
         this.handleSetInfo()
       },
-      closeDate() {
-
-      },
+      closeDate() {},
       handleSetSex(data) {
         this.info.sex = data.item.value
         this.handleSetInfo()
       },
-      handleSetInfo() {
+
+      handleSetInfo(ext={}, cb) {
+        let params = {
+          nickname: this.info.nickname,
+          sex: this.info.sex,
+          birthday_date: this.info.birthday_date
+        }
+        //设置扩展信息
+        if(!this.$xdUniHelper.isEmpty(ext)) {
+          params = Object.assign({},params,ext);
+        }
+        debugger
         jfbRootExec("setBasePersonInfo", {
           vm: this,
-          data: {
-            nickname: this.info.nickname,
-            sex: this.info.sex,
-            birthday_date: this.info.birthday_date
-          },
+          data: params,
         }).then(res => {
-          this.getInfo()
+          this.getInfo();
+          if(typeof cb === 'function') cb();
         })
       },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
-      onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
+
     }
   }
 
@@ -193,6 +253,24 @@
           width: 80rpx;
           height: 80rpx;
           border-radius: 50%;
+          position: relative;
+          overflow: hidden;
+
+          & > image {
+            width: 78rpx;
+            height: 78rpx;
+            border-radius: 50%;
+            border:1px solid #ccc;
+            box-sizing: border-box;
+          }
+          & > button {
+            position: absolute;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            top: 0;
+            opacity: 0;
+          }
         }
       }
     }

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -460,7 +460,7 @@ export default {
     },
   },
   computed: {
-    ...mapState(["brandInfo", "siteInfo"]),
+    ...mapState(["brandInfo", "siteInfo", "jfbAuthorize"]),
     ...styleForm.getComputedItem(),
   },
   created() {
@@ -598,6 +598,11 @@ export default {
     },
 
     handleOrderResolve(info) {
+      //#ifdef MP-WEIXIN
+      if(info.is_clear_vip_cookie && info.is_clear_vip_cookie === 'Y'){
+        this.jfbAuthorize.removeToken('access');
+      }
+      //#endif
       info.btn = [
         { label: "返回首页", value: 1, type: "default", radius: "12rpx" },
         {

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -341,9 +341,10 @@
             vm: this,
             data: {}
           }).then(res => {
-            this.userInfo = res || {};
+            res = res || {};
+            if(res['head_url']) res['head_url'] = getServiceUrl(res['head_url'], 'size2')
+            this.userInfo = res;
             this.logined = true;
-            console.log('getBaseUserInfo', res)
           }).catch(error => {
             console.log('getBaseUserInfo', error)
           });
@@ -352,13 +353,13 @@
 
         this.logined = await this.jfbAuthorize.checkUserLogin(true, this, false);
         if (!this.logined) return;
-
         jfbRootExec('getBaseUserInfo', {
           vm: this,
           data: {}
         }).then(res => {
-          this.userInfo = res || {};
-          console.log('getBaseUserInfo', res)
+          res = res || {};
+          if(res['head_url']) res['head_url'] = getServiceUrl(res['head_url'], 'size2')
+          this.userInfo = res;
         }).catch(error => {
           console.log('getBaseUserInfo', error)
         })