jufubao-base 1.0.184-beta2 → 1.0.184

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -64,129 +64,104 @@
           class="jfb-base-order-list__body-order"
           :style="{ padding: outMargin }"
         >
-          <template v-if="layout_style === 'old'">
-            <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 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.key"
-                  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 class="brand-name" v-if="Sitem.brand_name" :style="{color:brandTextColor}">{{ Sitem.brand_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></view>
-                      <view class="info-price">
-                        <text>X</text>
-                        <text>{{ Sitem.product_num }}</text>
-                      </view>
+          <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 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.key"
+                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 class="brand-name" v-if="Sitem.brand_name" :style="{color:brandTextColor}">{{ Sitem.brand_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></view>
+                    <view class="info-price">
+                      <text>X</text>
+                      <text>{{ Sitem.product_num }}</text>
                     </view>
                   </view>
                 </view>
-                <view
-                  class="order-list-icon"
-                  :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
-                  v-if="item.products.length > showLen"
-                  @click.stop="switchOpen(item)"
-                >
-                  <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' && item.is_not_show_price !== 'Y'">
-                  <text>合计:</text>
-                  <xd-unit
-                    :isOld="false"
-                    :price="item.total_amount"
-                    :color="mainColor"
-                    :fontSize="28"
-                  ></xd-unit>
-                </view>
-                <view style="color:#999" v-if="item['main_user_server_amount'] !== undefined && item['main_user_server_amount'] > 0">
-                  <text>（平台服务费：</text>
-                  <xd-unit
-                    :isOld="false"
-                    :price="item['main_user_server_amount']"
-                    :fontSize="24"
-                    :is-gray="true"
-                    color="#999"
-                    :icon-size=".25"
-                  ></xd-unit>
-                  <text>）</text>
-                </view>
               </view>
               <view
-                class="jfb-base-order-list__body-order-item-pay"
-                v-if="item.buttons.length"
+                class="order-list-icon"
+                :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
+                v-if="item.products.length > showLen"
+                @click.stop="switchOpen(item)"
               >
-                <view v-for="(btn,index) in item.buttons" :key="btn.key">
-                  <xd-button
-                    :type="getBtnType(btn.action)"
-                    size="mini"
-                    @click="handleBtnEvent(btn.action, item)"
-                  >{{ btn.text }}</xd-button>
+                <view :style="{ background: backgroundColor }">
+                  <xd-font-icon
+                    color="#666"
+                    :icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
+                    size="24"
+                  ></xd-font-icon>
                 </view>
               </view>
             </view>
-          </template>
-          <template v-if="layout_style === 'tfk'">
+            <view class="jfb-base-order-list__body-order-item-bottom">
+              <view>下单时间:{{ item.created_time_text }}</view>
+              <view v-if="item.biz_code !== 'gift' && item.is_not_show_price !== 'Y'">
+                <text>合计:</text>
+                <xd-unit
+                  :isOld="false"
+                  :price="item.total_amount"
+                  :color="mainColor"
+                  :fontSize="28"
+                ></xd-unit>
+              </view>
+              <view style="color:#999" v-if="item['main_user_server_amount'] !== undefined && item['main_user_server_amount'] > 0">
+                <text>（平台服务费：</text>
+                <xd-unit
+                  :isOld="false"
+                  :price="item['main_user_server_amount']"
+                  :fontSize="24"
+                  :is-gray="true"
+                  color="#999"
+                  :icon-size=".25"
+                ></xd-unit>
+                <text>）</text>
+              </view>
+            </view>
             <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',
-              }"
+              class="jfb-base-order-list__body-order-item-pay"
+              v-if="item.buttons.length"
             >
-              <xd-tfk-order-item 
-                :mainColor="mainColor"
-                :isShowOrderNo="isShowOrderNo"
-                :brandTextColor="brandTextColor"
-                :item="item"
-                @handleBtnEvent="action => handleBtnEvent(action, item)"
-              ></xd-tfk-order-item>
+              <view v-for="(btn,index) in item.buttons" :key="btn.key">
+                <xd-button
+                  :type="getBtnType(btn.action)"
+                  size="mini"
+                  @click="handleBtnEvent(btn.action, item)"
+                >{{ btn.text }}</xd-button>
+              </view>
             </view>
-          </template>
+          </view>
         </view>
         <view v-else class="jfb-base-order-list__body-no">
           <xd-font-icon
@@ -214,7 +189,6 @@ import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import getServiceUrl from "@/common/getServiceUrl";
 import Color from "color";
-import XdTfkOrderItem from "./XdTfkOrderItem"
 
 export default {
   name: "JfbBaseOrderList",
@@ -223,7 +197,6 @@ export default {
     XdTab,
     XdUnit,
     XdButton,
-    XdTfkOrderItem,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseOrderListMixin],
   data() {
@@ -266,8 +239,6 @@ export default {
         right: 0,
         bottom: 0,
       },
-      layout_style: "old",
-      isShowOrderNo: "Y",
 
       noticeBgc:'',
     };
@@ -344,8 +315,6 @@ export default {
 
       this.detailPath = getContainerPropsValue(container, "content.detailPath", { value: "" }).value;
       this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
-      this.layout_style = getContainerPropsValue(container, "content.layout_style", "old");
-      this.isShowOrderNo = getContainerPropsValue(container, "content.isShowOrderNo", "Y");
       this.tabList = getContainerPropsValue(container, "content.orderTypeList", []).map((item) => {
         return {
           name: item.customName || item.label,

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

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

package/src/components/JfbBaseUserCenter/Attr.js

@@ -24,26 +24,15 @@ export default {
         className: 'input80',
         rules: [
           {
-            required: false,
+            required: true,
             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: '卡券文字颜色:',
@@ -53,7 +42,13 @@ export default {
         value: data['cardNameColor'] || null,
         placeholder: '请选择卡券文字颜色',
         classNmae: 'input80',
-        hidden:true,
+      },
+
+      {
+        ele: 'title',
+        label: '整体风格',
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '背景颜色:',
@@ -84,13 +79,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>像素',
@@ -123,160 +118,10 @@ export default {
       },
       {
         ele: 'title',
-        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'] || '卡券'}设置`,
+        label: '内容区域风格',
         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',
@@ -287,88 +132,30 @@ export default {
         classNmae: 'input80',
       },
       {
-        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: '背景颜色:',
+        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}) {
@@ -384,13 +171,11 @@ export default {
         },
       },
 
-      //=====属性已废弃(不能删除，已隐藏)====
       {
         ele: 'title',
         label: '边框设置',
         size: 'small',
         groupKey:'style',
-        hidden: true
       },
       {
         label: '是否有边框:',
@@ -401,7 +186,6 @@ export default {
         placeholder: '请选择是否有边框',
         multiple: false,
         className: 'input80',
-        hidden: true,
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
@@ -415,7 +199,6 @@ export default {
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
-        hidden: true
       },
       data['is_border'] === 'Y' && {
         label: '边框大小:',
@@ -426,10 +209,26 @@ 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',
@@ -437,34 +236,43 @@ 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: '',