jufubao-base 1.0.184-beta2 → 1.0.184

package/src/components/JfbBaseWallet/JfbBaseWallet.vue

@@ -14,29 +14,21 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-wallet__body">
-      <view class="x-line"></view>
       <template v-if="showContent">
-        <view :style="[{
-          margin:marginComp,
-          padding:paddingComp,
-          backgroundColor:bodyBgColor,
-          borderRadius:bodyRadius+'rpx'
-        }]">
-          <view class="jfb-base-wallet__body-title" :style="[titleStyleComp]">{{accountName}}</view>
-          <view class="jfb-base-wallet__body-type" :style="[contStyleComp]" v-if="showType.length > 0">
-            <view
-              :style="[itemStyleComp]"
-              v-for="(item, index) in showType"
-              @click="handleJumpTo(item)"
-              :key="index"
-              class="jfb-base-wallet__body-type-item"
-            >
-              <XdFontIcon :icon="item.icon"></XdFontIcon>
-              <view>{{ item.label }}</view>
-            </view>
+        <view class="jfb-base-wallet__body-title">我的账户</view>
+        <view class="jfb-base-wallet__body-type" v-if="showType.length > 0">
+          <view
+            :style="{marginRight: index === showType.length - 1 ? '0' : '36rpx',}"
+            v-for="(item, index) in showType"
+            @click="handleJumpTo(item)"
+            :key="index"
+            class="jfb-base-wallet__body-type-item"
+          >
+            <XdFontIcon :icon="item.icon"></XdFontIcon>
+            <view>{{ item.label }}</view>
           </view>
-          <view v-else class="jfb-base-wallet__body-type notice" :style="{backgroundColor:backgroundColor, color:warningColor}">我的账户无配置数据，在正式环境将不显示改模块</view>
         </view>
+        <view v-else class="jfb-base-wallet__body-type notice" :style="{backgroundColor:backgroundColor, color:warningColor}">我的账户无配置数据，在正式环境将不显示改模块</view>
       </template>
     </view>
   </view>
