jufubao-base 1.0.72 → 1.0.73-beta1

package/package.json

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

package/src/common/authorize.js

@@ -29,6 +29,7 @@ class JfbAuthorize {
       'card': 'JFB-CARD-TOKEN-{siteID}',
       'refresh': 'JFB-REFRESH-TOKEN-{siteID}',
       'access': 'JFB-ACCESS-TOKEN',
+      'cardCode':'JFB-CARD-CODE-{siteID}'
     }, settings.token? settings.token: {});
   }
 
@@ -40,6 +41,7 @@ class JfbAuthorize {
    * @returns {string|*}
    */
   getTokenKeyword(key){
+
     if (!this.config[key]) key = 'user';
     if(key === 'access') return this.config.access;
     else{
@@ -83,6 +85,8 @@ class JfbAuthorize {
    */
   removeToken(key, options = {}) {
     key = this.getTokenKeyword(key);
+    let codeKey =  this.getTokenKeyword('cardCode');
+    debugger
     //#ifdef H5
     cookie.remove(key, options);
     console.warn(`cookie.key=${key}`);
@@ -142,7 +146,7 @@ class JfbAuthorize {
    * @description 跳转到用户登陆页面
    * @param $vm {Vue}
    */
-  jumpToUserLogin($vm) {
+  jumpToUserLogin($vm,isRedirect) {
     let redirect_url = '';
     if(store.state.configProject.platform === 'mp.weixin') {
       redirect_url = $vm['$xdUniHelper'].parseURL().source;

package/src/components/JfbBaseLogin/Api.js

@@ -131,4 +131,13 @@ module.exports = [
       provider_id: ['登陆提供者id', 'String', '必选']
     }
   },
+  {
+    mapFnName: 'loginExperience',
+    title: '体验码登录',
+    path: '/passport-pb/v1/user/login-experience',
+    isRule: false,
+    params: {
+      experience_code: ['体验码code', 'String', '必选'],
+    }
+  },
 ];

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -170,6 +170,23 @@
           >忘记密码</view
         >
       </view>
+      <view  class="bottom_btn" :style="prod_bottom">
+        <view @click="dialogPreview = true" :style="{
+          color: mainColor,
+          border: `1px solid ${mainColor}`
+        }">进入体验 ></view>
+      </view>
+      <xd-dailog
+        title="体验码"
+        :show.sync="dialogPreview"
+        :cancel="false"
+        confirm-text="进入体验模式"
+        @onBtn="handlePreview"
+      >
+        <view class="preview-login">
+          <input v-model="previewAccout" type="text" class="preview-login-input" placeholder="请输入体验码">
+        </view>
+      </xd-dailog>
     </view>
   </view>
 </template>
@@ -187,6 +204,7 @@ import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
 import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdForm from "@/components/XdForm/XdForm";
 import XdFormItem from "@/components/XdFormItem/XdFormItem";
+import XdDailog from "@/components/XdDailog/XdDailog.vue";
 import { Base64 } from "js-base64";
 import { mapState } from "vuex";
 import getServiceUrl from "@/common/getServiceUrl";
@@ -208,15 +226,19 @@ export default {
     XdFormInput,
     XdForm,
     XdFormItem,
+    XdDailog
   },
   mixins: [componentsMixins, extsMixins, JfbBaseLoginMixin, privacyMixins],
   data() {
     return {
+      //体验模式
+      dialogPreview: false,
+      previewAccout: '',
+
       showStep: 1,
       panel_1_checked: "",
       panel_2_checked: "",
       password: "",
-      //todo
       accountLoginType: "phone", //phone: 验证码登录   pwd: 密码登录
       accountForm: {
         phone_number: "", //15801505541
@@ -265,6 +287,9 @@ export default {
     panelTwoIsChecked() {
       return this.panel_2_checked.includes(1);
     },
+    prod_bottom() {
+      return this.fixedStyle({ height: 0, zIndex: 111 });
+    },
   },
   watch: {
     container(value) {
@@ -296,16 +321,46 @@ export default {
         url: `/pages/content/content?${params}`
       })
     },
-    
-    
+
+    loginPreview(experience_code){
+      return new Promise((resolve,reject)=>{
+        jfbRootExec("loginExperience", {
+          vm: this,
+          data: {experience_code},
+        }).then(res=>{
+          resolve(res)
+        }).catch(err=>{
+          reject(err)
+        })
+      })
+    },
+
+    async handlePreview(){
+      if(!this.previewAccout) {
+        this.$xdAlert({
+          content: '请输入体验码',
+          type:'error'
+        });
+        return;
+      }
+      this.$xdShowLoading({});
+      try{
+        const res = await this.loginPreview(this.previewAccout);
+        if(res) this.jfbAuthorize.setAllToken(res);
+        this.toHomeAfterLogin();
+        this.$xdHideLoading();
+      }catch (e){
+        this.$xdHideLoading();
+      }
+    },
+
+
     onJfbLoad(options) {
       this.redirect_url = options.redirect_url ? Base64.decode(options.redirect_url): '';
       // #ifdef MP-WEIXIN
       this.authWxMpListProviders();
       // #endif
-      
       this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.start')
-      
       // #ifdef H5
       try{
         this.authH5ListProviders();
@@ -313,7 +368,6 @@ export default {
         this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.error');
         this.$xdLog.setARMSError(error);
       }
-      
       //#endif
 
       // if (options.isDebug === "1") {
@@ -354,7 +408,7 @@ export default {
       this.phone_number_collect_url = getContainerPropsValue(value, "content.phone_number_collect_url", {value: ''}).value;
       this.forget_pwd_url = getContainerPropsValue(value, "content.forget_pwd_url", {value: ''}).value;
       this.error_callback_url = getContainerPropsValue(value, "content.error_url", {value: ''}).value;
-      
+
     },
 
     /**
@@ -464,22 +518,22 @@ export default {
         "62fde99f2583a19c58fd937b",
         "62fde9432583a19c58fd937a",
       ];
-      
+
       let { redirect_url, callback_url } = this;
-      
+
       //不同项目直接域名替换
       if (/^(@site_domain@).+$/.test(redirect_url)) {
         redirect_url = redirect_url.replace(/@site_domain@/, location.origin)
       }
-      
+
       try {
         let redirectURL = new URL(redirect_url);
         redirect_url = redirectURL.href;
       } catch (e) {
         redirect_url = location.origin + this.base + redirect_url;
       }
-      
-      
+
+
       let params = {
         providers: providers.join(","),
         callback_url: redirect_url,
@@ -487,9 +541,9 @@ export default {
         phone_number_collect_url: location.origin + this.base + this.phone_number_collect_url,
         error_callback_url: location.origin + this.base + this.error_callback_url,
       };
-  
+
       this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.loading..');
-      
+
       jfbRootExec("listSiteProvider", {
         vm: this,
         data: params,
@@ -701,7 +755,7 @@ export default {
         margin-left: unit(20,rpx) !important;
       }
     }
-    
+
     .form-group {
       padding: 40rpx 70rpx;
     }
@@ -851,4 +905,45 @@ export default {
 .login-pub {
   margin-top: unit(40, rpx);
 }
+.bottom_btn {
+  position: fixed;
+  width: 100%;
+  display:flex;
+  justify-content: center;
+  align-items: center;
+  height: unit(100, rpx);
+  background: #ffffff;
+
+  & > view {
+    height: unit(44, rpx);
+    line-height: unit(44, rpx);
+    width: unit(150, rpx);
+    text-align: center;
+    cursor: pointer;
+    font-size: unit(24, rpx);
+    border-radius: unit(12, rpx);
+  }
+}
+
+.preview-login {
+  padding: unit(40, rpx) 0;
+
+  &-input {
+    height: unit(70, rpx);
+    border-radius: unit(12, rpx);
+    padding: 0 unit(20, rpx);
+    text-align: left;
+    border: 1px solid #eee;
+    background: #F7F7F7;
+    color: #666;
+    transition: box-shadow 0.5s;
+    box-shadow: 0 0 0 rgba(0,0,0,0);
+
+    &:hover {
+      box-shadow: 0 0 unit(10, rpx) rgba(0,0,0,.1);
+    }
+  }
+}
+
+
 </style>

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -37,19 +37,20 @@
               <xd-font-icon :color="color" icon="iconwode_mian" size="100"></xd-font-icon>
             </view>
           </template>
-          <view class="no-image" :style="{borderColor: color}" v-else>
+          <view v-else class="no-image" :style="{borderColor: color}">
             <xd-font-icon :color="color" icon="iconwode_mian" size="90"></xd-font-icon>
           </view>
+
           <view v-if="logined && textType ==='N'" :style="{color:color}">{{userInfo|getName}}</view>
           <view class="vertical-user" v-if="logined && textType ==='Y'" :style="{color:color}">
             <view>{{userInfo|getName}}</view>
-            <view @click="handleToLink()" v-if="0">
+            <view @click="handleToLink()">
               <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
             </view>
           </view>
         </view>
-        <view @click="handleToLink()" v-if="logined && textType ==='N' && 0 ">
-          <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
+        <view @click="handleLogout()" v-if="logined" class="logout">
+          <view v-if="textType ==='N'">[退出登录]</view>
         </view>
       </view>
     </view>
@@ -64,6 +65,7 @@
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import {mapState} from 'vuex';
+  import store from "@/store";
   export default {
     name: "JfbBaseUserInfo",
     components: {
@@ -72,7 +74,7 @@
     mixins: [componentsMixins,extsMixins,JfbBaseUserInfoMixin],
     computed: {
       ...mapState(['jfbAuthorize']),
-      
+
       outMargin() {
         let margin = `${this.margin.top !== null ? this.margin.top : 20}rpx`;
         margin = `${margin} ${this.margin.right !== null ? this.margin.right : 20}rpx`;
@@ -106,24 +108,24 @@
         logined: false,
         userInfo: null,
         address_url: '',
-        
+
         //基础
         color: '#333',
         backgroundColor: 'rgba(0,0,0,0)',
         textType: 'N', //默认水平
         radius: 0,
-        
+
         //投影
         is_shadow: 'Y',
         is_shadow_bg: 0,
         is_shadow_w: 0,
-        
-        
+
+
         //边框
         is_border: 'Y',
         is_border_w: 0,
         is_border_c: '',
-        
+
         //其他
         margin: {
           top: 0,
@@ -137,7 +139,7 @@
           right: 0,
           bottom: 0
         },
-        
+
       }
     },
     watch: {
@@ -154,8 +156,27 @@
           url: '/pages/settings/settings'
         })
       },
+
+      async handleLogout(){
+        debugger
+        // #ifdef H5
+        if (this.$configProject.isPreview) return;
+        // #endif
+
+        if (this.jfbAuthorize !== null) {
+          this.$xdShowLoading({});
+          store.dispatch('logout').then(res=>{
+            this.$xdHideLoading();
+            this.jfbAuthorize.removeToken('card');
+            this.jfbAuthorize.jumpToUserLogin(this, false);
+          }).catch(err=>{
+            console.error(err);
+          })
+        }
+      },
+
       async onJfbLoad(options) {
-        
+
         //预览模式
         if(this.$configProject.isPreview) {
           jfbRootExec('getBaseUserInfo', {
@@ -170,10 +191,10 @@
           });
           return;
         }
-        
+
         this.logined = await this.jfbAuthorize.checkUserLogin(true, this, false);
         if(!this.logined) return;
-        
+
         jfbRootExec('getBaseUserInfo', {
           vm: this,
           data: {}
@@ -194,16 +215,16 @@
         this.address_url = getContainerPropsValue(container, 'content.address_url', {value: ''});
         this.color = getContainerPropsValue(container, 'content.textColor', '#333');
         this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', 'rgba(0,0,0,0)');
-        this.textType = getContainerPropsValue(container, 'content.text_type', 'N');
-        
+        this.textType = "N";//getContainerPropsValue(container, 'content.text_type', 'N');
+
         this.is_shadow = getContainerPropsValue(container, 'content.is_shadow', 'N');
         this.is_shadow_bg = getContainerPropsValue(container, 'content.is_shadow_bg', '#fff');
         this.is_shadow_w = getContainerPropsValue(container, 'content.is_shadow_w', '10');
-  
+
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', '10');
-        
+
         this.radius = getContainerPropsValue(container, 'content.radius', '0');
       },
     }
@@ -213,7 +234,7 @@
 
 <style scoped lang="less">
   @import "./JfbBaseUserInfoLess.less";
-  
+
   .vertical-user {
     display: flex;
     justify-content: center;
@@ -229,29 +250,29 @@
         display: flex;
         align-items: center;
         justify-content: flex-start;
-        
-    
+
+
         &-left {
           display: flex;
           align-items: center;
           flex: 1;
-  
+
           &.vertical {
             width: 100%;
             flex-direction: column;
-            
+
             & > view:last-child {
               width: 100%;
               text-align: center;
               flex-shrink: 0;
               padding-top: unit(20, rpx);
             }
-  
+
             & > image, .no-image {
               margin-right: unit(0, rpx);
             }
           }
-      
+
           & > image, .no-image {
             width: unit(140, rpx);
             height: unit(140, rpx);
@@ -263,21 +284,28 @@
             flex-shrink: 0;
             overflow: hidden;
           }
-          
+
           .no-image {
             border: unit(4, rpx) solid #e5e5e5;
           }
-      
+
           & > view {
             color: #383838;
             font-size: unit(32, rpx);
           }
         }
-        
+
         & > view:nth-child(2) {
           flex-shrink: 0;
         }
       }
     }
+
+    .logout {
+      font-size: unit(26, rpx);
+      & > view {
+        color: #333;
+      }
+    }
   }
 </style>