jufubao-base 1.0.158 → 1.0.159-beta2

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -10,37 +10,10 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-card-detail-entry__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-card-detail-entry__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-detail-entry__body" v-if="info!==null">
-      <!-- <view class="card-list" :style="{
-            background: headerBg['color'],
-            backgroundSize: '100%'
-          }">
-                <view class="card-list-warp" :style="{backgroundImage: `url(${headerBg['image']})`}">
-            <view class="card-list__title"><view>{{info['card_type_name']}}</view></view>
-            <div class="card-list__content">
-              <view>
-                <text>券号：</text>
-                <text>{{info.card_number}}</text>
-              </view>
-            </div>
-            <view class="card-list__date">
-              <text>有效期：</text>
-              <text>{{info.end_time}}</text>
-            </view>
-            <view class="card-list__yue">
-              <text>余额：</text>
-              <text>{{info.card_point}} {{ info.unit }}</text>
-            </view>
-            <view class="card-list__other" v-if="info.other_card_point && info.card_point_type === 2">
-              <view><text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text></view>
-            </view>
-          </view>
-        </view> -->
       <view class="qrcode_card">
         <view class="jfb-base-card-detail-entry__body-qrcode">
           <view class="barcode_wrap">
@@ -55,13 +28,13 @@
             ></image>
             <image v-if="isBrandLogo" class="logo-icon" :src="brandLogo"></image>
           </view>
-          <!-- <view :style="{marginTop: '20rpx'}" v-if="timeStr">消费二维码，有效期为{{ info["card_qrcode_expire"] / 60 }}分钟</view> -->
           <view v-if="timeStr">{{ timeStr }}后自动刷新</view>
           <view class="refresh_wrap" @click="handleRefresh">
-            <xd-font-icon icon="iconshuaxin"
+            <xd-font-icon
+              icon="iconshuaxin"
               style="margin-right: 24rpx;"
-              size="28"></xd-font-icon> 刷新二维码
-          </view>
+              size="28"
+            ></xd-font-icon> 刷新二维码</view>
         </view>
         <view class="card_info">
           <view class="card_type">{{ info['card_type_name'] }}</view>
@@ -73,53 +46,47 @@
           </view>
         </view>
       </view>
-
       <view
-      v-if="info.site_entry_settings&&info.site_entry_settings.length>0"
-      class="jfb-base-card-detail-entry__body-business"
+        v-if="info.site_entry_settings&&info.site_entry_settings.length>0"
+        class="jfb-base-card-detail-entry__body-business"
       >
-       <view
-       class="jfb-base-card-detail-entry__body-business-title"
-       >
-      进入业务板块
-      </view>
-      <view style="display:flex;align-content:center;justify-content:flex-start">
-        <view class="jfb-base-card-detail-entry__body-business-content">
-        <view
-        class="jfb-base-card-detail-entry__body-business-content-item"
-        @click="handleBindLogin(item)"
-        v-for="(item,index) in info.site_entry_settings"
-        :key="index">
-          <view><image :src="item.image_url"></image></view>
-          <view>{{item.entry_name}}</view>
+        <view class="jfb-base-card-detail-entry__body-business-title">进入业务板块</view>
+        <view style="display:flex;align-content:center;justify-content:flex-start">
+          <view class="jfb-base-card-detail-entry__body-business-content">
+            <view
+              class="jfb-base-card-detail-entry__body-business-content-item"
+              @click="handleBindLogin(item)"
+              v-for="(item,index) in info.site_entry_settings"
+              :key="index"
+            >
+              <view><image :src="item.image_url"></image></view>
+              <view>{{item.entry_name}}</view>
+            </view>
+          </view>
         </view>
       </view>