@@ -80,35 +72,6 @@ export default {
       isCard: "Y",
       isYuanbao: "Y",
       isIntegral: "Y",
-      accountName:'我的账户',
-
-      //标题
-      titleStyle:{},
-
-      //轮廓
-      bodyRadius:'0',
-      bodyMargin:{},
-      bodyPadding:{},
-      rowSpacing:10,
-      columnSpacing:20,
-      bodyBgColor:'rgba(0,0,0,0)',
-
-      //content
-      contPadding:{},
-      contBgColor:'rgba(0,0,0,0)',
-      contRadius:'10',
-      contShadow:'0 0 0 rgba(0,0,0,0)',
-      contBorder:{},
-
-      //item
-      itemPadding:{},
-      itemBgColor:'rgba(0,0,0,0)',
-      itemRadius:'10',
-      itemShadow: '0 0 0 rgba(0,0,0,0)',
-      itemBorder:{},
-
-
-      //高级
       cardPath: "",
       yuanbaoPath: "",
       integralPath: "",
@@ -214,86 +177,7 @@ export default {
     showContent(){
       if(this.$configProject.isPreview) return true;
       return this.showType.length > 0;
-    },
-
-    titleStyleComp(){
-      return {
-        fontSize: this.titleStyle.fontSize || '28rpx',
-        color: `${this.titleStyle.color || '#333'}`,
-        fontWeight: `${this.titleStyle.fontWeight || 'normal'}`,
-        marginBottom: `${this.rowSpacing}rpx`,
-      }
-    },
-
-    marginComp() {
-      let str = `${this.checkValue(this.bodyMargin.top, 0)}rpx`;
-      str = `${str} ${this.checkValue(this.bodyMargin.right, 0)}rpx`;
-      str = `${str} ${this.checkValue(this.bodyMargin.bottom, 0)}rpx`;
-      str = `${str} ${this.checkValue(this.bodyMargin.left, 0)}rpx`;
-      return str
-    },
-
-    paddingComp() {
-      let str = `${this.checkValue(this.bodyPadding.top, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.bodyPadding.right, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.bodyPadding.bottom, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.bodyPadding.left, 20)}rpx`;
-      return str
-    },
-
-    contStyleComp(){
-      let str = `${this.checkValue(this.contPadding.top, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.contPadding.right, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.contPadding.bottom, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.contPadding.left, 20)}rpx`;
-      let border = {
-        borderWidth: '2rpx',
-        borderStyle: 'solid',
-        borderColor: '#eee',
-      }
-      if(this.contBorder && this.contBorder.type === 'Y') {
-        let value = this.contBorder.value || {};
-        if(value.color) border.borderColor = value.color;
-        if(value.style) border.borderStyle = value.style;
-        if(value.width) border.borderWidth = value.width + 'rpx';
-      }
-
-      return {
-        padding: str,
-        backgroundColor: this.contBgColor,
-        borderRadius: this.contRadius + 'rpx',
-        boxShadow: this.contShadow,
-        ...border,
-      }
-    },
-
-    itemStyleComp(){
-      let str = `${this.checkValue(this.itemPadding.top, 30)}rpx`;
-      str = `${str} ${this.checkValue(this.itemPadding.right, 0)}rpx`;
-      str = `${str} ${this.checkValue(this.itemPadding.bottom, 30)}rpx`;
-      str = `${str} ${this.checkValue(this.itemPadding.left, 0)}rpx`;
-
-      let border = {
-        borderWidth: '2rpx',
-        borderStyle: 'solid',
-        borderColor: '#eee',
-      }
-      if(this.itemBorder && this.itemBorder.type === 'Y') {
-        let value = this.itemBorder.value || {};
-        if(value.color) border.borderColor = value.color;
-        if(value.style) border.borderStyle = value.style;
-        if(value.width) border.borderWidth = value.width + 'rpx';
-      }
-
-      return {
-        padding: str,
-        backgroundColor: this.itemBgColor,
-        borderRadius: this.itemRadius + 'rpx',
-        marginRight: this.columnSpacing + 'rpx',
-        boxShadow: this.itemShadow,
-        ...border
-      }
-    },
+    }
   },
   created() {
     this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();
@@ -312,41 +196,34 @@ export default {
     init(container) {
       this.newLabel = getContainerPropsValue(container, "content.newLabel", []);
       this.isCard = getContainerPropsValue(container, "content.isCard", "Y");
-      this.isYuanbao = getContainerPropsValue(container, "content.isYuanbao", "Y");
-      this.isIntegral = getContainerPropsValue(container, "content.isIntegral", "Y");
-      this.accountName = getContainerPropsValue(container, "content.accountName", "我的账户");
-      this.rowSpacing = Number(getContainerPropsValue(container, "content.rowSpacing", 10));
-      this.columnSpacing = Number(getContainerPropsValue(container, "content.columnSpacing", 20));
-      this.bodyBgColor = getContainerPropsValue(container, "content.bodyBgColor", 'rgba(0,0,0,0)');
-      this.bodyPadding = getContainerPropsValue(container, "content.bodyPadding", {});
-      this.bodyMargin = getContainerPropsValue(container, "content.bodyMargin", {});
-      this.bodyRadius = getContainerPropsValue(container, "content.bodyRadius", '0');
-
-      //标题
-      this.titleStyle = getContainerPropsValue(container, 'content.titleStyle', {});
-
-      //content
-      this.contPadding = getContainerPropsValue(container, "content.contPadding", {});
-      this.contBgColor = getContainerPropsValue(container, "content.contBgColor", 'rgba(0,0,0,0)');
-      this.contRadius = getContainerPropsValue(container, "content.contRadius", '10');
-      this.contBorder = getContainerPropsValue(container, "content.contBorder", {});
-      this.contShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,.3)'},getContainerPropsValue(container, 'content.contShadow', {}))
-
-
-      //item
-      this.itemPadding = getContainerPropsValue(container, 'content.itemPadding', {});
-      this.itemBgColor = getContainerPropsValue(container, 'content.itemBgColor', 'rgba(0,0,0,0)');
-      this.itemRadius = getContainerPropsValue(container, 'content.itemRadius', '10');
-      this.itemShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,.3)'},getContainerPropsValue(container, 'content.itemShadow', {}))
-      this.itemBorder = getContainerPropsValue(container, "content.itemBorder", {});
-
-      //高级
-      this.cardPath = getContainerPropsValue(container, "content.cardPath", {value: "",}).value;
-      this.yuanbaoPath = getContainerPropsValue(container, "content.yuanbaoPath", { value: "" }).value;
-      this.integralPath = getContainerPropsValue(container, "content.integralPath", { value: "" }).value;
+      this.isYuanbao = getContainerPropsValue(
+        container,
+        "content.isYuanbao",
+        "Y"
+      );
+      this.isIntegral = getContainerPropsValue(
+        container,
+        "content.isIntegral",
+        "Y"
+      );
+      this.cardPath = getContainerPropsValue(container, "content.cardPath", {
+        value: "",
+      }).value;
+
+      this.yuanbaoPath = getContainerPropsValue(
+        container,
+        "content.yuanbaoPath",
+        { value: "" }
+      ).value;
+
+      this.integralPath = getContainerPropsValue(
+        container,
+        "content.integralPath",
+        { value: "" }
+      ).value;
     },
     handleJumpTo(item) {
-      if(this.$configProject.isPreview) return;
+      console.log(item, "ppppp");
       switch (item.value) {
         case "card":
           this.$xdUniHelper.navigateTo({
@@ -380,20 +257,22 @@ export default {
 .jfb-base-wallet {
   &__body {
     &-title {
-      min-height: 64rpx;
-      line-height: 64rpx;
+      padding: 20rpx;
     }
     &-type {
       display: flex;
       border-radius: 20rpx;
       background: rgba(255, 255, 255, 1);
       border: 1rpx solid rgba(238, 238, 238, 1);
+      padding: 32rpx 48rpx 32rpx 48rpx;
+      margin: 0 20rpx 0;
 
       &.notice {
         font-size: 26rpx;
       }
 
       &-item {
+        color: #999999;
         flex: 1;
         display: flex;
         flex-direction: column;
@@ -401,9 +280,12 @@ export default {
         justify-content: center;
         font-size: 24rpx;
         border: 2rpx solid #eeeeee;
-
-        &:last-child{
-          margin-right: 0!important;
+        border-radius: 16rpx;
+        background: #ffffff;
+        padding: 16rpx 0;
+        margin-right: 36rpx;
+        & > view:nth-child(2) {
+          margin-top: 12rpx;
         }
       }
     }

package/src/components/JfbBaseAddress/XdTfkItem.vue

@@ -1,117 +0,0 @@
-<template>
-  <view class="xd-tfk-item" @click="handleSelectAddress">
-    <view class="item_top">
-      <view class="user_info">
-        {{ item.name }} <text style="margin-left: 20rpx;">{{ item.phone }}</text>
-        <view v-if="item.is_valid === 'N'"
-          style="position: absolute; right: 40rpx;top: 0;"
-        >
-          <xd-font-icon
-            size="32"
-            :color="dangerColor"
-            icon="iconmingchengtubiao"
-          ></xd-font-icon>
-        </view>
-      </view>
-      <view class="user_adr">{{item.province_name}}{{item.city_name}}{{item.area_name}}{{item.street_name}}{{ item.address_detail }} {{ item.house_number }}</view>
-    </view>
-    <view class="item_bottom">
-      <view class="is_default" @click.native.stop="setDefault">
-        <xd-radio :value="item.is_default === 'Y'" :width="52" :height="52" :iconSize="20"></xd-radio>
-        <view v-if="item.is_default === 'Y'">默认地址</view>
-        <view v-else>设为默认</view>
-      </view>
-      <view class="item_opera">
-        <view class="o_i" style="margin-right: 30rpx;" @click.native.stop="handleEdit">
-          <xd-font-icon class="icon" :icon="edit_icon" :size="26"></xd-font-icon> 编辑
-        </view>
-        <view class="o_i" @click.native.stop="handleDel">
-          <xd-font-icon class="icon" :icon="delete_icon" :size="26"></xd-font-icon> 删除
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-<script>
-  import XdRadio from "@/components/XdRadio/XdRadio"
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon"
-  export default{
-    name:"XdTfkItem",
-    components: {
-      XdRadio,
-      XdFontIcon,
-    },
-    props:{
-      edit_icon: String,
-      delete_icon: String,
-      item: Object,
-      dangerColor: String,
-    },
-    data(){
-      return{
-      }
-    },
-    created(){
-    },
-    methods:{
-      handleSelectAddress(){
-        this.$emit("selectAddress")
-      },
-      handleEdit(){
-        this.$emit("editAddress", this.item)
-      },
-      handleDel(){
-        this.$emit("delAddress", this.item)
-      },
-      setDefault(){
-        this.$emit("setDefault", this.item)
-      }
-    },
-  }
-</script>
-<style lang="less" scoped>
-  .xd-tfk-item{
-    .item_top{
-      padding: 30rpx;
-    }
-    .user_info{
-      color: #191a1b;
-      font-size: 30rpx;
-      position: relative;
-    }
-    .user_adr{
-      color: #797d82;
-      font-size: 26rpx;
-      margin-top: 6rpx;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    .item_bottom{
-      display: flex;
-      justify-content: space-between;
-      padding: 20rpx;
-      border-top: 1px solid #ededed;
-    }
-    .item_opera{
-      display: flex;
-      color: #797d82;
-      align-items: center;
-      .o_i{
-        display: flex;
-        align-items: center;
-        font-size: 26rpx;
-
-        .icon{
-          margin-right: 10rpx;
-        }
-      }
-    }
-    .is_default{
-      display: flex;
-      align-items: center;
-      font-size: 26rpx;
-      color: #797d82;
-    }
-  }
-</style>

package/src/components/JfbBaseOrderList/XdTfkOrderItem.vue

@@ -1,246 +0,0 @@
-<template>
-  <view class="xd-tfk-order-item">
-    <view class="o_header">
-      <view class="h_l">
-        <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 }" style="margin-left: 20rpx;">{{item.biz_code_name }}</view>
-      </view>
-      <view v-if="isShowOrderNo==='N'" class="o_status" :style="{
-        color:item.status.status_type !== 'error' ? mainColor : '#999999',
-      }">{{ item.status.status_name }}</view>
-    </view>
-    <view class="o_title" v-if="isShowOrderNo==='Y'">
-      <view class="o_number">订单编号:{{ item.main_order_id }}</view>
-      <view class="o_status" :style="{
-        color:item.status.status_type !== 'error' ? mainColor : '#999999',
-      }">{{ item.status.status_name }}</view>
-    </view>
-    <view class="prod_list">
-      <!-- 单个商品展示商品信息 -->
-      <template v-if="item.products.length == 1">
-        <view class="one_prod" v-for="Sitem in item.products" :key="Sitem.key">
-          <view class="prod_img">
-            <image :src="Sitem.product_thumb" style="background: #ffffff" mode="aspectFill"></image>
-          </view>
-          <view class="prod_info">
-            <view class="prod_name">{{ Sitem.product_name }}</view>
-            <view v-if="Sitem.brand_name" class="prod_brand" :style="{color: brandTextColor}">{{ Sitem.brand_name }}</view>
-            <view v-if="Sitem.product_sku_name" class="prod_sku">规格：{{ Sitem.product_sku_name }}</view>
-            <view class="prod_price">
-              <view>￥448</view>
-              <view class="info-price">
-                <text>x</text>
-                <text>{{ Sitem.product_num }}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-      </template>
-
-      <!-- 多个商品展示更多商品信息 -->
-      <view v-if="item.products.length > 1" class="more_prod">
-        <view class="img_list">
-          <view class="prod_img" v-for="prod in item.products" :key="prod.key">
-            <image :src="prod.product_thumb" style="background: #ffffff" mode="aspectFit"></image>
-          </view>
-        </view>
-        <view class="right_arrow">
-          <xd-font-icon icon='iconxiangyou_xian' :size="26" color="#bdc0c5"></xd-font-icon>
-        </view>
-      </view>
-    </view>
-    <view class="prod_total">
-      <view></view>
-      <view style="display: flex;align-items: center;">
-        共{{item.products.length}}件商品 实付
-        <xd-unit
-          :isOld="false"
-          :price="item.total_amount"
-          :color="mainColor"
-          :fontSize="28"></xd-unit>
-      </view>
-    </view>
-    <view v-if="item.buttons.length" class="prod_footer">
-      <view style="flex: 1;"></view>
-      <view class="btn" 
-        v-for="(btn,index) in item.buttons" :key="btn.key"
-        @click="handleBtnEvent(btn.action, item)"
-      >{{btn.text}}</view>
-    </view>
-  </view>
-</template>
-
-<script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon"
-  import XdUnit from "@/components/XdUnit/XdUnit"
-  export default{
-    name:"XdTfkOrderItem",
-    components: {
-      XdFontIcon,
-      XdUnit,
-    },
-    props:{
-      item: Object,
-      mainColor: String,
-      isShowOrderNo: {
-        type: String,
-      },
-      brandTextColor: String
-    },
-    data(){
-      return{
-      }
-    },
-    methods:{
-      handleBtnEvent(action){
-        this.$emit('handleBtnEvent', action)
-      },
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .xd-tfk-order-item{
-    padding-left: 30rpx;
-    overflow: hidden;
-    .o_header{
-      height: 90rpx;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      border-bottom: 1px solid #EDEDED;
-      padding-right: 30rpx;
-      color: #333333;
-      font-size: 28rpx;
-
-      .h_l{
-        display: flex;
-        align-items: center;
-      }
-    }
-    .o_title{
-      height: 80rpx;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding-right: 30rpx;
-      color: #333333;
-      font-size: 24rpx;
-      border-bottom: 1px solid #EDEDED;
-    }
-    .one_prod{
-      display: flex;
-      align-items: center;
-      width: 100%;
-      padding: 30rpx 30rpx 30rpx 0;
-      box-sizing: border-box;
-      .prod_img{
-        width: 140rpx;
-        height: 140rpx;
-        background-color: #f5f5f9;
-        image{
-          width: 100%;
-          height: 100%;
-        }
-      }
-      .prod_info{
-        flex: 1;
-        padding-left: 30rpx;
-        .prod_name{
-          color: #2e2f30;
-          font-size: 30rpx;
-        }
-        .prod_brand{
-          font-size: 24rpx;
-          margin-top: 8rpx;
-        }
-        .prod_sku{
-          color: #797d82;
-          font-size: 24rpx;
-          margin-top: 8rpx;
-        }
-      }
-      .prod_price{
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        color: rgb(46, 47, 48);
-        font-size: 30rpx;
-        margin-top: 12rpx;
-        .info-price{
-          display: flex;
-          color: #bdc0c5;
-          font-size: 26rpx;
-        }
-      }
-    }
-    .prod_list{
-      position: relative;
-      .right_arrow{
-        position: absolute;
-        right: 0px;
-        height: 100%;
-        width: 60rpx;
-        top: 0;
-        background: #FFF;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-    }
-    .more_prod{
-      display: flex;
-      flex-wrap: nowrap;
-      overflow: auto;
-      padding: 30rpx 30rpx 30rpx 0;
-      width: 100%;
-      .img_list{
-        display: flex;
-        flex-wrap: nowrap;
-        padding-right: 60rpx;
-      }
-      .prod_img{
-        width: 140rpx;
-        height: 140rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        image{
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
-    .prod_total{
-      height: 80rpx;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding-right: 30rpx;
-      border-top: 1px solid #EDEDED;
-      color: #2e2f30;
-      font-size: 26rpx;
-    }
-    .prod_footer{
-      padding: 16rpx 30rpx 16rpx 0;
-      display: flex;
-      align-items: center;
-      border-top: 1px solid #EDEDED;
-      .btn{
-        width: 170rpx;
-        height: 66rpx;
-        border: 1px solid #EDEDED;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-left: 20rpx;
-        color: #2e2f30;
-        font-size: 24rpx;
-      }
-    }
-  }
-</style>