jufubao-base 1.0.186 → 1.0.187-beta2

package/src/components/JfbBaseOrderList/XdTfkOrderItem.vue

@@ -0,0 +1,246 @@
+<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>

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -167,7 +167,6 @@
     ],
     data() {
       return {
-        // hideMask: true,
         menuType: "card", // card, coupon
         loadingList: true,
         cardList: [],

package/src/components/JfbBaseUserCenter/Attr.js

@@ -24,15 +24,26 @@ export default {
         className: 'input80',
         rules: [
           {
-            required: true,
+            required: false,
             validator: (rule, value, callback) => {
               value = value.trim();
+              if(value.length === 0) return callback()
               if (value.length < 1 || value.length > 4) callback('卡券自定义名称长度为：1-4字符');
               else callback()
             },
             trigger: 'blur'
           }
         ],
+        notice: '卡券自定义名称设置，默认值：<span style="color:red">卡券</span>，长度为：1-4字符',
+        inline: false,
+      },
+
+      //style
+      {
+        ele: 'title',
+        label: '轮廓设置',
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '卡券文字颜色:',
@@ -42,13 +53,7 @@ export default {
         value: data['cardNameColor'] || null,
         placeholder: '请选择卡券文字颜色',
         classNmae: 'input80',
-      },
-
-      {
-        ele: 'title',
-        label: '整体风格',
-        size: 'small',
-        groupKey:'style',
+        hidden:true,
       },
       {
         label: '背景颜色:',
@@ -79,13 +84,13 @@ export default {
         },
       },
       {
-        label: '间距:',
+        label: '行间距:',
         ele: 'el-input',
         type: 'number',
         valueKey: 'padding',
         groupKey:'style',
         value: data.padding || '',
-        placeholder: '请输入间距',
+        placeholder: '请输入行间距',
         className: 'input60',
         inline: false,
         notice: '设置间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
@@ -118,10 +123,160 @@ export default {
       },
       {
         ele: 'title',
-        label: '内容区域风格',
+        label: '标题设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: "标题样式设置",
+        ele: "xd-text-and-bgc",
+        groupKey:'style',
+        valueKey: 'titleStyle',
+        value: data['titleStyle'] || null,
+        setting: {
+          fontSize: true,
+          color: true,
+          bgColor: false,
+          weight: true,
+          selected:false
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        ele: 'title',
+        label: `添加${data['cardName'] || '卡券'}设置`,
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: "文字样式设置",
+        ele: "xd-text-and-bgc",
+        groupKey:'style',
+        valueKey: 'addBtnStyle',
+        value: data['addBtnStyle'] || null,
+        setting: {
+          fontSize: true,
+          color: true,
+          bgColor: false,
+          weight: true,
+          selected:false
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'addBtnRadius',
+        groupKey:'style',
+        value: data['addBtnRadius'] || '40',
+        placeholder: '请选择圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'addBtnBgColor',
+        groupKey:'style',
+        value: data['addBtnBgColor'] || null,
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+      },
+      {
+        label: '投影设置:',
+        ele: 'xd-shadow',
+        groupKey:'style',
+        valueKey: 'addBtnShadow',
+        value: data['addBtnShadow'] || '',
+        setting: {
+          selected: 'N'
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '边框设置:',
+        ele: 'xd-border',
+        groupKey:'style',
+        valueKey: 'addBtnBorder',
+        value: data['addBtnBorder'] || {},
+        setting: {
+          selected:'N'
+        },
+      },
+      {
+        ele: 'title',
+        label: `进入我的${data['cardName'] || '卡券'}设置`,
         size: 'small',
         groupKey:'style',
       },
+      {
+        label: '填充:',
+        ele: 'xd-margin-padding',
+        valueKey: 'contentPadding',
+        groupKey:'style',
+        value: data['contentPadding'] || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设填充',
+        inline: false,
+        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：<span style="color:red">40</span>像素',
+      },
+      {
+        label: '圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        groupKey:'style',
+        value: data['radius'] || '10',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
       {
         label: '背景颜色:',
         ele: 'xd-color',
@@ -132,30 +287,88 @@ export default {
         classNmae: 'input80',
       },
       {
-        label: '按钮背景颜色:',
+        label: '投影设置:',
+        ele: 'xd-shadow',
+        groupKey:'style',
+        valueKey: 'contShadow',
+        value: data['contShadow'] || '',
+        setting: {
+          selected: 'N'
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '边框设置:',
+        ele: 'xd-border',
+        groupKey:'style',
+        valueKey: 'contBorder',
+        value: data['contBorder'] || {},
+        setting: {
+          selected:'N'
+        },
+      },
+      {
+        ele: 'title',
+        label: `进入我的${data['cardName'] || '卡券'}按钮样式设置`,
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'btnRadius',
+        value: data['btnRadius'] || '40',
+        groupKey:'style',
+        placeholder: '请选择圆角设置',
+        multiple: false,
+        className: 'input60',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: '背景颜色:',
         ele: 'xd-color',
         valueKey: 'btnBgColor',
         groupKey:'style',
         value: data['btnBgColor'] || null,
-        placeholder: '请选择按钮背景颜色',
+        placeholder: '请选择背景颜色',
         classNmae: 'input80',
       },
       {
-        label: '按钮文字颜色:',
+        label: '文字颜色:',
         ele: 'xd-color',
         valueKey: 'btnTextColor',
         groupKey:'style',
         value: data['btnTextColor'] || null,
-        placeholder: '请选择按钮文字颜色',
+        placeholder: '请选择文字颜色',
         classNmae: 'input80',
       },
       {
-        label: '按钮文字大小:',
+        label: '文字大小:',
         ele: 'xd-site-select-list',
         valueKey: 'btnFontSize',
         groupKey:'style',
         value: data['btnFontSize'] || '',
-        placeholder: '请选择按钮文字大小',
+        placeholder: '请选择文字大小',
         multiple: false,
         className: 'input80',
         handleCustom({action, data}) {
@@ -171,11 +384,13 @@ export default {
         },
       },
 
+      //=====属性已废弃(不能删除，已隐藏)====
       {
         ele: 'title',
         label: '边框设置',
         size: 'small',
         groupKey:'style',
+        hidden: true
       },
       {
         label: '是否有边框:',
@@ -186,6 +401,7 @@ export default {
         placeholder: '请选择是否有边框',
         multiple: false,
         className: 'input80',
+        hidden: true,
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
@@ -199,6 +415,7 @@ export default {
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
+        hidden: true
       },
       data['is_border'] === 'Y' && {
         label: '边框大小:',
@@ -209,26 +426,10 @@ export default {
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
+        hidden: true
       },
-      {
-        label: '内容圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        groupKey:'style',
-        value: data['radius'] || '10',
-        placeholder: '请选择内容圆角设置',
-        multiple: false,
-        className: 'input80',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
+      //=====属性已废弃(不能删除，已隐藏)====
+
       {
         label: '添加卡券路径:',
         ele: 'xd-select-pages-path',
@@ -236,43 +437,34 @@ export default {
         groupKey:'advanced',
         placeholder: '请选择添加卡券路径',
         value: data['add_url'] || null,
+        className: 'input100',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
-        rules: [
-          {required: true, message: '请选择添加卡券路径', trigger: 'change'},
-        ],
-        inline: false,
       },
       {
         label: '设置支付密码路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'pwd_url',
         groupKey:'advanced',
+        className: 'input100',
         placeholder: '请选择设置支付密码路径',
         value: data['pwd_url'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
-        rules: [
-          {required: true, message: '请选择设置支付密码路径', trigger: 'change'},
-        ],
-        inline: false,
       },
       {
         label: '进入我的票券路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'card_url',
         groupKey:'advanced',
+        className: 'input100',
         placeholder: '请选择进入我的票券路径',
         value: data['card_url'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
-        rules: [
-          {required: true, message: '请选择进入我的票券路径', trigger: 'change'},
-        ],
-        inline: false,
       },
       {
         label: '',