jufubao-base 1.0.76 → 1.0.77-beta2

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,24 @@
           >忘记密码</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"
+      >
+        <view class="preview-login">
+          <input v-model="previewAccout" type="text" class="preview-login-input" placeholder="请输入体验码">
+        </view>
+      </xd-dailog>
     </view>
   </view>
 </template>
@@ -187,6 +205,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 +227,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 +278,7 @@ export default {
       logo: "",
       partnerName: "",
       logoTextColor: "",
+      isPreview:'N', //是否启用体验码模式
     };
   },
   computed: {
@@ -265,6 +289,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 +323,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 +370,6 @@ export default {
         this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.error');
         this.$xdLog.setARMSError(error);
       }
-      
       //#endif
 
       // if (options.isDebug === "1") {
@@ -354,7 +410,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 +520,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 +543,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 +757,7 @@ export default {
         margin-left: unit(20,rpx) !important;
       }
     }
-    
+
     .form-group {
       padding: 40rpx 70rpx;
     }
@@ -851,4 +907,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/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -26,130 +26,161 @@
         show-footer-line
         @onTab="handleChange"
       ></xd-tab>
-      <view
-        v-if="orderList && orderList.length > 0"
-        class="jfb-base-order-list__body-order"
-        :style="{ padding: outMargin }"
-      >
-        <view
-          @click="handleToLink(detailPath, item)"
-          class="jfb-base-order-list__body-order-item"
-          v-for="item in orderList"
-          :key="item.main_order_id"
-          :style="{
-            background: backgroundColor,
-            border: borderBox,
-            borderRadius: radius + 'rpx',
-            boxShadow: shadowBox,
-            marginBottom: padding + 'rpx',
-          }"
+      <view v-if="loadingList" class="jfb-base-order-list__body-order skeleton-wrap">
+        <view class="jfb-base-order-list__body-order-item"
+          v-for="i in 5" :key="i"
         >
-          <view class="jfb-base-order-list__body-order-item-biz">
-            <xd-font-icon
-              v-if="item.biz_code_icon"
-              :icon="item.biz_code_icon"
-              :size="item['biz_code_icon_size']"
-            ></xd-font-icon>
-            <view :class="{ marginLeft: item.biz_code_icon }">{{
-              item.biz_code_name
-            }}</view>
-          </view>
+          <view class="jfb-base-order-list__body-order-item-biz"><view></view></view>
           <view class="jfb-base-order-list__body-order-item-title">
-            <view>订单编号:{{ item.main_order_id }}</view>
-            <view
-              :style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}"
-              >{{ item.status.status_name }}</view>
+            <view></view>
+            <view></view>
           </view>
           <view class="order-list">
             <view
-              class="jfb-base-order-list__body-order-item-content"
-              v-for="(Sitem, Sindex) in item.products"
-              :key="Sitem.product_id + Sindex"
-              v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']">
-              <image
-                :src="Sitem.product_thumb"
-                style="background: #ffffff"
-                mode="aspectFit"
-              ></image>
+              class="jfb-base-order-list__body-order-item-content">
+              <image></image>
               <view class="jfb-base-order-list__body-order-item-content-info">
-                <view
-                  class="jfb-base-order-list__body-order-item-content-info-name"
-                  >{{ Sitem.product_name }}</view
-                >
-                <view
-                  v-if="Sitem.product_sku_name"
-                  class="jfb-base-order-list__body-order-item-content-info-skuname"
-                  >规格：{{ Sitem.product_sku_name }}</view
-                >
-                <view
-                  class="jfb-base-order-list__body-order-item-content-info-price"
-                >
-                  <view :style="{ fontSize: '32rpx', color: mainColor }">
-                    <xd-unit
-                      :isOld="false"
-                      :price="Sitem.sale_price"
-                      :color="mainColor"
-                      :fontSize="32"
-                      v-if="item.biz_code !== 'gift'"
-                    ></xd-unit>
-                  </view>
-                  <view class="info-price">
-                    <text>X</text>
-                    <text>{{ Sitem.product_num }}</text>
-                  </view>
+                <view class="jfb-base-order-list__body-order-item-content-info-name"></view>
+                <view class="jfb-base-order-list__body-order-item-content-info-price">
+                  <view></view>
+                  <view class="info-price"></view>
                 </view>
               </view>
             </view>
