diff --git a/src/common/model/goods/MultiSpec.js b/src/common/model/goods/MultiSpec.js index 5ef980b..3c5c747 100644 --- a/src/common/model/goods/MultiSpec.js +++ b/src/common/model/goods/MultiSpec.js @@ -17,10 +17,10 @@ const defaultColumns = [ scopedSlots: { customRender: 'goods_price' } }, { - title: '划线价格', - dataIndex: 'line_price', + title: '成本价', + dataIndex: 'cost_price', width: 120, - scopedSlots: { customRender: 'line_price' } + scopedSlots: { customRender: 'cost_price' } }, { title: '库存数量', diff --git a/src/components/Modal/ActiveModal/ActiveModal.vue b/src/components/Modal/ActiveModal/ActiveModal.vue new file mode 100644 index 0000000..05c42ce --- /dev/null +++ b/src/components/Modal/ActiveModal/ActiveModal.vue @@ -0,0 +1,249 @@ + + + + + diff --git a/src/components/Modal/ActiveModal/index.js b/src/components/Modal/ActiveModal/index.js new file mode 100644 index 0000000..84db87e --- /dev/null +++ b/src/components/Modal/ActiveModal/index.js @@ -0,0 +1,2 @@ +import ActiveModal from './ActiveModal' +export default ActiveModal diff --git a/src/components/Modal/index.js b/src/components/Modal/index.js index e584e95..d9ee08a 100644 --- a/src/components/Modal/index.js +++ b/src/components/Modal/index.js @@ -9,6 +9,7 @@ import ShopModal from './ShopModal' import CouponModal from './CouponModal' import UserModal from './UserModal' import ServerModal from './ServerModal' +import ActiveModal from './ActiveModal' export { GoodsModal, @@ -22,4 +23,5 @@ export { CouponModal, UserModal, ServerModal, + ActiveModal } diff --git a/src/components/SelectActive/SelectActive.vue b/src/components/SelectActive/SelectActive.vue new file mode 100644 index 0000000..3de23fe --- /dev/null +++ b/src/components/SelectActive/SelectActive.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/components/SelectActive/index.js b/src/components/SelectActive/index.js new file mode 100644 index 0000000..a62f812 --- /dev/null +++ b/src/components/SelectActive/index.js @@ -0,0 +1,2 @@ +import SelectActive from './SelectActive' +export default SelectActive diff --git a/src/components/index.js b/src/components/index.js index 3a91aa1..9144f9c 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -12,6 +12,7 @@ import SelectSharpGoods from '@/components/SelectSharpGoods' import SelectRegion from '@/components/SelectRegion' import SelectCoupon from '@/components/SelectCoupon' import SelectUser from '@/components/SelectUser' +import SelectActive from '@/components/SelectActive' import Getpoint from '@/components/Getpoint' import Ueditor from '@/components/Ueditor' @@ -36,4 +37,5 @@ export { InputNumberGroup, ContentHeader, SelectServer, + SelectActive } diff --git a/src/views/content/banner/modules/AddForm.vue b/src/views/content/banner/modules/AddForm.vue index cc01561..3a39d80 100644 --- a/src/views/content/banner/modules/AddForm.vue +++ b/src/views/content/banner/modules/AddForm.vue @@ -20,7 +20,8 @@ /> - + + @@ -42,20 +43,21 @@