-      </view>
-    </view>
-    <view :style="{height: '100rpx'}"></view>
-        <!-- 靠底支付 -->
-        <view class="fixe_bottom" :style="prod_bottom">
-          <view v-if="0">
-            <xd-button size="small" type="primary" width="100%">消费记录</xd-button>
-          </view>
-          <view v-if="info.is_exchange==='Y'">
-            <xd-button
-              width="100%"
-              @click="handleToShift"
-              size="small"
-              type="primary"
-            >券转换</xd-button>
-          </view>
-          <view v-if="isShowUnbind">
-            <xd-button
-              width="100%"
-              @click="handleUnBindCard"
-              size="small"
-              type="primary">
-              解除绑定
-            </xd-button>
-          </view>
+      <view :style="{height: '100rpx'}"></view>
+      <!-- 靠底支付 -->
+      <view class="fixe_bottom" :style="prod_bottom">
+        <view v-if="0">
+          <xd-button size="small" type="primary" width="100%">消费记录</xd-button>
+        </view>
+        <view v-if="info.is_exchange==='Y'">
+          <xd-button
+            width="100%"
+            @click="handleToShift()"
+            size="small"
+            type="primary"
+          >券转换</xd-button>
         </view>
+        <view v-if="isShowUnbind">
+          <xd-button
+            width="100%"
+            @click="handleUnBindCard()"
+            size="small"
+            type="primary">解除绑定</xd-button>
+        </view>
+      </view>
     </view>
   </view>
 </template>
@@ -139,6 +106,7 @@ import XdPwPay from "./XdPwPay";
 import XdEditPwd from "./XdEditPwd";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import XdButton from '@/components/XdButton/XdButton'