-            <view
-              class="order-list-icon"
-              :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
-              v-if="item.products.length > showLen"
-              @click.stop="item['isOpen'] = !item['isOpen']"
-            >
-              <view :style="{ background: backgroundColor }">
-                <xd-font-icon
-                  color="#666"
-                  :icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
-                  size="24"
-                ></xd-font-icon>
-              </view>
-            </view>
           </view>
           <view class="jfb-base-order-list__body-order-item-bottom">
-            <view>下单时间:{{ item.created_time_text }}</view>
-            <view v-if="item.biz_code !== 'gift'">
-              <text>合计:</text>
-              <xd-unit
-                :isOld="false"
-                :price="item.total_amount"
-                :color="mainColor"
-                :fontSize="28"
-              ></xd-unit>
-            </view>
+            <view></view>
+            <view></view>
           </view>
+        </view>
+      </view>
+      <template v-else>
+        <view
+          v-if="orderList && orderList.length > 0"
+          class="jfb-base-order-list__body-order"
+          :style="{ padding: outMargin }"
+        >
           <view
-            class="jfb-base-order-list__body-order-item-pay"
-            v-if="item.buttons.length"
+            @click="handleToLink(detailPath, item)"
+            class="jfb-base-order-list__body-order-item"
+            v-for="item in orderList"
+            :key="item.main_order_id"
+            :style="{
+              background: backgroundColor,
+              border: borderBox,
+              borderRadius: radius + 'rpx',
+              boxShadow: shadowBox,
+              marginBottom: padding + 'rpx',
+            }"
           >
-            <view v-for="(btn,index) in item.buttons" :key="btn.action+index">
-              <xd-button
-                :type="getBtnType(btn.action)"
-                size="mini"
-                @click="handleBtnEvent(btn.action, item)"
-                >{{ btn.text }}
-              </xd-button>
+            <view class="jfb-base-order-list__body-order-item-biz">
+              <xd-font-icon
+                v-if="item.biz_code_icon"
+                :icon="item.biz_code_icon"
+                :size="item['biz_code_icon_size']"
+              ></xd-font-icon>
+              <view :class="{ marginLeft: item.biz_code_icon }">{{
+                item.biz_code_name
+              }}</view>
+            </view>
+            <view class="jfb-base-order-list__body-order-item-title">
+              <view>订单编号:{{ item.main_order_id }}</view>
+              <view
+                :style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}"
+                >{{ item.status.status_name }}</view>
+            </view>
+            <view class="order-list">
+              <view
+                class="jfb-base-order-list__body-order-item-content"
+                v-for="(Sitem, Sindex) in item.products"
+                :key="Sitem.product_id + Sindex"
+                v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']">
+                <image
+                  :src="Sitem.product_thumb"
+                  style="background: #ffffff"
+                  mode="aspectFit"
+                ></image>
+                <view class="jfb-base-order-list__body-order-item-content-info">
+                  <view
+                    class="jfb-base-order-list__body-order-item-content-info-name"
+                    >{{ Sitem.product_name }}</view
+                  >
+                  <view
+                    v-if="Sitem.product_sku_name"
+                    class="jfb-base-order-list__body-order-item-content-info-skuname"
+                    >规格：{{ Sitem.product_sku_name }}</view
+                  >
+                  <view
+                    class="jfb-base-order-list__body-order-item-content-info-price"
+                  >
+                    <view :style="{ fontSize: '32rpx', color: mainColor }">
+                      <xd-unit
+                        :isOld="false"
+                        :price="Sitem.sale_price"
+                        :color="mainColor"
+                        :fontSize="32"
+                        v-if="item.biz_code !== 'gift'"
+                      ></xd-unit>
+                    </view>
+                    <view class="info-price">
+                      <text>X</text>
+                      <text>{{ Sitem.product_num }}</text>
+                    </view>
+                  </view>
+                </view>
+              </view>
+              <view
+                class="order-list-icon"
+                :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
+                v-if="item.products.length > showLen"
+                @click.stop="item['isOpen'] = !item['isOpen']"
+              >
+                <view :style="{ background: backgroundColor }">
+                  <xd-font-icon
+                    color="#666"
+                    :icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
+                    size="24"
+                  ></xd-font-icon>
+                </view>
+              </view>
+            </view>
+            <view class="jfb-base-order-list__body-order-item-bottom">
+              <view>下单时间:{{ item.created_time_text }}</view>
+              <view v-if="item.biz_code !== 'gift'">
+                <text>合计:</text>
+                <xd-unit
+                  :isOld="false"
+                  :price="item.total_amount"
+                  :color="mainColor"
+                  :fontSize="28"
+                ></xd-unit>
+              </view>
+            </view>
+            <view
+              class="jfb-base-order-list__body-order-item-pay"
+              v-if="item.buttons.length"
+            >
+              <view v-for="(btn,index) in item.buttons" :key="btn.action+index">
+                <xd-button
+                  :type="getBtnType(btn.action)"
+                  size="mini"
+                  @click="handleBtnEvent(btn.action, item)"
+                  >{{ btn.text }}
+                </xd-button>
+              </view>
             </view>
           </view>
         </view>
