@@ -32,11 +32,11 @@
type="circle"
:width="120"
:stroke-width="5"
- :percentage="userData.serviceScore * 20"
+ :percentage="scorePercent(userData.serviceScore)"
color="#fecb89"
>
- {{ userData.serviceScore }}分
+ {{ userData.serviceScore || 0 }}分
服务得分
@@ -46,11 +46,11 @@
type="circle"
:width="120"
:stroke-width="5"
- :percentage="userData.deliveryScore * 20"
+ :percentage="scorePercent(userData.deliveryScore)"
color="#a7c5eb"
>
- {{ userData.deliveryScore }}分
+ {{ userData.deliveryScore || 0 }}分
交货得分
@@ -60,11 +60,11 @@
type="circle"
:width="120"
:stroke-width="5"
- :percentage="userData.descriptionScore * 20"
+ :percentage="scorePercent(userData.descriptionScore)"
color="#848ccf"
>
- {{ userData.descriptionScore }}分
+ {{ userData.descriptionScore || 0 }}分
评价得分
@@ -249,7 +249,7 @@ export default {
topGoodsData: [],
afterSaleNumData: {},
procurementStatusCount: {},
- userData: "",
+ userData: {},
notices: "",
noticesDetail: {
title: "",
@@ -301,6 +301,11 @@ export default {
if (t < y) return "compare-down";
return "compare-flat";
},
+ // ElProgress 的 percentage 必须是 0-100 的数字，评分缺失/异常时兜底为 0
+ scorePercent(score) {
+ const n = Number(score) * 20;
+ return Number.isFinite(n) ? Math.min(100, Math.max(0, n)) : 0;
+ },
async init() {
const userInfo = JSON.parse(Cookies.get("userInfoSeller"));
this.userData = userInfo;
diff --git a/seller/src/views/lili-components/affix-time.vue b/seller/src/views/lili-components/affix-time.vue
index 7a0347a9e..fbf85908a 100644
--- a/seller/src/views/lili-components/affix-time.vue
+++ b/seller/src/views/lili-components/affix-time.vue
@@ -84,7 +84,7 @@ export default {
},
mounted() {
this.getFiveYears();
- this.getShopList();
+ if (!this.closeShop) this.getShopList();
},
methods: {
getShopList() {
diff --git a/seller/src/views/lili-components/editor/index.vue b/seller/src/views/lili-components/editor/index.vue
index 2cd87e627..a2e9de042 100644
--- a/seller/src/views/lili-components/editor/index.vue
+++ b/seller/src/views/lili-components/editor/index.vue
@@ -10,6 +10,7 @@
-
-
diff --git a/seller/src/views/my-components/tree-table/Table/Table.less b/seller/src/views/my-components/tree-table/Table/Table.less
deleted file mode 100644
index 6fd20e920..000000000
--- a/seller/src/views/my-components/tree-table/Table/Table.less
+++ /dev/null
@@ -1,170 +0,0 @@
-@import "./font/iconfont";
-
-// text
-@prefixCls: zk-table;
-// color
-@black: #515a6e;
-@white: #ffffff;
-@border: #e9eaec;
-@hoverRow: #ebf7ff;
-@backgroundRow: #f8f8f9;
-
-.@{prefixCls} {
- position: relative;
- width: 100%;
- box-sizing: border-box;
- background-color: @white;
- border: 1px solid @border;
- font-size: 14px;
- line-height: 26px;
- color: @black;
- overflow: hidden;
-}
-
-.@{prefixCls}__header-cell {
- font-weight: bold;
-}
-
-.@{prefixCls}__cell-inner {
- padding: 0px 18px;
-}
-
-.@{prefixCls}-default {
- font-size: 14px;
-
- .@{prefixCls}__header-row {
- height: 40px !important;
- }
-
- .@{prefixCls}__body-row {
- height: 48px !important;
- }
-}
-
-.@{prefixCls}-small {
- font-size: 12px;
-
- .@{prefixCls}__header-row {
- height: 36px !important;
- }
-
- .@{prefixCls}__body-row {
- height: 40px !important;
- }
-}
-
-.@{prefixCls}-large {
- font-size: 16px;
-
- .@{prefixCls}__header-row {
- height: 43px !important;
- }
-
- .@{prefixCls}__body-row {
- height: 60px !important;
- }
-}
-
-.@{prefixCls}__header-wrapper,
-.@{prefixCls}__footer-wrapper {
- overflow: hidden;
-}
-
-.@{prefixCls}__body-wrapper {
- overflow: auto;
-}
-
-.@{prefixCls}__header,
-.@{prefixCls}__body,
-.@{prefixCls}__footer {
- width: 100%;
- table-layout: fixed;
- border-collapse: collapse;
- border-spacing: 0;
-}
-
-.@{prefixCls}__header-row {
- height: 40px;
- box-sizing: border-box;
- background-color: @backgroundRow;
- border-bottom: 1px solid @border;
-}
-
-.@{prefixCls}__footer-row {
- height: 40px;
- box-sizing: border-box;
- background-color: @white;
- border-top: 1px solid @border;
-}
-
-.@{prefixCls}__body-row {
- height: 48px;
- box-sizing: border-box;
-
- &:not(:first-of-type) {
- border-top: 1px solid @border;
- }
-}
-
-.@{prefixCls}__header-cell,
-.@{prefixCls}__body-cell,
-.@{prefixCls}__footer-cell {
- box-sizing: border-box;
- text-align: left;
- vertical-align: middle;
- word-break: break-all;
- overflow: hidden;
-}
-
-.@{prefixCls}--firstProp-header-inner {
- padding-left: 32px;
-}
-
-.@{prefixCls}--empty-row {
- height: 80px;
-}
-
-.@{prefixCls}--empty-content {
- text-align: center;
-}
-
-.@{prefixCls}--center-cell {
- text-align: center;
-}
-
-.@{prefixCls}--right-cell {
- text-align: right;
-}
-
-.@{prefixCls}--stripe-row {
- background-color: @backgroundRow;
-}
-
-.@{prefixCls}--row-hover {
- background-color: @hoverRow;
-}
-
-.@{prefixCls}--border-cell {
- &:not(:last-of-type) {
- border-right: 1px solid @border;
- }
-}
-
-.@{prefixCls}--tree-icon {
- margin-right: 6px;
- cursor: pointer;
-}
-
-.@{prefixCls}--expand-inner {
- text-align: center;
- cursor: pointer;
- transition: transform .2s ease-in-out;
-}
-
-.@{prefixCls}--expanded-inner {
- transform: rotate(90deg);
-}
-
-.@{prefixCls}--expand-content {
- padding: 20px;
-}
\ No newline at end of file
diff --git a/seller/src/views/my-components/tree-table/Table/Table.vue b/seller/src/views/my-components/tree-table/Table/Table.vue
deleted file mode 100644
index 8b5c6e559..000000000
--- a/seller/src/views/my-components/tree-table/Table/Table.vue
+++ /dev/null
@@ -1,398 +0,0 @@
-
-
-
-
-
-
-
diff --git a/seller/src/views/my-components/tree-table/Table/TableBody.js b/seller/src/views/my-components/tree-table/Table/TableBody.js
deleted file mode 100644
index f2b7b187b..000000000
--- a/seller/src/views/my-components/tree-table/Table/TableBody.js
+++ /dev/null
@@ -1,335 +0,0 @@
-import Checkbox from '../Checkbox/Checkbox'; // eslint-disable-line
-// import Radio from '../Radio/Radio'; // eslint-disable-line
-import { mixins } from './utils';
-/* eslint-disable no-underscore-dangle */
-export default {
- name: 'TreeTable__body',
- mixins: [mixins],
- inject: {
- treeTableRoot: { default: null },
- },
- data() {
- return {
- radioSelectedIndex: -1,
- };
- },
- computed: {
- table() {
- if (this.treeTableRoot) return this.treeTableRoot;
- let parent = this.$parent;
- while (parent) {
- if (parent.$options && parent.$options.name === 'TreeTable') return parent;
- parent = parent.$parent;
- }
- return this.$parent;
- },
- },
- methods: {
- toggleStatus(type, row, rowIndex, value) {
- this.validateType(type, ['Expanded', 'Checked', 'Hide', 'Fold'], 'toggleStatus', false);
- const target = this.table.bodyData[rowIndex];
- this.table.bodyData.splice(rowIndex, 1, {
- ...target,
- [`_is${type}`]: typeof value === 'undefined' ? !row[`_is${type}`] : value,
- });
- },
- getChildrenIndex(parentLevel, parentIndex, careFold = true) {
- const data = this.table.bodyData;
- let childrenIndex = [];
- for (let i = parentIndex + 1; i < data.length; i++) {
- if (data[i]._level <= parentLevel) break;
- if (data[i]._level - 1 === parentLevel) {
- childrenIndex.push(i);
- }
- }
- const len = childrenIndex.length; // important!!!
- if (len > 0) {
- for (let i = 0; i < len; i++) {
- const childData = data[childrenIndex[i]];
- if (
- childData._childrenLen &&
- (!careFold || (careFold && !childData._isFold))
- ) {
- childrenIndex = childrenIndex.concat(
- this.getChildrenIndex(childData._level, childrenIndex[i], careFold));
- }
- }
- }
- return childrenIndex;
- },
- handleEvent($event, type, data, others) {
- const certainType = this.validateType(type, ['cell', 'row', 'checkbox', 'icon', 'radio'], 'handleEvent');
- const eventType = $event ? $event.type : '';
- const { row, rowIndex, column, columnIndex } = data;
- const latestData = this.table.bodyData;
- // Checkbox
- if (certainType.checkbox) {
- const { isChecked } = others;
- this.toggleStatus('Checked', row, rowIndex, isChecked);
- if (row._childrenLen > 0) {
- const childrenIndex = this.getChildrenIndex(row._level, rowIndex, false);
- for (let i = 0; i < childrenIndex.length; i++) {
- this.toggleStatus('Checked', latestData[childrenIndex[i]], childrenIndex[i], isChecked);
- }
- }
- return this.table.$emit('checkbox-click', latestData[rowIndex], column, columnIndex, $event);
- }
- // Radio
- if (certainType.radio) {
- this.radioSelectedIndex = rowIndex;
- return this.table.$emit('radio-click', { row, rowIndex, column, columnIndex, $event });
- }
- // Tree's icon
- if (certainType.icon) {
- $event.stopPropagation();
- this.toggleStatus('Fold', row, rowIndex);
- const childrenIndex = this.getChildrenIndex(row._level, rowIndex);
- for (let i = 0; i < childrenIndex.length; i++) {
- this.toggleStatus('Hide', latestData[childrenIndex[i]], childrenIndex[i]);
- }
- return this.table.$emit('tree-icon-click', latestData[rowIndex], column, columnIndex, $event);
- }
- if (certainType.cell && eventType === 'click') {
- // 点击扩展单元格
- if (this.isExpandCell(this.table, columnIndex)) {
- this.toggleStatus('Expanded', row, rowIndex);
- return this.table.$emit('expand-cell-click', latestData[rowIndex], column, columnIndex, $event);
- }
- }
- // 行：Hover
- if (certainType.row && (eventType === 'mouseenter' || eventType === 'mouseleave')) {
- const { hover } = others;
- const target = latestData[rowIndex];
- latestData.splice(rowIndex, 1, {
- ...target,
- _isHover: hover,
- });
- }
- if (certainType.row && others && others.clickRow && certainType.radio) {
- this.radioSelectedIndex = rowIndex;
- return this.table.$emit('radio-click', { row, rowIndex, column, columnIndex, $event });
- }
- if (certainType.cell) {
- return this.table.$emit(`${type}-${eventType}`, latestData[rowIndex], rowIndex, column, columnIndex, $event);
- }
- return this.table.$emit(`${type}-${eventType}`, latestData[rowIndex], rowIndex, $event);
- },
- },
- render() {
- // style
- function getStyle(type, row, rowIndex, column, columnIndex) {
- const certainType = this.validateType(type, ['cell', 'row'], 'getStyle');
- const style = this.table[`${type}Style`];
- if (typeof style === 'function') {
- if (certainType.row) {
- return style.call(null, row, rowIndex);
- }
- if (certainType.cell) {
- return style.call(null, row, rowIndex, column, columnIndex);
- }
- }
- return style;
- }
-
- // className
- function getClassName(type, row, rowIndex, column, columnIndex) {
- const certainType = this.validateType(type, ['cell', 'row', 'inner'], 'getClassName');
- const classList = [];
- if (column && column.key == "_normalIndex") {
- classList.push(`${this.prefixCls}--center-cell`);
- }
- if (certainType.row || certainType.cell) {
- const className = this.table[`${type}ClassName`];
- if (typeof className === 'string') {
- classList.push(className);
- } else if (typeof className === 'function') {
- if (certainType.row) {
- classList.push(className.call(null, row, rowIndex) || '');
- }
- if (certainType.cell) {
- classList.push(className.call(null, row, rowIndex, column, columnIndex) || '');
- }
- }
- if (certainType.row) {
- classList.push(`${this.prefixCls}__body-row`);
- if (this.table.stripe && rowIndex % 2 !== 0) {
- classList.push(`${this.prefixCls}--stripe-row`);
- }
- if (this.table.showRowHover && row._isHover) {
- classList.push(`${this.prefixCls}--row-hover`);
- }
- }
- if (certainType.cell) {
- classList.push(`${this.prefixCls}__body-cell`);
- if (this.table.border) {
- classList.push(`${this.prefixCls}--border-cell`);
- }
- const align = column.align;
- if (['center', 'right'].indexOf(align) > -1) {
- classList.push(`${this.prefixCls}--${align}-cell`);
- }
- }
- }
- if (certainType.inner) {
- classList.push(`${this.prefixCls}__cell-inner`);
- if (this.isExpandCell(this.table, columnIndex)) {
- classList.push(`${this.prefixCls}--expand-inner`);
- if (row._isExpanded) {
- classList.push(`${this.prefixCls}--expanded-inner`);
- }
- }
- }
- return classList.join(' ');
- }
-
- // Vue 3：scoped slot 合并到 $slots
- function renderTemplateSlot(table, slotName, scope) {
- if (!table || !slotName) return '';
- const slots = table.$slots || {};
- let slot = slots[slotName];
- if (!slot && table.$scopedSlots && table.$scopedSlots[slotName]) {
- slot = table.$scopedSlots[slotName];
- }
- if (!slot) return '';
- return slot(scope);
- }
-
- // 根据type渲染单元格Cell
- function renderCell(row, rowIndex, column, columnIndex) {
- if (!row || !column) return '';
- // ExpandType
- if (this.isExpandCell(this.table, columnIndex)) {
- return
;
- }
- // SelectionType's Checkbox
- if (this.isSelectionCell(this.table, columnIndex)) {
- let res = null;
- if (this.table.selectType === 'checkbox') {
- let allCheck;
- let childrenIndex;
- const hasChildren = row._childrenLen > 0;
- if (hasChildren) {
- childrenIndex = this.getChildrenIndex(row._level, rowIndex, false);
- allCheck = true;
- for (let i = 0; i < childrenIndex.length; i++) {
- if (!this.table.bodyData[childrenIndex[i]]._isChecked) {
- allCheck = false;
- break;
- }
- }
- } else {
- allCheck = row._isChecked;
- }
- let indeterminate = false;
- if (hasChildren && !allCheck) {
- for (let i = 0; i < childrenIndex.length; i++) {
- if (this.table.bodyData[childrenIndex[i]]._isChecked) {
- indeterminate = true;
- break;
- }
- }
- }
- } else {
- res = (
-
- this.handleEvent(null, 'radio', { row, rowIndex, column, columnIndex })
- }
- />
- );
- }
- return res;
- }
-
- // Tree's firstProp
- if (this.table.treeType && this.table.firstProp === column.key) {
- return
- {row._childrenLen > 0 &&
- this.handleEvent($event, 'icon', { row, rowIndex, column, columnIndex }, { isFold: row._isFold })}>
- }
- {row[column.key] ? row[column.key] : ''}
- ;
- }
- // TreeType children's index
- if (this.table.showIndex && this.table.treeType && column.key === '_normalIndex' && row._level > 1) {
- return '';
- }
- if (column.type === undefined || column.type === 'custom') {
- return row[column.key];
- } else if (column.type === 'template') {
- return renderTemplateSlot.call(this, this.table, column.template, {
- row,
- rowIndex,
- column,
- columnIndex,
- });
- }
- return '';
- }
-
- // Template
- return (
-
-
- { this.table.bodyData.length > 0
- ? this.table.bodyData.map((row, rowIndex) =>
- [
- this.handleEvent($event, 'row', { row, rowIndex }, { clickRow: true })}
- on-dblclick={$event => this.handleEvent($event, 'row', { row, rowIndex })}
- on-contextmenu={$event => this.handleEvent($event, 'row', { row, rowIndex })}
- on-mouseenter={$event => this.handleEvent($event, 'row', { row, rowIndex }, { hover: true })}
- on-mouseleave={$event => this.handleEvent($event, 'row', { row, rowIndex }, { hover: false })}>
- { this.table.tableColumns.map((column, columnIndex) =>
- column.key ? | this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
- on-dblclick={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
- on-contextmenu={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
- on-mouseenter={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
- on-mouseleave={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}>
-
- {renderCell.call(this, row, rowIndex, column, columnIndex)}
-
- | :"")
- }
-
,
- this.table.expandType && row._isExpanded &&
-
- |
- {renderTemplateSlot.call(this, this.table, 'expand', { row, rowIndex })}
- |
-
,
- ])
- :
- |
- {this.table.emptyText}
- |
-
- }
-
-
- );
- },
-};
diff --git a/seller/src/views/my-components/tree-table/Table/TableFooter.js b/seller/src/views/my-components/tree-table/Table/TableFooter.js
deleted file mode 100644
index b3eed8a60..000000000
--- a/seller/src/views/my-components/tree-table/Table/TableFooter.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import { mixins } from './utils';
-
-/* eslint-disable no-underscore-dangle */
-export default {
- name: 'TreeTable__footer',
- mixins: [mixins],
- data() {
- return {
-
- };
- },
- computed: {
- table() {
- return this.$parent;
- },
- },
- methods: {
-
- },
- render() {
- // 计算各列总和
- function renderCell({ key }, columnIndex) {
- if (columnIndex === 0) {
- return this.table.sumText;
- }
- const rows = this.table.bodyData;
- const values = rows.map(row => Number(row[key]));
- const precisions = [];
- let notNumber = true;
- values.forEach((value) => {
- if (!isNaN(value)) {
- notNumber = false;
- const decimal = value.toString().split('.')[1];
- precisions.push(decimal ? decimal.length : 0);
- }
- });
- const precision = Math.max.apply(null, precisions);
- if (!notNumber) {
- return values.reduce((prev, curr) => {
- const value = Number(curr);
- if (!isNaN(value)) {
- return parseFloat((prev + curr).toFixed(precision));
- }
- return prev;
- }, 0);
- }
- return '';
- }
-
- // className
- function getClassName() {
- const classList = [];
- classList.push(`${this.prefixCls}__footer-cell`);
- if (this.table.border) {
- classList.push(`${this.prefixCls}--border-cell`);
- }
- return classList.join(' ');
- }
-
- // Template
- return (
-
-
- { this.table.tableColumns.map(column =>
- )
- }
-
-
-
- { this.table.tableColumns.map((column, columnIndex) =>
- |
-
- { this.table.summaryMethod
- ? this.table.summaryMethod(this.table.bodyData, column, columnIndex)
- : renderCell.call(this, column, columnIndex) }
-
- | )
- }
-
-
-
- );
- },
-};
diff --git a/seller/src/views/my-components/tree-table/Table/TableHeader.js b/seller/src/views/my-components/tree-table/Table/TableHeader.js
deleted file mode 100644
index 23570dfa0..000000000
--- a/seller/src/views/my-components/tree-table/Table/TableHeader.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import Checkbox from "../Checkbox/Checkbox"; // eslint-disable-line
-import { mixins } from "./utils";
-
-/* eslint-disable no-underscore-dangle */
-export default {
- name: "TreeTable__header",
- mixins: [mixins],
- data() {
- return {};
- },
- computed: {
- table() {
- return this.$parent;
- }
- },
- methods: {
- toggleAllChecked(checked) {
- this.table.bodyData = this.table.bodyData.map(row => ({
- ...row,
- _isChecked: checked
- }));
- }
- },
- render() {
- // className
- function getClassName(type, { headerAlign, key }) {
- const certainType = this.validateType(
- type,
- ["cell", "inner"],
- "getClassName"
- );
- const classList = [];
- if (key == "_normalIndex") {
- classList.push(`${this.prefixCls}--center-cell`);
- }
- if (certainType.cell) {
- classList.push(`${this.prefixCls}__header-cell`);
- if (this.table.border) {
- classList.push(`${this.prefixCls}--border-cell`);
- }
- if (["center", "right"].indexOf(headerAlign) > -1) {
- classList.push(`${this.prefixCls}--${headerAlign}-cell`);
- }
- }
- if (certainType.inner) {
- classList.push(`${this.prefixCls}__cell-inner`);
- if (this.table.treeType && this.table.firstProp === key) {
- classList.push(`${this.prefixCls}--firstProp-header-inner`);
- }
- }
- return classList.join(" ");
- }
-
- // 根据type渲染单元格Label
- function renderLabel(column, columnIndex) {
- if (
- this.isSelectionCell(this.table, columnIndex) &&
- this.selectType === "checkbox"
- ) {
- const allCheck = this.table.bodyData.every(row => row._isChecked);
- const indeterminate =
- !allCheck && this.table.bodyData.some(row => row._isChecked);
- return (
-
this.toggleAllChecked(checked)}
- >
- );
- }
- return column.title ? column.title : "";
- }
-
- // Template
- return (
-
- );
- }
-};
diff --git a/seller/src/views/my-components/tree-table/Table/font/iconfont.eot b/seller/src/views/my-components/tree-table/Table/font/iconfont.eot
deleted file mode 100644
index 2b35d90c1..000000000
Binary files a/seller/src/views/my-components/tree-table/Table/font/iconfont.eot and /dev/null differ
diff --git a/seller/src/views/my-components/tree-table/Table/font/iconfont.less b/seller/src/views/my-components/tree-table/Table/font/iconfont.less
deleted file mode 100644
index ca06f860e..000000000
--- a/seller/src/views/my-components/tree-table/Table/font/iconfont.less
+++ /dev/null
@@ -1,22 +0,0 @@
-// icon
-@font-face {font-family: "iconfont";
- src: url('iconfont.eot?t=1505310522875'); /* IE9*/
- src: url('iconfont.eot?t=1505310522875#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAW0AAsAAAAACOQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW7kggY21hcAAAAYAAAABuAAABojLtBtFnbHlmAAAB8AAAAa8AAAKA73SzT2hlYWQAAAOgAAAALwAAADYO3fRqaGhlYQAAA9AAAAAcAAAAJAfeA4ZobXR4AAAD7AAAABMAAAAUE+kAAGxvY2EAAAQAAAAADAAAAAwBbAHYbWF4cAAABAwAAAAeAAAAIAEUAF1uYW1lAAAELAAAAUUAAAJtPlT+fXBvc3QAAAV0AAAAQAAAAFryy5h0eJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk/s04gYGVgYOpk+kMAwNDP4RmfM1gxMjBwMDEwMrMgBUEpLmmMDgwVDwzZm7438AQw9zA0AAUZgTJAQAoHgyieJzFkcENwyAUQ98HyqHKKDmEZoEOklOnYOK/RmI+uXSCWDLG/pZAALyALK5iAfthDBxKLfLMO/LCJl+lRqL7fp7y3VuoKprV0KxO0qbyGOy5o/+xxPq9nV6YflNX9DY5fsA/k6Pj+yTpAn3jEO8AAHiclVDNitNQFD7n3slNE9vE5N7kpOn0J0mbKB3DGDMZRGw3bhQXA2LB5TyAbmfjohvBhQvfYEAEoc8wr+EDiK4KPkITU0EcXDmHw3fOgfN9fHygATTf+BUPQMIduA9P4AwAxRxjiw0xysqczdGLNI+UxbMki/QkzvljpFgov6jKlIQubLRwhA+iospyluFJuWCPsPCHiP1B+MKdHbr8I5pBNnpXP2Of0Bsnh/biXv30aKmKiexcdF2377ofOkLTOowd2Ba+Jt/QDFPUnzU79K7Gd9kYu/0sfP6qNxm45+/LN8MZGYjrNcrBxPqydEKn7behL92+frvXCcJeMlV48eNWILvD9Du0hXtgl+wSHIBZnJZLzNKyKgh9paPAdVca260hAxPBMBowz9t1uzUDuT8CswEDDtq8Gr7mADaM4QgetrKRhbozQooWeOrkKJVIojg9ccqqjcT3uBJ6lGNZnUYjnBU+ORbGaeYskM93m+kx4vGUrX5PQXK3kUSSrSS9JFWvFJHCjaIGJCFSugcOLeM6c7f6wyFZf/37+PO6AgD/x/vNnN/A7H8bhF86tmcbAHicY2BkYGAAYl/p/jnx/DZfGbhZGEDg6v0IKwT9/yELA7MEkMvBwAQSBQAZYgnZAHicY2BkYGBu+N/AEMPCAAJAkpEBFbACAEcLAm54nGNhYGBgfsnAwMKAwAAOmwD9AAAAAAAAdgCYAPYBQHicY2BkYGBgZQgEYhBgAmIuIGRg+A/mMwAAES0BcgAAeJxlj01OwzAQhV/6B6QSqqhgh+QFYgEo/RGrblhUavdddN+mTpsqiSPHrdQDcB6OwAk4AtyAO/BIJ5s2lsffvHljTwDc4Acejt8t95E9XDI7cg0XuBeuU38QbpBfhJto41W4Rf1N2MczpsJtdGF5g9e4YvaEd2EPHXwI13CNT+E69S/hBvlbuIk7/Aq30PHqwj7mXle4jUcv9sdWL5xeqeVBxaHJIpM5v4KZXu+Sha3S6pxrW8QmU4OgX0lTnWlb3VPs10PnIhVZk6oJqzpJjMqt2erQBRvn8lGvF4kehCblWGP+tsYCjnEFhSUOjDFCGGSIyujoO1Vm9K+xQ8Jee1Y9zed0WxTU/3OFAQL0z1xTurLSeTpPgT1fG1J1dCtuy56UNJFezUkSskJe1rZUQuoBNmVXjhF6XNGJPyhnSP8ACVpuyAAAAHicY2BigAAuBuyAlZGJkZmRhZGVkY2BsYI7MS89J1W3KDM9o4S3IKe0WLe4sDSxKFU3ny83Mw+Jy8AAAHSWD8A=') format('woff'),
- url('iconfont.ttf?t=1505310522875') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
- url('iconfont.svg?t=1505310522875#iconfont') format('svg'); /* iOS 4.1- */
-}
-
-.zk-icon {
- font-family: "iconfont" !important;
- font-size: 14px;
- font-style: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.zk-icon-plus-square-o:before { content: "\e631"; }
-
-.zk-icon-minus-square-o:before { content: "\e632"; }
-
-.zk-icon-angle-right:before { content: "\e633"; }
diff --git a/seller/src/views/my-components/tree-table/Table/font/iconfont.svg b/seller/src/views/my-components/tree-table/Table/font/iconfont.svg
deleted file mode 100644
index 085fd5625..000000000
--- a/seller/src/views/my-components/tree-table/Table/font/iconfont.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
diff --git a/seller/src/views/my-components/tree-table/Table/font/iconfont.ttf b/seller/src/views/my-components/tree-table/Table/font/iconfont.ttf
deleted file mode 100644
index 545bf911c..000000000
Binary files a/seller/src/views/my-components/tree-table/Table/font/iconfont.ttf and /dev/null differ
diff --git a/seller/src/views/my-components/tree-table/Table/font/iconfont.woff b/seller/src/views/my-components/tree-table/Table/font/iconfont.woff
deleted file mode 100644
index fe9b1d701..000000000
Binary files a/seller/src/views/my-components/tree-table/Table/font/iconfont.woff and /dev/null differ
diff --git a/seller/src/views/my-components/tree-table/Table/utils/index.js b/seller/src/views/my-components/tree-table/Table/utils/index.js
deleted file mode 100644
index dfbbb101d..000000000
--- a/seller/src/views/my-components/tree-table/Table/utils/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import mixins from './mixins';
-import scrollBarWidth from './scrollBarWidth';
-export {
- mixins,
- scrollBarWidth
-}
diff --git a/seller/src/views/my-components/tree-table/Table/utils/mixins.js b/seller/src/views/my-components/tree-table/Table/utils/mixins.js
deleted file mode 100644
index 5b9ee2516..000000000
--- a/seller/src/views/my-components/tree-table/Table/utils/mixins.js
+++ /dev/null
@@ -1,34 +0,0 @@
-export default {
- data() {
- return {
- prefixCls: 'zk-table',
- };
- },
- methods: {
- validateType(type, validTypes, funcName, isReturn = true) {
- if (validTypes.indexOf(type) < 0) throw new Error(`${funcName}'s type must is ${validTypes.join(' or ')}.`);
- if (isReturn) {
- const certainType = {};
- validTypes.forEach((item) => {
- certainType[item] = item === type;
- });
- return certainType;
- }
- return true;
- },
- isExpandCell(table, columnIndex) {
- return table.expandType && (
- (table.showIndex && columnIndex === 1) ||
- (!table.showIndex && columnIndex === 0)
- );
- },
- isSelectionCell(table, columnIndex) {
- return table.selectable && (
- (table.showIndex && table.expandType && columnIndex === 2) ||
- (!table.showIndex && table.expandType && columnIndex === 1) ||
- (table.showIndex && !table.expandType && columnIndex === 1) ||
- (!table.showIndex && !table.expandType && columnIndex === 0)
- );
- },
- },
-};
diff --git a/seller/src/views/my-components/tree-table/Table/utils/scrollBarWidth.js b/seller/src/views/my-components/tree-table/Table/utils/scrollBarWidth.js
deleted file mode 100644
index 9b8b2f78f..000000000
--- a/seller/src/views/my-components/tree-table/Table/utils/scrollBarWidth.js
+++ /dev/null
@@ -1,26 +0,0 @@
-let scrollBarWidth;
-
-export default function getScrollBarWidth() {
- if (typeof document === "undefined") return 0;
- if (scrollBarWidth !== undefined) return scrollBarWidth;
-
- const outer = document.createElement("div");
- outer.style.visibility = "hidden";
- outer.style.width = "100px";
- outer.style.position = "absolute";
- outer.style.top = "-9999px";
- document.body.appendChild(outer);
-
- const widthNoScroll = outer.offsetWidth;
- outer.style.overflow = "scroll";
-
- const inner = document.createElement("div");
- inner.style.width = "100%";
- outer.appendChild(inner);
-
- const widthWithScroll = inner.offsetWidth;
- outer.parentNode.removeChild(outer);
- scrollBarWidth = widthNoScroll - widthWithScroll;
-
- return scrollBarWidth;
-}
diff --git a/seller/src/views/my-components/verify/index.vue b/seller/src/views/my-components/verify/index.vue
index 2e4f1fcf9..4b58c9423 100644
--- a/seller/src/views/my-components/verify/index.vue
+++ b/seller/src/views/my-components/verify/index.vue
@@ -119,14 +119,18 @@ export default {
this.distance = 0;
this.bgColor = "#04ad11";
this.verifyText = "拖动滑块解锁";
- getVerifyImg(this.type).then((res) => {
- if (res.result) {
- this.data = res.result;
- this.show = true;
- } else {
- this.$Message.warning("请求失败请重试！");
- }
- });
+ getVerifyImg(this.type)
+ .then((res) => {
+ if (res.result) {
+ this.data = res.result;
+ this.show = true;
+ } else {
+ this.$Message.warning("请求失败请重试！");
+ }
+ })
+ .catch(() => {
+ this.$Message.warning("验证码加载失败，请点击重试");
+ });
},
},
watch: {
diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue
index 1ff78aa6f..7dceb5e05 100644
--- a/seller/src/views/order/receiptManager/receipt.vue
+++ b/seller/src/views/order/receiptManager/receipt.vue
@@ -227,13 +227,13 @@ export default {
const map = {
UNPAID: "danger",
PAID: "primary",
- UNDELIVERED: "",
+ UNDELIVERED: "info",
DELIVERED: "info",
COMPLETED: "success",
TAKE: "warning",
CANCELLED: "danger",
};
- return map[status] || "";
+ return map[status] || "info";
},
canInvoicing(row) {
if (!row) return false;
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 88a5f8501..3b8aab46d 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -112,7 +112,7 @@
-
+
diff --git a/seller/src/views/shop/ossManages.vue b/seller/src/views/shop/ossManages.vue
deleted file mode 100644
index 156c8e113..000000000
--- a/seller/src/views/shop/ossManages.vue
+++ /dev/null
@@ -1,1338 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
-
-
-
- 上传图片
-
-
-
-
-
-
-
-
-
-
-
-
- {{ data.title }}
-
- ···
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
- 添加分组
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 提交
-
-
-
-
- ![无效的图片链接]()
-
- 文件类型：{{ file.fileType }} 文件大小：{{ file.msize }} 创建时间：{{ file.createTime }}
-
-
-
-
-
-
- 文件类型：{{ file.fileType }} 文件大小：{{ file.msize }} 创建时间：{{ file.createTime }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-