jufubao-base 1.0.133 → 1.0.134-beta3

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -21,56 +21,58 @@
       v-if="info !== null"
       :style="{minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'}"
     >
-    <view class="card-list" :style="{
-            background: headerBg['color'],
+      <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 style="display:flex;align-items:center">
+        <view class="card-list-warp" :style="{backgroundImage: `url(${headerBg['image']})`}">
+          <view class="card-list__title">
+            <view style="display:flex;align-items:center">
               <xd-font-icon
                 size="40"
                 color="#fff"
                 icon="iconzhuanhuanshitu"
                 style="margin-right:10rpx"
-            ></xd-font-icon>
-            <text>转换的票券</text>
-        </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>
+              ></xd-font-icon>
+              <text>转换的票券</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>
+          <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>
         <xd-font-icon
-            size="32"
-            color="#bbb"
-            icon="iconrepository-xialaxuanxiangdown"
-          ></xd-font-icon>
+          size="32"
+          color="#bbb"
+          icon="iconrepository-xialaxuanxiangdown"
+        ></xd-font-icon>
       </view>
       <view
         class="jfb-base-card-shift-entry__body-content"
         :style="{background:changeBg}"
       >
-      <view class="jfb-base-card-shift-entry__body-content-title">
+        <view class="jfb-base-card-shift-entry__body-content-title">
           <view>转换后预估票券额度</view>
-      </view>
+        </view>
         <view
           :class="
             item.key === 'other_card_point'
@@ -80,7 +82,7 @@
           v-for="(item, index) in changeValueKey"
           :key="index"
         >
-        <view> {{ item.label }}： </view>
+          <view> {{ item.label }}： </view>
           <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
             <text>点</text>
@@ -94,18 +96,23 @@
       <!-- 注意事项 -->
       <view class="jfb-base-card-shift-entry__body-tips" v-if="notice">
         <view style="text-align:center;padding-bottom:24rpx;color:#333;font-weight:500">注意事项</view>
-          <xd-content-xss :html="notice"></xd-content-xss>
+        <xd-content-xss :html="notice"></xd-content-xss>
       </view>
+      <view
+        v-if="isPreview && statusNotice && notice === '' "
+        class="xd-notice"
+        :style="{ color: dangerColor,fontSize: 24 + 'rpx',backgroundColor:noticeBgc}"
+      >注意事项未配置数据，因此改模块在正式环境将不显示</view>
       <view :style="{height: '100rpx'}"></view>
-        <!-- 靠底支付 -->
-        <view class="fixe_bottom" :style="prod_bottom">
-          <xd-button
+      <!-- 靠底支付 -->
+      <view class="fixe_bottom" :style="prod_bottom">
+        <xd-button
           @click="handleChange"
           width="500rpx"
           type="primary">
           转换
         </xd-button>
-        </view>
+      </view>
       <xd-dailog
         class="dialog"
         title=""
@@ -118,18 +125,18 @@
         <view class="jfb-base-card-shift-entry__body-success">
           <view class="jfb-base-card-shift-entry__body-success-title">
             <xd-font-icon
-            size="48"
-            :color="mainColor"
-            icon="icondui-01"
-          ></xd-font-icon>
-          <text :style="{color:mainColor,marginLeft:'20rpx'}">转换成功</text>
+              size="48"
+              :color="mainColor"
+              icon="icondui-01"
+            ></xd-font-icon>
+            <text :style="{color:mainColor,marginLeft:'20rpx'}">转换成功</text>
           </view>
           <view class="jfb-base-card-shift-entry__body-success-content">
             已成功将  <text style="color:#333;padding: 0 16rpx">{{ card_number }}</text>  转换成为
             <text style="color:#333;padding: 0 16rpx">{{ changeNumber }}</text>可在券包中查看
           </view>
           <xd-button type="primarys" width="360rpx" @click="handleToLink"
-            >返回列表</xd-button
+          >返回列表</xd-button
           >
         </view>
       </xd-dailog>