+import {parsePath} from "@/utils/linkUrl";
 export default {
   name: "JfbBaseCardDetailEntry",
   components: {
@@ -154,6 +122,7 @@ export default {
   data() {
     return {
       userInfo: null, //用户信息（暂时不可用）
+      entryGroupId: '',//加载入口数据组别
 
       info: null,
       timeStr: "",
@@ -177,83 +146,66 @@ export default {
       shift_url: "",
 
       //品牌logo
-      brandLogo:
-        "data:image/png;base64,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",
+      //#ifdef H5
+      brandLogo: '//img.jufubao.cn/common/jufubao_logo.png?v=1.0.0',
+      //#endif
+      //#ifdef MP-WEIXIN
+      brandLogo:'https://img.jufubao.cn/common/jufubao_logo.png?v=1.0.0',
+      //#endif
       isBrandLogo: false,
-
       isShowUnbind: false, //是否启动绑定按钮
       headerBg: {},
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   computed: {
-    ...mapState(["brandInfo"]),
-    jfbAuthorize: (state) => state.jfbAuthorize,
+    ...mapState(["brandInfo",'jfbAuthorize']),
+
     prod_bottom() {
-        return this.fixedStyle({height: 0, zIndex: 111});
-      },
+      return this.fixedStyle({height: 0, zIndex: 111});
+    },
+  },
+  created() {
+    this.init(this.container)
   },
-  created() {},
   methods: {
     onJfbLoad(options) {
-      console.log(options,'optionsoptionsoptionsoptions');
       if (options["x-params"]) {
         try {
           let params = JSON.parse(Base64.decode(options["x-params"]));
           this.brandLogo = params["qrcode_logo"];
+
         } catch (e) {
           console.warn(options["x-params"]);
         }
       }
 
-      this.$nextTick(() => {
-        this.card_number = options.card_number;
-        this.init();
-
-        // if (card_number) {
-        //   this.card_number = card_number;
-        //   if (this.brandInfo['is_enable_pay_password'] === 'N') {
-        //     this.init();
-        //   } else if (this.brandInfo['is_enable_pay_password'] === 'Y' && this.userInfo['has_user_set_password'] === 'N') {
-        //     this.editShow = true
-        //     this.pwdTitle = '您还未设置支付密码，请设置您的平台支付密码'
-        //   } else if (this.brandInfo['is_enable_pay_password'] === 'Y' && this.userInfo['has_user_set_password'] === 'Y') {
-        //     this.show = true
-        //     this.textList = [
-        //       {
-        //         label: '查看卡详情',
-        //       },
-        //       {
-        //         label: '请输入支付密码',
-        //       }
-        //     ]
-        //   }
-        //   this.first = true;
-        // } else {
-        //   setTimeout(() => {
-        //     this.$xdUniHelper.navigateTo({
-        //       url: `/pages/index/index`
-        //     }, false)
-        //   }, 2000)
-        // }
-      });
+      this.card_number = options.card_number;
+      this.dataInit();
     },
-    /**
-     * @description 监听事件变化
-     * @param container {object} 业务组件对象自己
-     */
-    init() {
+
+    dataInit(){
       this.detail();
       this.refrush();
       if(this.$configProject.isPreview) {
         this.timeStr = "01分19秒"
       }
-      this.backUrl = getContainerPropsValue( this.container,  "content.back_url", { value: "" }).value;
-      this.shift_url = getContainerPropsValue( this.container,  "content.shift_url", { value: "" }).value;
+    },
+
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      this.backUrl = getContainerPropsValue(container,  "content.back_url", { value: "" }).value;
+      this.shift_url = getContainerPropsValue(container,  "content.shift_url", { value: "" }).value;
+      //'wechat_mini_program|default'
+      this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },
     /**
      * @description 获取卡详情
@@ -264,6 +216,7 @@ export default {
         data: {
           card_number: this.card_number,
           is_show_entry_settings: "Y",
+          group_id: this.entryGroupId
         },
       })
         .then((res) => {
@@ -279,6 +232,9 @@ export default {
               100
             );
           }
+
+          res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
+
           if(res && res.site_entry_settings && res.site_entry_settings.length>0) {
             res.site_entry_settings = res.site_entry_settings.filter(item=>{
               item['image_url'] = getServiceUrl(item['image_url'])
@@ -307,7 +263,6 @@ export default {
     handleRefresh(){
       clearInterval(this.timeer);
       this.detail();
-      // this.refrush();
     },
     refrush() {
       if (this.stopTimer) return;
@@ -317,8 +272,7 @@ export default {
         return;
       }
       this.time++;
-      let time =
-        this.time >= 5 ? 32 * 1000 : Math.pow(this.date, this.time) * 1000;
+      let time = this.time >= 5 ? 32 * 1000 : Math.pow(this.date, this.time) * 1000;
       this.refrushTimeer = setTimeout(() => {
         jfbRootExec("getCardYueEntry", {
           vm: this,
@@ -327,9 +281,8 @@ export default {
           },
         })
           .then((res) => {
-            //res[4]['value'] = this.$xdUniHelper.random(20,30);
             let refrushInfo = this.$xdUniHelper.cloneDeep(this.info);
-            if (res && res !== null && Object.keys(res).length > 0) {
+            if (res && Object.keys(res).length > 0) {
               if (res.card_point) {
                 refrushInfo.card_point = this.$xdUniHelper.divisionFloatNumber(
                   res.card_point,
@@ -352,81 +305,92 @@ export default {
           .catch();
       }, time);
     },
-     /**
+    /**
      * @description 已绑定卡登录
-     * @param item
+     * @param entry
      */
-     handleBindLogin(entry) {
+    handleBindLogin(entry) {
       //卡券登录
       this.$xdShowLoading({});
       jfbRootExec("detailLoginEntryCardBind", {
-          vm: this,
-          data: { card_number: this.info["card_number"] },
-        })
-          .then((res) => {
-            this.$xdHideLoading();
-            //#ifdef MP-WEIXIN
-            if (this.jfbAuthorize !== null) {
-              this.jfbAuthorize.setCardToken(res);
-              this.handleToApp(entry);
-            }
-            //#endif
-            if (this.$configProject.isPreview) {
-              console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
-            }
-
-            else {
-              this.handleToApp(entry);
-            }
-          })
-          .catch((res) => {
-            this.$xdHideLoading();
-          });
-    },
-    toApp(url){
-      this.$xdUniHelper.redirectTo({
-        url
+        vm: this,
+        data: { card_number: this.info["card_number"] },
       })
+        .then((res) => {
+          this.$xdHideLoading();
+
+          //#ifdef MP-WEIXIN
+          if (this.jfbAuthorize !== null) {
+            this.jfbAuthorize.setCardToken(res);
+            this.handleClick(entry);
+          }
+          //#endif
+          if (this.$configProject.isPreview) {
+            console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
+          }
+
+          else {
+            this.handleClick(entry);
+          }
+        })
+        .catch((res) => {
+          this.$xdHideLoading();
+        });
     },
-    handleToApp(entry){
-      let item, redirectUrl;
-      try{
-        item = JSON.parse(entry['redirect_data']);
-      }catch (e) {
-        return;
-      }
-      const {dir, path, host} = item;
+
+
+    handleClick(entry){
+      const {dir, path, host, appType} = entry['redirect_data'];
+      let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
+      let regSp = /(-apiuri\/v)/;
+
+      if(appType === undefined) entry.redirect_data.appType = 'h5';
       let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
 
       //外站配置地址
-      if (entry.redirect_type === 'URL') {
-        if (item['path'].indexOf('?') === -1) {
-          redirectUrl = `${item['path']}?x-common=${nsp}&vs=${new Date().getTime()}`
-        } else redirectUrl = `${item['path']}&x-common=${nsp}&vs=${new Date().getTime()}`;
-        this.toApp(redirectUrl);
-        return;
+      if(entry.redirect_type === 'URL') {
+        if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+          this.$xdUniHelper.redirectTo({
+            url:`${entry.redirect_data['path']}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+          }, false)
+        }
+        else {
+          console.error(`配置错误：${entry.redirect_data['path']}`);
+          throw new Error(`配置错误：${entry.redirect_data['path']}`)
+        }
+        return
       }
 
-      //站内转换
-      let jumpUrl = item.path;
-      //#ifdef H5
-      jumpUrl = `//${host}/${dir}${path}`;
+      //站内应用处理
+      let jumpUrl = '';
+      let jumpUrlObj = parsePath(path);
+      let cardPathStr = '';
+      if(jumpUrlObj.isSameApp) jumpUrl = jumpUrlObj.url;
+      else jumpUrl = `//${host}/${jumpUrlObj.dir}${jumpUrlObj.url}`;
+
+      //#ifdef MP-WEIXIN
+      //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+      if(entry.redirect_data.appType === 'h5') {
+        const custom_redirect_data = this.$xdUniHelper.checkVarType(entry['custom_redirect_data']) === 'object'?entry['custom_redirect_data']:{};
+        const cardPathObject = this.getCardPath(custom_redirect_data);
+        if(cardPathObject !== null) {
+          const {cardPath, cardSelf} =cardPathObject
+          if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
+        }
+      }
       //#endif
 
-      if (item['fixed_business_code'] === '') {
-        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
-      }
-      else {
-        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
-      }
-      this.toApp(redirectUrl);
+      jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
+      if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
+      else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
     },
+
     handleOnClose() {
       this.editShow = false;
     },
     handlePwdOnSubmit(val) {
       this.password = val;
-      this.init();
+      this.dataInit();
     },
 
     handleOnForget() {
@@ -439,13 +403,12 @@ export default {
     },
     handleUnBindCard() {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定票券吗",
         title: "系统提示",
         width: "80%",
         isTitle: true,
         zIndex: 2000,
-        vm: this,
         success: (res) => {
           if (res.confirm) {
             this.timeStr = ""
@@ -495,7 +458,7 @@ export default {
     },
     handleToShift() {
       this.$xdUniHelper.navigateTo({
-          url: `${this.shift_url}?card_number=${this.info["card_number"]}`,
+        url: `${this.shift_url}?card_number=${this.info["card_number"]}`,
       });
     },
     onJfbBack(options) {
@@ -507,6 +470,7 @@ export default {
       }
       this.$xdUniHelper.navigateBack();
     },
+
     onJfbUnload() {
       this.timeStr = ""
       if (this.timeer) {
@@ -516,39 +480,9 @@ export default {
         clearTimeout(this.refrushTimeer);
       }
     },
-    onJfbScroll(options) {
-      console.log("event.onJfbScroll", options);
-    },
-    onJfbReachBottom(options) {
-      console.log("event.onJfbReachBottom", options);
-    },
+
     onJfbShow(options) {
-      console.log("event.onJfbShow", options);
       this.onJfbLoad(options)
-      // if (this.first) {
-      //   if (this.brandInfo["is_enable_pay_password"] === "N") {
-      //     this.init();
-      //   } else if (
-      //     this.brandInfo["is_enable_pay_password"] === "Y" &&
-      //     this.userInfo["has_user_set_password"] === "N"
-      //   ) {
-      //     this.editShow = true;
-      //     this.pwdTitle = "您还未设置支付密码，请设置您的平台支付密码";
-      //   } else if (
-      //     this.brandInfo["is_enable_pay_password"] === "Y" &&
-      //     this.userInfo["has_user_set_password"] === "Y"
-      //   ) {
-      //     this.show = true;
-      //     this.textList = [
-      //       {
-      //         label: "查看卡详情",
-      //       },
-      //       {
-      //         label: "请输入支付密码",
-      //       },
-      //     ];
-      //   }
-      // }
     },
     onJfbHide(options) {
       this.timeStr = ""
@@ -610,215 +544,215 @@ export default {
     }
     padding: unit(26, rpx);
     .card-list {
-  overflow: hidden;
-  border-radius: unit(16, rpx);
-  margin-bottom: unit(30, rpx);
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-
+      overflow: hidden;
+      border-radius: unit(16, rpx);
+      margin-bottom: unit(30, rpx);
 
-  &__title {
-    height: unit(56, rpx);
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-
-    & > view {
-      padding: 0 unit(80, rpx);
-      font-size: unit(24, rpx);
-      line-height: unit(56, rpx);
-      background: rgba(102, 102, 102, 0.4);
-      color: #fff;
-      border-radius: 0 0 unit(16, rpx) 0;
-    }
+      &:last-child {
+        margin-bottom: 0;
+      }
 
-  }
 
-  &__content {
-    padding: unit(10, rpx) unit(40, rpx) 0;
-    height: unit(86, rpx);
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    & > view:first-child {
-      font-size: unit(36, rpx);
-      line-height: unit(86, rpx);
-      color: #fff;
-      font-weight: 700;
-    }
+      &__title {
+        height: unit(56, rpx);
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
 
-    & > view:nth-child(2) {
-      font-size: unit(24, rpx);
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      flex-flow: wrap;
-      flex-direction: column;
-      color: #fff;
-    }
-  }
+        & > view {
+          padding: 0 unit(80, rpx);
+          font-size: unit(24, rpx);
+          line-height: unit(56, rpx);
+          background: rgba(102, 102, 102, 0.4);
+          color: #fff;
+          border-radius: 0 0 unit(16, rpx) 0;
+        }
 
-  &__date {
-    padding: 0 unit(40, rpx);
-    font-size: unit(28, rpx);
-    line-height: unit(32, rpx);
-    color: #fff;
-  }
+      }
 
-  &__yue {
-    padding: unit(10, rpx) unit(40, rpx) 0;
-    font-size: unit(28, rpx);
-    line-height: unit(32, rpx);
-    color: #fff;
+      &__content {
+        padding: unit(10, rpx) unit(40, rpx) 0;
+        height: unit(86, rpx);
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
 
-    & > text:nth-child(2) {
-      font-weight: 700;
-    }
-  }
+        & > view:first-child {
+          font-size: unit(36, rpx);
+          line-height: unit(86, rpx);
+          color: #fff;
+          font-weight: 700;
+        }
 
-  &__other {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    padding: unit(20, rpx) unit(40, rpx) 0;
-    margin-top: unit(0, rpx);
-
-    & > view {
-      border-radius:unit(8, rpx);
-      background: rgba(255, 255, 255, 0.2);
-      height: unit(48, rpx);
-      line-height: unit(48, rpx);
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      font-weight: 400;
-      font-size: unit(24, rpx);
-      padding: 0 unit(20, rpx);
-      color: #fff;
-    }
+        & > view:nth-child(2) {
+          font-size: unit(24, rpx);
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          flex-flow: wrap;
+          flex-direction: column;
+          color: #fff;
+        }
+      }
 
+      &__date {
+        padding: 0 unit(40, rpx);
+        font-size: unit(28, rpx);
+        line-height: unit(32, rpx);
+        color: #fff;
+      }
 
-  }
+      &__yue {
+        padding: unit(10, rpx) unit(40, rpx) 0;
+        font-size: unit(28, rpx);
+        line-height: unit(32, rpx);
+        color: #fff;
 
-  &__nodata {
-    padding: unit(20, rpx) unit(40, rpx) 0;
-    margin-top: unit(0, rpx);
-    color: #fff;
-    font-size: unit(28, rpx);
-  }
+        & > text:nth-child(2) {
+          font-weight: 700;
+        }
+      }
 
-  &__entry {
-    padding: unit(20, rpx) unit(40, rpx) 0;
-    & > view {
-      line-height: unit(64, rpx);
-      text-align: center;
-      font-size: unit(26, rpx);
-      border-radius: unit(32, rpx);
-      background: rgba(255, 255, 255, 1);
-      box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
-      font-weight: 500;
-    }
-  }
+      &__other {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        padding: unit(20, rpx) unit(40, rpx) 0;
+        margin-top: unit(0, rpx);
 
-  &__entrys {
-    margin: unit(20, rpx) unit(20, rpx) 0;
-    padding: unit(30, rpx);
-    border-radius: unit(16, rpx);
-    background: rgba(255, 255, 255, 1);
-    box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
+        & > view {
+          border-radius:unit(8, rpx);
+          background: rgba(255, 255, 255, 0.2);
+          height: unit(48, rpx);
+          line-height: unit(48, rpx);
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+          font-weight: 400;
+          font-size: unit(24, rpx);
+          padding: 0 unit(20, rpx);
+          color: #fff;
+        }
 
-    &-title {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
 
+      }
 
-      & > view:first-child {
+      &__nodata {
+        padding: unit(20, rpx) unit(40, rpx) 0;
+        margin-top: unit(0, rpx);
+        color: #fff;
         font-size: unit(28, rpx);
-        font-weight: 500;
-        flex: 1;
       }
 
-      & > view:nth-child(2) {
-        display: flex;
-        justify-content: flex-start;
-        align-items: center;
-        flex-shrink: 0;
-        font-size: unit(20, rpx);
-        color: #999;
+      &__entry {
+        padding: unit(20, rpx) unit(40, rpx) 0;
+        & > view {
+          line-height: unit(64, rpx);
+          text-align: center;
+          font-size: unit(26, rpx);
+          border-radius: unit(32, rpx);
+          background: rgba(255, 255, 255, 1);
+          box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
+          font-weight: 500;
+        }
       }
-    }
-
-    &-scroll {
 
-    }
+      &__entrys {
+        margin: unit(20, rpx) unit(20, rpx) 0;
+        padding: unit(30, rpx);
+        border-radius: unit(16, rpx);
+        background: rgba(255, 255, 255, 1);
+        box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
 
-    &-item {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      flex-flow: nowrap;
-      margin-left: unit(-14, rpx);
-      padding-top: unit(20, rpx);
+        &-title {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
 
-      & > view {
-        width: unit(120, rpx);
-        margin-right: unit(10, rpx);
-        flex-shrink: 0;
-        display: flex;
-        justify-content: center;
-        flex-direction: column;
-        align-items: center;
 
-        & > view:first-child {
-          width: unit(76, rpx);
-          height: unit(76, rpx);
-          overflow: hidden;
+          & > view:first-child {
+            font-size: unit(28, rpx);
+            font-weight: 500;
+            flex: 1;
+          }
 
-          & > image {
-            height: 100%;
-            width: 100%;
+          & > view:nth-child(2) {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            flex-shrink: 0;
+            font-size: unit(20, rpx);
+            color: #999;
           }
         }
 
-        & > view:nth-child(2) {
-          margin-top: unit(10, rpx);
-          font-size: unit(24, rpx);
-          line-height: unit(36, rpx);
-          margin-bottom: unit(10, rpx);
+        &-scroll {
+
         }
 
-        & > view:nth-child(3) {
+        &-item {
           display: flex;
           justify-content: flex-start;
           align-items: center;
-          flex-shrink: 0;
-          font-size: unit(20, rpx);
-          color: #999;
-        }
+          flex-flow: nowrap;
+          margin-left: unit(-14, rpx);
+          padding-top: unit(20, rpx);
+
+          & > view {
+            width: unit(120, rpx);
+            margin-right: unit(10, rpx);
+            flex-shrink: 0;
+            display: flex;
+            justify-content: center;
+            flex-direction: column;
+            align-items: center;
+
+            & > view:first-child {
+              width: unit(76, rpx);
+              height: unit(76, rpx);
+              overflow: hidden;
+
+              & > image {
+                height: 100%;
+                width: 100%;
+              }
+            }
 
-        &:last-child {
-          margin-right: 0;
-        }
+            & > view:nth-child(2) {
+              margin-top: unit(10, rpx);
+              font-size: unit(24, rpx);
+              line-height: unit(36, rpx);
+              margin-bottom: unit(10, rpx);
+            }
 
-      }
+            & > view:nth-child(3) {
+              display: flex;
+              justify-content: flex-start;
+              align-items: center;
+              flex-shrink: 0;
+              font-size: unit(20, rpx);
+              color: #999;
+            }
 
+            &:last-child {
+              margin-right: 0;
+            }
 
-    }
-  }
+          }
 
-  &-warp {
-    width: unit(700, rpx);
-    // min-height: unit(290, rpx);
-    position: relative;
-    border-radius: unit(16, rpx);
-    background-size: 100%;
-    padding-bottom: unit(20, rpx);
-  }
-}
+
+        }
+      }
+
+      &-warp {
+        width: unit(700, rpx);
+        // min-height: unit(290, rpx);
+        position: relative;
+        border-radius: unit(16, rpx);
+        background-size: 100%;
+        padding-bottom: unit(20, rpx);
+      }
+    }
 
     &-qrcode {
       text-align: center;
@@ -917,54 +851,56 @@ export default {
       }
 
       &-content {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      flex-flow: wrap;
-      padding-left: unit(30, rpx);
-
-      & > view {
-        width: unit(120, rpx);
-        margin-right: unit(10, rpx);
-        flex-shrink: 0;
         display: flex;
-        justify-content: center;
-        flex-direction: column;
+        justify-content: flex-start;
         align-items: center;
+        flex-flow: wrap;
+        padding-left: unit(30, rpx);
 
-        & > view:first-child {
-          width: unit(76, rpx);
-          height: unit(76, rpx);
-          overflow: hidden;
+        & > view {
+          width: unit(120, rpx);
+          margin-right: unit(10, rpx);
+          flex-shrink: 0;
+          display: flex;
+          justify-content: center;
+          flex-direction: column;
+          align-items: center;
 
-          & > image {
-            height: 100%;
-            width: 100%;
+          & > view:first-child {
+            width: unit(76, rpx);
+            height: unit(76, rpx);
+            overflow: hidden;
+
+            & > image {
+              height: 100%;
+              width: 100%;
+            }
           }
-        }
 
-        & > view:nth-child(2) {
-          margin-top: unit(10, rpx);
-          font-size: unit(24, rpx);
-          line-height: unit(36, rpx);
-          margin-bottom: unit(10, rpx);
-        }
+          & > view:nth-child(2) {
+            margin-top: unit(10, rpx);
+            font-size: unit(24, rpx);
+            line-height: unit(36, rpx);
+            height: unit(36, rpx);
+            overflow: hidden;
+            margin-bottom: unit(10, rpx);
+          }
 
-        & > view:nth-child(3) {
-          display: flex;
-          justify-content: flex-start;
-          align-items: center;
-          flex-shrink: 0;
-          font-size: unit(20, rpx);
-          color: #999;
-        }
+          & > view:nth-child(3) {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            flex-shrink: 0;
+            font-size: unit(20, rpx);
+            color: #999;
+          }
 
-        &:last-child {
-          margin-right: 0;
+          &:last-child {
+            margin-right: 0;
+          }
         }
       }
     }
-    }
 
     .fixe_bottom{
       display: flex;