jufubao-base 1.0.76 → 1.0.77-beta10

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -14,7 +14,17 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-entry__body" :style="bodyStyle">
-      <view class="entry_list" :style="entryStyle">
+      <view v-if="loadingList" class="entry_list skeleton-wrap" :style="entryStyle">
+        <view v-for="i in 5" :key="i"
+          :class="'row_num_'+rowNum"
+          class="entry_item"
+        >
+          <image v-if="rowNum == 1" style="height: 260rpx;"/>
+          <image v-if="rowNum == 2" style="height: 200rpx;"/>
+          <image v-if="rowNum == 3" style="height: 150rpx;"/>
+        </view>
+      </view>
+      <view v-else class="entry_list" :style="entryStyle">
         <view v-for="(item,i) in entryList" :key="i"
           class="entry_item"
           :class="'row_num_'+rowNum"
@@ -52,6 +62,7 @@
         bgcolor: "",
         rowNum: 1,
         paddingInput: 20,
+        loadingList: true,
       }
     },
     computed: {
@@ -96,6 +107,7 @@
           vm: this,
           data: {}
         }).then(res => {
+          this.loadingList = false;
           this.$xdHideLoading();
           this.entryList = res.list.map(item => {
             const {dir, path, host} = item['redirect_data'];
@@ -160,9 +172,15 @@
     &__body{
       .entry_list{
         display: grid;
+        &.skeleton-wrap{
+          .entry_item{
+            .skeleton-item(100%, auto);
+          }
+        }
         .entry_item{
           width: 100%;
           box-sizing: border-box;
+
           image{
             width: 100%;
             display: block;

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -196,7 +196,7 @@
             if(dir) jumpUrl = `//${window.location.host}/${dir}${path}`;
             else jumpUrl = path;
             //#endif
-            jumpUrl = `${jumpUrl}${bus}`;
+            jumpUrl = `${jumpUrl}${bus}}`;
             return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
           }
         })

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/Attr.js

@@ -4,6 +4,32 @@ export default {
   style: [],
   advanced: [],
   content: [
+    {
+      label: 'LOGO文字颜色:',
+      ele: 'xd-color',
+      valueKey: 'logoTextColor',
+      value: '',
+      placeholder: '请输入LOGO文字颜色',
+      classNmae: 'input80',
+    },
+    {
+      label: '是否使用体验码功能:',
+      ele: 'xd-radio',
+      valueKey: 'isPreview',
+      value: 'N',
+      placeholder: '请选择是否使用体验码功能',
+      multiple: false,
+      className: 'input80',
+      list: [
+        {label: '是', value: 'Y'},
+        {label: '否', value: 'N'},
+      ]
+    },
+    {
+      ele: 'title',
+      label: '页面连接设置',
+      size: 'small',
+    },
     {
       label: '快速授权失败访问地址:', //label
       ele: 'xd-select-pages-path', //package 名称
@@ -60,12 +86,9 @@ export default {
       inline: false,
     },
     {
-      label: 'logo文字颜色:',
-      ele: 'xd-color',
-      valueKey: 'logoTextColor',
-      value: '',
-      placeholder: '请输入logo文字颜色',
-      classNmae: 'input80',
+      ele: 'title',
+      label: '服务设置',
+      size: 'small',
     },
     {
       label: '隐私政策:',

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -170,6 +170,25 @@
           >忘记密码</view
         >
       </view>
+      <view  class="bottom_btn" :style="prod_bottom" v-if="isPreview === 'Y'">
+        <view @click="dialogPreview = true" :style="{
+          color: mainColor,
+          border: `1px solid ${mainColor}`
+        }">进入体验 ></view>
+      </view>
+      <xd-dailog
+        v-if="dialogPreview"
+        title="体验码"
+        :show.sync="dialogPreview"
+        :cancel="false"
+        confirm-text="进入体验模式"
+        @onBtn="handlePreview"
+        @close="previewAccout=''"
+      >
+        <view class="preview-login">
+          <input v-model="previewAccout" type="text" class="preview-login-input" placeholder="请输入体验码">
+        </view>
+      </xd-dailog>
     </view>
   </view>
 </template>
@@ -187,6 +206,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 +228,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
@@ -255,6 +279,7 @@ export default {
       logo: "",
       partnerName: "",
       logoTextColor: "",
+      isPreview:'N', //是否启用体验码模式
     };
   },
   computed: {
@@ -265,6 +290,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 +324,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 +371,6 @@ export default {
         this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.error');
         this.$xdLog.setARMSError(error);
       }
-      
       //#endif
 
       // if (options.isDebug === "1") {
@@ -354,7 +411,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;
-      
+      this.isPreview = getContainerPropsValue(value, "content.isPreview", 'N');
     },
 
     /**
@@ -464,22 +521,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 +544,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 +758,7 @@ export default {
         margin-left: unit(20,rpx) !important;
       }
     }
-    
+
     .form-group {
       padding: 40rpx 70rpx;
     }
@@ -851,4 +908,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/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -294,6 +294,9 @@
             <view class="jfb-base-order-detail__body-cashier-text">
               {{ info.codes[0].can_read_code }}
             </view>
+            <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
+              {{info.codes[0].refund_tip_text}}
+            </view>
             <view
               v-if="info.codes[0].code_end_time"
               class="jfb-base-order-detail__body-cashier-code"