@@ -179,7 +186,12 @@ export default {
       card_number: "",
       changeNumber: "",
       success: false,
+
+      //提示文案
       notice: "",
+      isPreview: false,
+      statusNotice: false,
+      noticeBgc:'',
 
       //页面跳转地址
       backUrl: "",
@@ -193,24 +205,40 @@ export default {
     },
   },
   created() {
+    this.isPreview = this.$configProject.isPreview;
     this.changeBg = Color(this.warningColor).alpha(0.2).toString();
-    this.backUrl = getContainerPropsValue(this.container, "content.back_url", {
-      value: "",
-    }).value;
+    this.noticeBgc = Color(this.dangerColor).alpha(0.1).toString();
+    this.backUrl = getContainerPropsValue(this.container, "content.back_url", {value: "",}).value;
   },
   methods: {
     handleChange() {
-      jfbRootExec("changeCardBindEntry", {
-        vm: this,
-        data: {
-          card_number: this.card_number,
-        },
-      })
-        .then((res) => {
-          this.success = true;
-          this.changeNumber = res["to_card_number"];
-        })
-        .catch();
+      debugger
+      let card_number =  this.card_number;
+      if(this.$configProject.isPreview) card_number = '101001000005193';
+      let content = `您要将<view style="color:red">【${card_number}】</view>进行转换操作吗？`;
+      this.$xdConfirm({
+        title: "是否确认转换",
+        isHtml: true,
+        $vm: this,
+        content:content,
+        success:(action)=>{
+          if(action.confirm) {
+            jfbRootExec("changeCardBindEntry", {
+              vm: this,
+              data: {
+                card_number: this.card_number,
+              },
+            })
+              .then((res) => {
+                this.success = true;
+                this.changeNumber = res["to_card_number"];
+              })
+              .catch();
+          }
+        }
+      });
+
+
     },
     handleToLink() {
       this.$xdUniHelper.navigateTo({
@@ -227,7 +255,10 @@ export default {
         },
       })
         .then((res) => {
-          this.notice = res.list[0].content;
+          if(res.list && res.list.length > 0) {
+            this.notice = res.list[0].content;
+          }
+          this.statusNotice = true;
         })
         .catch((error) => {
           console.error(error);
@@ -277,220 +308,226 @@ export default {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
 
+  .xd-notice {
+    margin-top: unit(20, rpx);
+    padding: unit(40, rpx);
+    border-radius: unit(15, rpx)
+  }
+
   &__body {
     position: relative;
     color: #333;
     padding: unit(26, rpx);
     .card-list {
-  overflow: hidden;
-  border-radius: unit(16, rpx);
-  margin-bottom: unit(30, rpx);
-  
-  &:last-child {
-    margin-bottom: 0;
-  }
-  
-  
-  &__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;
-    }
-    
-  }
-  
-  &__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;
-    }
-    
-    & > 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;
-    
-    & > text:nth-child(2) {
-      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;
-    }
-    
-    
-  }
-  
-  &__nodata {
-    padding: unit(20, rpx) unit(40, rpx) 0;
-    margin-top: unit(0, rpx);
-    color: #fff;
-    font-size: unit(28, rpx);
-  }
-  
-  &__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;
-    }
-  }
-  
-  &__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);
-    
-    &-title {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-     
-      
-      & > view:first-child {
-        font-size: unit(28, rpx);
-        font-weight: 500;
-        flex: 1;
+      overflow: hidden;
+      border-radius: unit(16, rpx);
+      margin-bottom: unit(30, rpx);
+
+      &:last-child {
+        margin-bottom: 0;
       }
-      
-      & > view:nth-child(2) {
+
+
+      &__title {
+        height: unit(56, rpx);
         display: flex;
         justify-content: flex-start;
         align-items: center;
-        flex-shrink: 0;
-        font-size: unit(20, rpx);
-        color: #999;
+
+        & > 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;
+        }
+
       }
-    }
-    
-    &-scroll {
-    
-    }
-  
-    &-item {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      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;
+
+      &__content {
+        padding: unit(10, rpx) unit(40, rpx) 0;
+        height: unit(86, rpx);
         display: flex;
-        justify-content: center;
-        flex-direction: column;
+        justify-content: space-between;
         align-items: center;
-        
+
         & > view:first-child {
-          width: unit(76, rpx);
-          height: unit(76, rpx);
-          overflow: hidden;
-    
-          & > image {
-            height: 100%;
-            width: 100%;
-          }
+          font-size: unit(36, rpx);
+          line-height: unit(86, rpx);
+          color: #fff;
+          font-weight: 700;
         }
-        
+
         & > view:nth-child(2) {
-          margin-top: unit(10, rpx);
           font-size: unit(24, rpx);
-          line-height: unit(36, rpx);
-          margin-bottom: unit(10, rpx);
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          flex-flow: wrap;
+          flex-direction: column;
+          color: #fff;
         }
-        
-        & > view:nth-child(3) {
+      }
+
+      &__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;
+
+        & > text:nth-child(2) {
+          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;
-          flex-shrink: 0;
-          font-size: unit(20, rpx);
-          color: #999;
+          font-weight: 400;
+          font-size: unit(24, rpx);
+          padding: 0 unit(20, rpx);
+          color: #fff;
+        }
+
+
+      }
+
+      &__nodata {
+        padding: unit(20, rpx) unit(40, rpx) 0;
+        margin-top: unit(0, rpx);
+        color: #fff;
+        font-size: unit(28, rpx);
+      }
+
+      &__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;
+        }
+      }
+
+      &__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);
+
+        &-title {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+
+
+          & > view:first-child {
+            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;
+          }
         }
-        
-        &:last-child {
-          margin-right: 0;
+
+        &-scroll {
+
+        }
+
+        &-item {
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+          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%;
+              }
+            }
+
+            & > 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);
-  }
-}
     &-content {
       background: #fff;
       border-radius: unit(16, rpx);
@@ -552,19 +589,19 @@ export default {
     }
 
     .fixe_bottom{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: unit(100, rpx);
+      padding: 0 unit(40, rpx);
+      background: #FFF;
+      box-shadow: 0 0 unit(16, rpx) rgba(0,0,0,.05);
+      .flex_l{
         display: flex;
         align-items: center;
-        justify-content: space-between;
-        height: unit(100, rpx);
-        padding: 0 unit(40, rpx);
-        background: #FFF;
-        box-shadow: 0 0 unit(16, rpx) rgba(0,0,0,.05);
-        .flex_l{
-          display: flex;
-          align-items: center;
-          font-size: unit(32,rpx);
-        }
+        font-size: unit(32,rpx);
       }
+    }
 
     &-success {
       padding: unit(70, rpx);