-      </view>
-      <view v-else class="jfb-base-order-list__body-no">
-        <xd-font-icon
-          size="120"
-          color="#ccc"
-          icon="iconzanwudingdan"
-        ></xd-font-icon>
-        <view>暂无订单</view>
-      </view>
+        <view v-else class="jfb-base-order-list__body-no">
+          <xd-font-icon
+            size="120"
+            color="#ccc"
+            icon="iconzanwudingdan"
+          ></xd-font-icon>
+          <view>暂无订单</view>
+        </view>
+      </template>
+      
     </view>
   </view>
 </template>
@@ -189,6 +220,7 @@ export default {
       payPath: "",
       status: null, //全部、已完成、已取消
       initStatus: false,
+      loadingList: false,
 
       //基础
       radius: 0,
@@ -387,6 +419,7 @@ export default {
       this.$xdShowLoading({});
       let tab = "all";
       if (status) tab = this.tabList[this.tabIndex].status;
+      this.loadingList = true;
       jfbRootExec("getBaseOrderList", {
         vm: this,
         data: {
@@ -396,6 +429,7 @@ export default {
         },
       })
         .then((res) => {
+          this.loadingList = false;
           this.$xdHideLoading();
           console.log(res.list, "list");
           let list = res.list.map((item) => {
@@ -496,6 +530,12 @@ export default {
     }
     &-order {
       &-item {
+        .skeleton-wrap & {
+          background-color: #FFFFFF;
+          border: 1px solid #EEEEEE;
+          border-radius: 10rpx;
+          margin: 20rpx;
+        }
         &-biz {
           color: #333333;
           font-size: unit(28, rpx);
@@ -504,6 +544,12 @@ export default {
           border-bottom: unit(2, rpx) solid #eee;
           display: flex;
           align-items: center;
+
+          & > view{
+            .skeleton-wrap &{
+              .skeleton-item(100rpx, 28rpx);
+            }
+          }
         }
 
         &-title {
@@ -517,9 +563,15 @@ export default {
 
           & > view:first-child {
             color: #333;
+            .skeleton-wrap &{
+              .skeleton-item(300rpx, 28rpx);
+            }
           }
 
           & > view:nth-child(2) {
+            .skeleton-wrap &{
+              .skeleton-item(100rpx, 28rpx);
+            }
           }
         }
 
@@ -534,6 +586,9 @@ export default {
             height: unit(160, rpx);
             border-radius: unit(8, rpx);
             flex-shrink: 0;
+            .skeleton-wrap &{
+              .skeleton-item(160rpx, 160rpx);
+            }
           }
 
           &-info {
@@ -549,6 +604,10 @@ export default {
               font-weight: 500;
               .uni-max-cut(1, 64);
               line-height: unit(64, rpx);
+
+              .skeleton-wrap &{
+                .skeleton-item(160rpx, 48rpx);
+              }
             }
 
             &-skuname {
@@ -573,6 +632,10 @@ export default {
               display: flex;
               justify-content: space-between;
               align-items: center;
+              .skeleton-wrap &{
+                .skeleton-item(100%, 32rpx);
+                margin-top: 20rpx;
+              }
             }
           }
         }
@@ -588,6 +651,9 @@ export default {
 
           & > view:first-child {
             color: #999;
+            .skeleton-wrap &{
+              .skeleton-item(300rpx, 28rpx);
+            }
           }
 
           & > view:nth-child(2) {
@@ -596,6 +662,9 @@ export default {
             & > view {
               margin-left: unit(10, rpx);
             }
+            .skeleton-wrap &{
+              .skeleton-item(300rpx, 28rpx);
+            }
           }
         }
 

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -116,7 +116,7 @@
     mixins: [componentsMixins,extsMixins,JfbBasePosterMixin],
     data() {
       return {
-        selfMask: true,
+        selfMask: false,
         params: {},
 
 				//Swiper 配置