{{ time.timeLine + ":00" }}
{{ nowHour >= time.timeLine ? "秒杀中" : "即将开始" }}
@@ -30,13 +25,8 @@
+
![]()
@@ -53,42 +43,28 @@
-
{{ item.goodsName }}
-
+
-
{{ nowHour >= list[currIndex].timeLine ? "立即抢购" : "即将开始" }}
-
+
@@ -66,10 +54,8 @@
已售罄
- 已售{{
- (item.quantity && item.quantity > 0
- ? Math.ceil(
- (item.salesNum / (item.quantity + item.salesNum)) * 100
- )
- : 100) + "%"
- }}
+ 已售{{
+ (item.quantity && item.quantity > 0
+ ? Math.ceil(
+ (item.salesNum / (item.quantity + item.salesNum)) * 100
+ )
+ : 100) + "%"
+ }}
{{ item.storeName }}
@@ -101,7 +77,7 @@
diff --git a/manager/src/components/lili/upload-pic-input.vue b/manager/src/components/lili/upload-pic-input.vue
index 6ad5bddf..e5039617 100644
--- a/manager/src/components/lili/upload-pic-input.vue
+++ b/manager/src/components/lili/upload-pic-input.vue
@@ -14,12 +14,12 @@
-
+
- ![该资源不存在]()
+ ![该资源不存在]()
diff --git a/manager/src/views/goods/goods-manage/spec.vue b/manager/src/views/goods/goods-manage/spec.vue
index 9ec82c2d..73ba2c8b 100644
--- a/manager/src/views/goods/goods-manage/spec.vue
+++ b/manager/src/views/goods/goods-manage/spec.vue
@@ -26,11 +26,10 @@
- {{ form }}
@@ -51,7 +50,7 @@ import { regular } from "@/utils";
export default {
name: "spec",
components: {},
- data() {
+ data () {
return {
loading: true, // 表单加载状态
modalType: 0, // 添加或编辑标识
@@ -150,29 +149,32 @@ export default {
};
},
methods: {
+ handleCreate2 (v) {
+ console.log(v);
+ },
//初始化，获取数据
- init() {
+ init () {
this.getDataList();
},
//修改分页
- changePage(v) {
+ changePage (v) {
this.searchForm.pageNumber = v;
this.getDataList();
this.clearSelectAll();
},
//修改页面大小
- changePageSize(v) {
+ changePageSize (v) {
this.searchForm.pageSize = v;
this.getDataList();
},
//搜索参数
- handleSearch() {
+ handleSearch () {
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10;
this.getDataList();
},
//重置搜索参数
- handleReset() {
+ handleReset () {
this.$refs.searchForm.resetFields();
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10;
@@ -180,7 +182,7 @@ export default {
this.getDataList();
},
//更改排序
- changeSort(e) {
+ changeSort (e) {
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
@@ -189,16 +191,16 @@ export default {
this.getDataList();
},
//清除已选择
- clearSelectAll() {
+ clearSelectAll () {
this.$refs.table.selectAll(false);
},
//修改已选择
- changeSelect(e) {
+ changeSelect (e) {
this.selectList = e;
this.selectCount = e.length;
},
//获取数据
- getDataList() {
+ getDataList () {
this.loading = true;
// 带多条件搜索参数获取表单数据 请自行修改接口
getSpecListData(this.searchForm).then((res) => {
@@ -211,7 +213,7 @@ export default {
this.loading = false;
},
//新增规格
- saveSpec() {
+ saveSpec () {
this.$refs.form.validate((valid) => {
if (valid) {
this.submitLoading = true;
@@ -246,7 +248,7 @@ export default {
});
},
//弹出添加框
- add() {
+ add () {
this.modalType = 0;
this.modalTitle = "添加";
this.$refs.form.resetFields();
@@ -255,8 +257,7 @@ export default {
this.modalVisible = true;
},
//弹出编辑框
- edit(v) {
- console.log(v);
+ edit (v) {
this.modalType = 1;
this.modalTitle = "编辑";
// 转换null为""
@@ -266,23 +267,21 @@ export default {
}
}
let localVal = v.specValue;
- console.log(localVal.split(","))
this.form.specName = v.specName;
this.form.id = v.id;
- this.$nextTick(() => {
- this.$set(this.form, 'specValue', localVal.split(","))
- })
-
+ // this.$nextTick(() => {
+ // this.$set(this.form, 'specValue', localVal.split(","))
+ // })
+ this.form.specValue = localVal.split(",")
if (localVal && localVal.indexOf("," > 0)) {
this.specValue = this.form.specValue;
} else {
this.specValue = [];
}
- console.log("form.specValue", this.form);
this.modalVisible = true;
},
// 删除规格
- remove(v) {
+ remove (v) {
this.$Modal.confirm({
title: "确认删除",
content: "您确认要删除 " + v.specName + " ?",
@@ -299,7 +298,7 @@ export default {
});
},
// 批量删除
- delAll() {
+ delAll () {
if (this.selectCount <= 0) {
this.$Message.warning("您还未选择要删除的数据");
return;
@@ -327,7 +326,7 @@ export default {
});
},
},
- mounted() {
+ mounted () {
this.init();
},
};
diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue
index 891e7832..38ba8262 100644
--- a/manager/src/views/member/advance/withdrawApply.vue
+++ b/manager/src/views/member/advance/withdrawApply.vue
@@ -165,6 +165,8 @@ export default {
return h("Tag", { props: { color: "green" } }, "审核通过");
} else if (params.row.applyStatus == "SUCCESS") {
return h("Tag", { props: { color: "blue" } }, "提现成功");
+ } else if (params.row.applyStatus == "ERROR") {
+ return h("Tag", { props: { color: "blue" } }, "提现失败");
} else {
return h("Tag", { props: { color: "red" } }, "审核拒绝");
}
@@ -249,6 +251,8 @@ export default {
return "审核通过(提现成功)";
} else if (val === "FAIL_AUDITING") {
return "审核拒绝";
+ } else if (val === "ERROR") {
+ return "提现失败";
} else {
return "未知状态";
}
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 0f0ad381..04890d8c 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -325,6 +325,7 @@ export default {
methods: {
// 回调给父级
callback(val, index) {
+ this.selectMember.forEach(item=>{item.___selected = false})
this.$set(val, "___selected", !val.___selected);
console.log(val.___selected);
console.log(this.selectMember);
diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
index a4a5edda..122bfd22 100644
--- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue
+++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
@@ -84,7 +84,7 @@
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 2df88231..6fc84f74 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -4,24 +4,12 @@
- 实际退款金额
-
-
+
-
diff --git a/manager/src/views/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue
index 69b40ddc..2a2b218c 100644
--- a/manager/src/views/order/order/fictitiousOrderList.vue
+++ b/manager/src/views/order/order/fictitiousOrderList.vue
@@ -4,22 +4,10 @@
-
-
-
+
+
+
-
+
+
@@ -101,7 +87,7 @@
@@ -127,12 +113,12 @@
发票税号：
{{ orderInfo.receipt && orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
@@ -81,8 +67,8 @@
@@ -92,8 +78,8 @@
{{
orderInfo.receipt && orderInfo.receipt.receiptContent
- ? orderInfo.receipt.receiptContent
- : "暂无"
+ ? orderInfo.receipt.receiptContent
+ : "暂无"
}}
{{
orderInfo.receipt && orderInfo.receipt.receiptPrice
- ? orderInfo.receipt.receiptPrice
- : "暂无" | unitPrice("￥")
+ ? orderInfo.receipt.receiptPrice
+ : "暂无" | unitPrice("￥")
}}
是否开票：
- {{ orderInfo.receipt?(orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开"):"空" }}
+ {{ orderInfo.receipt ? (orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开") : "空" }}
{{ orderInfo.order.remark }}
+
-
+
-
+
-
+
+
-
+
-
+
-
+
-
+
-
+
配置MINIO nginx前端访问转发地址，一般为完整域名，例如：https://minio.pickmall.cn
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -179,3 +179,4 @@ export default {
color: #999;
}
+
diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
index df8db5bb..cbf57bbc 100644
--- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
+++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
@@ -94,7 +94,7 @@
配送方式：
{{ orderInfo.deliveryMethodValue }}
@@ -189,22 +173,12 @@
+ | 优惠详情： | -|
|---|---|
| {{item.promotionName}}： | +|
| {{ item.promotionName }}： | ¥{{ item.discountPrice | unitPrice }} | -
- 实际退款金额
-
-
+
-
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index ddc012bb..ef8ba4fa 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -487,7 +487,7 @@ export default {
liliMap,
region,
},
- data() {
+ data () {
return {
typeList: [],
showPrices: false,
@@ -693,27 +693,27 @@ export default {
},
methods: {
//修改地址
- regionClick() {
+ regionClick () {
this.showRegion = true;
this.regionId = "";
},
//弹出订单核销框
- orderTake() {
+ orderTake () {
this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode;
this.orderTakeModal = true;
},
//打印发货单
- printOrder() {
+ printOrder () {
this.printModal = true;
},
- printHiddenInfo() {
+ printHiddenInfo () {
this.printHiddenFlag = !this.printHiddenFlag;
},
- printCancel() {
+ printCancel () {
// this.printHiddenFlag = false;
},
//订单核销提交
- orderTakeSubmit() {
+ orderTakeSubmit () {
this.$refs.orderTakeForm.validate((valid) => {
if (valid) {
API_Order.orderTake(this.sn, this.orderTakeForm.qrCode).then(
@@ -728,14 +728,14 @@ export default {
}
});
},
- getOrderPrice() {
+ getOrderPrice () {
if (this.showPrices) {
this.showPrices = false
} else if (!this.showPrices) {
this.showPrices = true
}
},
- getContentPrice() {
+ getContentPrice () {
for (let i = 0; i < this.typeList.length; i++) {
for (let j = i + 1; j < this.typeList.length; j++) {
if (this.typeList[i].promotionId === this.typeList[j].promotionId) {
@@ -751,7 +751,7 @@ export default {
}
},
//获取订单详细信息
- getDataDetail() {
+ getDataDetail () {
this.loading = true;
API_Order.getOrderDetail(this.sn).then((res) => {
this.loading = false;
@@ -766,7 +766,7 @@ export default {
}
});
},
- Toprint() {
+ Toprint () {
this.facesheetFlag = true;
API_Logistics.getCheckedOn().then(res => {
if (res.success) {
@@ -776,13 +776,13 @@ export default {
});
},
// 修改订单金额
- modifyPrice() {
+ modifyPrice () {
//默认要修改的金额为订单总金额
this.modifyPriceForm.orderPrice = this.orderInfo.order.flowPrice;
this.modal = true;
},
//修改订单金额提交
- modifyPriceSubmit() {
+ modifyPriceSubmit () {
this.$refs.modifyPriceForm.validate((valid) => {
if (valid) {
API_Order.modifyOrderPrice(this.sn, this.modifyPriceForm).then(
@@ -798,12 +798,12 @@ export default {
});
},
// 选中的地址
- selectedRegion(val) {
+ selectedRegion (val) {
this.region = val[1];
this.regionId = val[0];
},
//查询物流
- logistics() {
+ logistics () {
this.logisticsModal = true;
API_Order.getTraces(this.sn).then((res) => {
if (res.success && res.result != null) {
@@ -812,7 +812,7 @@ export default {
});
},
//订单发货
- orderDeliver() {
+ orderDeliver () {
this.facesheetFlag = false
if (this.logisticsType == 'SHUNFENG') {
this.$Modal.confirm({
@@ -839,7 +839,7 @@ export default {
}
},
//顺丰打印面单
- sfPrint() {
+ sfPrint () {
API_Order.getOrderFaceSheet(this.sn, this.faceSheetForm).then(res => {
if (res.success) {
let headers = {
@@ -869,13 +869,13 @@ export default {
}
})
},
- Toprints() {
+ Toprints () {
if (this.form.logisticsId != null && this.form.logisticsId != '') {
this.orderDeliverModal = false;
}
},
//订单发货提交
- orderDeliverySubmit() {
+ orderDeliverySubmit () {
if (this.facesheetFlag) {
this.$refs['faceSheetForm'].validate((valid) => {
if (valid) {
@@ -904,7 +904,7 @@ export default {
}
},
//弹出修改收货地址框
- editAddress() {
+ editAddress () {
this.addressModal = true;
this.showRegion = false;
this.regionId = this.orderInfo.order.consigneeAddressIdPath;
@@ -918,7 +918,7 @@ export default {
this.orderInfo.order.consigneeAddressIdPath;
},
//修改收货地址
- editAddressSubmit() {
+ editAddressSubmit () {
if (this.regionId == "") {
this.$Message.error("请选择地址");
return;
@@ -940,7 +940,7 @@ export default {
});
},
- getLogisticsSetting() {
+ getLogisticsSetting () {
API_Logistics.getLogisticsSetting().then(res => {
if (res.success) {
this.logisticsType = res.result;
@@ -949,13 +949,13 @@ export default {
},
},
- mounted() {
+ mounted () {
this.sn = this.$route.query.sn;
this.getDataDetail();
this.getLogisticsSetting();
},
// 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面
- beforeRouteLeave(to, from, next) {
+ beforeRouteLeave (to, from, next) {
if (to.name === 'orderList' || to.name === 'virtualOrderList') {
to.meta.keepAlive = true
}
diff --git a/seller/src/views/promotion/full-discount/full-discount-add.vue b/seller/src/views/promotion/full-discount/full-discount-add.vue
index 520a03a4..2c6776d4 100644
--- a/seller/src/views/promotion/full-discount/full-discount-add.vue
+++ b/seller/src/views/promotion/full-discount/full-discount-add.vue
@@ -6,251 +6,101 @@
-
+
-
+
- {{ index + 1 }} + + +
-
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+ + +++++ + ++
+ + + ++
+
+
+
diff --git a/seller/src/views/shop/hotzone/directives/addItem.js b/seller/src/views/shop/hotzone/directives/addItem.js
new file mode 100644
index 00000000..9832b00f
--- /dev/null
+++ b/seller/src/views/shop/hotzone/directives/addItem.js
@@ -0,0 +1,101 @@
+import _ from '../utils'
+
+export default {
+ bind: function (el, binding, vnode) {
+ const MIN_LIMIT = _.MIN_LIMIT
+
+ el.addEventListener('mousedown', handleMouseDown, { passive: false })
+
+ function handleMouseDown(e) {
+ // console.log('additem', e)
+ e && e.preventDefault()
+
+ let itemInfo = {
+ top: _.getDistanceY(e, el),
+ left: _.getDistanceX(e, el),
+ width: 0,
+ height: 0
+ }
+ let container = _.getOffset(el)
+
+ // Only used once at the beginning of init
+ let setting = {
+ topPer: _.decimalPoint(itemInfo.top / container.height),
+ leftPer: _.decimalPoint(itemInfo.left / container.width),
+ widthPer: 0,
+ heightPer: 0
+ }
+ let preX = _.getPageX(e)
+ let preY = _.getPageY(e)
+
+ vnode.context.addItem(setting)// 这里去添加并发送了add通知，不应该发送通知
+
+ window.addEventListener('mousemove', handleChange, { passive: false })
+ window.addEventListener('mouseup', handleMouseUp, { passive: false })
+
+ function handleChange(e) {
+ e && e.preventDefault()
+
+ let moveX = _.getPageX(e) - preX
+ let moveY = _.getPageY(e) - preY
+ preX = _.getPageX(e)
+ preY = _.getPageY(e)
+
+ // Not consider the direction of movement first, consider only the lower right drag point
+ let minLimit = 0
+ // 添加热区时，判定鼠标释放时，满足（热区大于48*48时）条件时生效
+ let styleInfo = _.dealBR(itemInfo, moveX, moveY, minLimit)
+
+ // Boundary value processing 改变热区大小时边界条件的处理
+ itemInfo = _.dealEdgeValue(itemInfo, styleInfo, container, vnode.context.zones)
+
+ Object.assign(el.lastElementChild.style, {
+ top: `${itemInfo.top}px`,
+ left: `${itemInfo.left}px`,
+ width: `${itemInfo.width}px`,
+ height: `${itemInfo.height}px`
+ })
+ }
+
+ function handleMouseUp() {
+ let perInfo = {
+ topPer: _.decimalPoint(itemInfo.top / container.height),
+ leftPer: _.decimalPoint(itemInfo.left / container.width),
+ widthPer: _.decimalPoint(itemInfo.width / container.width),
+ heightPer: _.decimalPoint(itemInfo.height / container.height),
+ img: "",
+ link: "",
+ type: "",
+ title: ""
+ }
+
+ if (vnode.context.isOverRange()) {
+ vnode.context.overRange() // 判断超出个数限制，给overRange钩子抛回调
+ } else if (container.height < MIN_LIMIT && itemInfo.width > MIN_LIMIT) {
+ vnode.context.changeItem(Object.assign(perInfo, {
+ topPer: 0,
+ heightPer: 1
+ }), true)
+ } else if (container.width < MIN_LIMIT && itemInfo.height > MIN_LIMIT) {
+ vnode.context.changeItem(Object.assign(perInfo, {
+ leftper: 0,
+ widthPer: 1
+ }), true)
+ } else if (itemInfo.width > MIN_LIMIT && itemInfo.height > MIN_LIMIT) {
+ vnode.context.changeItem(perInfo, true)
+ } else {
+ // 当添加区域超出范围或小于最小区域（48*48）时触发，删除当亲绘制的热区并发送erase事件通知
+ vnode.context.eraseItem()
+ }
+
+ window.removeEventListener('mousemove', handleChange)
+ window.removeEventListener('mouseup', handleMouseUp)
+ }
+ }
+
+ el.$destroy = () => el.removeEventListener('mousedown', handleMouseDown)
+ },
+ unbind: function (el) {
+ el.$destroy()
+ }
+}
diff --git a/seller/src/views/shop/hotzone/directives/changeSize.js b/seller/src/views/shop/hotzone/directives/changeSize.js
new file mode 100644
index 00000000..a98c139c
--- /dev/null
+++ b/seller/src/views/shop/hotzone/directives/changeSize.js
@@ -0,0 +1,91 @@
+import _ from '../utils'
+
+export default {
+ bind: function (el, binding, vnode) {
+ el.addEventListener('mousedown', handleMouseDown,{ passive: false })
+
+ function handleMouseDown (e) {
+ let pointer = e.target.dataset.pointer //元素上绑定的方法名
+
+ if (!pointer) {
+ return
+ }
+
+ e && e.stopPropagation()
+
+ let zone = el.parentNode
+ let setting = vnode.context.setting
+ let currentIndex = vnode.context.index
+ let container = _.getOffset(zone.parentNode)
+ let itemInfo = {
+ width: _.getOffset(zone).width || 0,
+ height: _.getOffset(zone).height || 0,
+ top: setting.topPer * container.height || 0,
+ left: setting.leftPer * container.width || 0
+ }
+ let preX = _.getPageX(e)
+ let preY = _.getPageY(e)
+ let flag
+
+ // Hide the info displayed by hover
+ vnode.context.handlehideZone(true)
+
+ window.addEventListener('mousemove', handleChange,{ passive: false })
+ window.addEventListener('mouseup', handleMouseUp,{ passive: false })
+
+ function handleChange (e) {
+ e && e.preventDefault()
+ flag = true
+
+ let moveX = _.getPageX(e) - preX
+ let moveY = _.getPageY(e) - preY
+
+ preX = _.getPageX(e)
+ preY = _.getPageY(e)
+
+ // Handling the situation when different dragging points are selected
+ let styleInfo = _[pointer](itemInfo, moveX, moveY)//调用对应的方法
+ // Boundary value processing
+ itemInfo = _.dealEdgeValue(itemInfo, styleInfo, container, vnode.context.$parent.zones, currentIndex)
+
+ Object.assign(zone.style, {
+ top: `${itemInfo.top}px`,
+ left: `${itemInfo.left}px`,
+ width: `${itemInfo.width}px`,
+ height: `${itemInfo.height}px`
+ })
+ }
+
+ function handleMouseUp () {
+ if (flag) {
+ flag = false
+ let perInfo = {
+ topPer: _.decimalPoint(itemInfo.top / container.height),
+ leftPer: _.decimalPoint(itemInfo.left / container.width),
+ widthPer: _.decimalPoint(itemInfo.width / container.width),
+ heightPer: _.decimalPoint(itemInfo.height / container.height)
+ }
+ vnode.context.changeInfo(perInfo)
+
+ // 兼容数据无变更情况下导致 computed 不更新，数据仍为 px 时 resize 出现的问题
+ Object.assign(zone.style, {
+ top: `${itemInfo.top}px`,
+ left: `${itemInfo.left}px`,
+ width: `${itemInfo.width}px`,
+ height: `${itemInfo.height}px`
+ })
+ }
+ // Show the info
+ vnode.context.handlehideZone(false)
+
+ window.removeEventListener('mousemove', handleChange)
+ window.removeEventListener('mouseup', handleMouseUp)
+ }
+ }
+
+ el.$destroy = () => el.removeEventListener('mousedown', handleMouseDown)
+ },
+ unbind: function (el) {
+ el.$destroy()
+ }
+}
diff --git a/seller/src/views/shop/hotzone/directives/dragItem.js b/seller/src/views/shop/hotzone/directives/dragItem.js
new file mode 100644
index 00000000..5557d7a5
--- /dev/null
+++ b/seller/src/views/shop/hotzone/directives/dragItem.js
@@ -0,0 +1,108 @@
+import _ from '../utils'
+
+export default {
+ bind: function (el, binding, vnode) {
+ el.addEventListener('mousedown', handleMouseDown)
+ let collision
+ function handleMouseDown (e) {
+ e && e.stopPropagation()
+ let container = _.getOffset(el.parentNode)
+ let preX = _.getPageX(e)
+ let preY = _.getPageY(e)
+ let topPer
+ let leftPer
+ let flag
+
+ window.addEventListener('mousemove', handleChange,{ passive: false })
+ window.addEventListener('mouseup', handleMouseUp,{ passive: false })
+
+ function handleChange (e) {
+ e && e.preventDefault()
+ flag = true
+ collision = false
+ // Hide the info displayed by hover
+ vnode.context.handlehideZone(true)
+
+ let setting = vnode.context.setting
+ let currentIndex = vnode.context.index
+ let moveX = _.getPageX(e) - preX
+ let moveY = _.getPageY(e) - preY
+
+ setting.topPer = setting.topPer || 0
+ setting.leftPer = setting.leftPer || 0
+ topPer = _.decimalPoint(moveY / container.height + setting.topPer)
+ leftPer = _.decimalPoint(moveX / container.width + setting.leftPer)
+
+ // Hotzone moving boundary processing
+ if (topPer < 0) {
+ topPer = 0
+ moveY = -container.height * setting.topPer
+ }
+
+ if (leftPer < 0) {
+ leftPer = 0
+ moveX = -container.width * setting.leftPer
+ }
+
+ if (topPer + setting.heightPer > 1) {
+ topPer = 1 - setting.heightPer
+ moveY = container.height * (topPer - setting.topPer)
+ }
+
+ if (leftPer + setting.widthPer > 1) {
+ leftPer = 1 - setting.widthPer
+ moveX = container.width * (leftPer - setting.leftPer)
+ }
+ // 拖拽碰撞检测
+ if (vnode.context.$parent.zones.length > 1) {
+ let currentzones = JSON.parse(JSON.stringify(vnode.context.$parent.zones)).map((zone) => {
+ return {
+ left: (zone.leftPer || 0) * container.width,
+ top: (zone.topPer || 0) * container.height,
+ width: (zone.widthPer || 0) * container.width,
+ height: (zone.heightPer || 0) * container.height
+ }
+ })
+ // 矫正
+ let changeSetting = {}
+ changeSetting.left = setting.leftPer * container.width + moveX
+ changeSetting.top = setting.topPer * container.height + moveY
+ changeSetting.width = setting.widthPer * container.width
+ changeSetting.height = setting.heightPer * container.height
+ // 碰撞检测
+ for (let i = 0, len = currentzones.length; i < len; i++) {
+ if (currentIndex !== i && _.handleEgdeCollisions(currentzones[i], changeSetting)) {
+ collision = true
+ break
+ }
+ }
+ }
+ el.style.transform = `translate(${moveX}px, ${moveY}px)`
+ }
+
+ function handleMouseUp () {
+ if (flag) {
+ flag = false
+ el.style.transform = 'translate(0, 0)'
+ if (!collision) {
+ vnode.context.changeInfo({
+ topPer,
+ leftPer
+ })
+ }
+ }
+
+ // Show the info
+ vnode.context.handlehideZone(false)
+
+ window.removeEventListener('mousemove', handleChange)
+ window.removeEventListener('mouseup', handleMouseUp)
+ }
+ }
+
+ el.$destroy = () => el.removeEventListener('mousedown', handleMouseDown)
+ },
+ unbind: function (el) {
+ el.$destroy()
+ }
+}
diff --git a/seller/src/views/shop/hotzone/index.js b/seller/src/views/shop/hotzone/index.js
new file mode 100644
index 00000000..c818a357
--- /dev/null
+++ b/seller/src/views/shop/hotzone/index.js
@@ -0,0 +1,7 @@
+import hotzone from './index.vue'
+
+hotzone.install = (Vue) => {
+ Vue.component(hotzone.name, hotzone)
+}
+
+export default hotzone
diff --git a/seller/src/views/shop/hotzone/index.vue b/seller/src/views/shop/hotzone/index.vue
new file mode 100644
index 00000000..90d75467
--- /dev/null
+++ b/seller/src/views/shop/hotzone/index.vue
@@ -0,0 +1,69 @@
+
+
基本信息
优惠设置
+
+
+
-
-
-
@@ -120,7 +64,7 @@ import {
} from "@/api/promotion.js";
export default {
name: "full-cut",
- data() {
+ data () {
return {
total: 0,
selectDate: [],
@@ -198,31 +142,31 @@ export default {
},
methods: {
// 改变页码
- newAct() {
+ newAct () {
this.$router.push({ name: "full-discount-detail" });
},
// 初始化数据
- init() {
+ init () {
this.getDataList();
},
// 改变页数
- changePage(v) {
+ changePage (v) {
this.searchForm.pageNumber = v;
this.getDataList();
},
// 改变页码
- changePageSize(v) {
+ changePageSize (v) {
this.searchForm.pageSize = v;
this.getDataList();
},
// 搜索
- handleSearch() {
+ handleSearch () {
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10;
this.getDataList();
},
// 重置
- handleReset() {
+ handleReset () {
this.selectDate = "";
this.searchForm = {};
this.searchForm.pageNumber = 1;
@@ -230,11 +174,11 @@ export default {
this.getDataList();
},
// 编辑
- edit(row) {
+ edit (row) {
this.$router.push({ name: "full-discount-detail", query: { id: row.id } });
},
// 删除
- del(row) {
+ del (row) {
this.$Modal.confirm({
title: "提示",
// 记得确认修改此处
@@ -253,7 +197,7 @@ export default {
});
},
// 开启或关闭活动
- openOrClose(row) {
+ openOrClose (row) {
let name = "开启";
let status = "START";
if (row.promotionStatus === "START") {
@@ -325,7 +269,7 @@ export default {
}
},
// 获取列表数据
- getDataList() {
+ getDataList () {
this.loading = true;
if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
this.searchForm.startTime = this.selectDate[0].getTime();
@@ -343,17 +287,19 @@ export default {
});
},
},
- mounted() {
+ mounted () {
this.init();
},
// 页面缓存处理，从该页面离开时，修改KeepAlive为false，保证进入该页面是刷新
- beforeRouteLeave(to, from, next) {
+ beforeRouteLeave (to, from, next) {
from.meta.keepAlive = false;
next();
},
};
diff --git a/seller/src/views/shop/hotzone/assets/styles/icons8-edit-64.png b/seller/src/views/shop/hotzone/assets/styles/icons8-edit-64.png
new file mode 100644
index 00000000..72d50088
Binary files /dev/null and b/seller/src/views/shop/hotzone/assets/styles/icons8-edit-64.png differ
diff --git a/seller/src/views/shop/hotzone/assets/styles/main.css b/seller/src/views/shop/hotzone/assets/styles/main.css
new file mode 100644
index 00000000..da6a3052
--- /dev/null
+++ b/seller/src/views/shop/hotzone/assets/styles/main.css
@@ -0,0 +1,657 @@
+.hz-m-wrap {
+ position: relative;
+ /*overflow: hidden;*/
+}
+
+.hz-m-wrap .hz-u-img {
+ display: block;
+ width: 100%;
+ max-width: 100%;
+ height: auto;
+ /* max-height: 100%; */
+ user-select: none;
+}
+
+.hz-m-wrap .hz-m-area {
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ cursor: crosshair;
+}
+
+.hz-m-wrap .hz-m-item {
+ position: absolute;
+ display: block;
+}
+
+.hz-m-wrap .hz-m-box {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ box-shadow: 0 0 6px #000;
+ background-color: #e31414;
+ font-size: 12px;
+ cursor: pointer;
+ color: #fff;
+ opacity: 0.8;
+}
+.hz-m-box{
+ overflow: hidden;
+}
+
+.hz-m-wrap .hz-m-box>li {
+ position: absolute;
+ text-align: center;
+ user-select: none;
+}
+
+.hz-m-wrap .hz-m-box.hz-z-hidden>li {
+ display: none;
+}
+
+.hz-m-wrap .hz-m-box.hz-m-hoverbox:hover {
+ box-shadow: 0 0 0 2px #373950;
+}
+
+.hz-m-wrap .hz-m-box.hz-m-hoverbox .hz-icon:hover {
+ background-color: #373950;
+}
+
+.hz-m-wrap .hz-m-box .hz-icon {
+ width: 24px;
+ height: 24px;
+ line-height: 24px;
+ font-size: 20px;
+ text-align: center;
+}
+
+.hz-m-wrap .hz-m-box .hz-icon:hover {
+ background-color: #e31414;
+ opacity: 0.8;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-index {
+ top: 0;
+ left: 0;
+ width: 24px;
+ height: 24px;
+ line-height: 24px;
+ background-color: #000;
+ z-index: 100;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-close {
+ top: 0;
+ right: 0;
+ z-index: 10;
+}
+
+.hz-m-wrap .hz-m-box .hz-m-copy {
+ display: inline-block;
+}
+
+.hz-m-wrap .hz-m-box .hz-small-icon {
+ border: 0;
+ border-radius: 0;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-square {
+ width: 8px;
+ height: 8px;
+ opacity: 0.8;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-square:after {
+ content: '';
+ position: absolute;
+ top: 2px;
+ left: 2px;
+ width: 4px;
+ height: 4px;
+ border-radius: 4px;
+ background-color: #fff;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-square-tl {
+ top: -4px;
+ left: -4px;
+ cursor: nw-resize;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-square-tc {
+ top: -4px;
+ left: 50%;
+ transform: translateX(-50%);
+ cursor: n-resize;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-square-tr {
+ top: -4px;
+ right: -4px;
+ cursor: ne-resize;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-square-cl {
+ top: 50%;
+ left: -4px;
+ transform: translateY(-50%);
+ cursor: w-resize;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-square-cr {
+ top: 50%;
+ right: -4px;
+ transform: translateY(-50%);
+ cursor: w-resize;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-square-bl {
+ bottom: -4px;
+ left: -4px;
+ cursor: sw-resize;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-square-bc {
+ bottom: -4px;
+ left: 50%;
+ transform: translateX(-50%);
+ cursor: s-resize;
+}
+
+.hz-m-wrap .hz-m-box .hz-u-square-br {
+ bottom: -4px;
+ right: -4px;
+ cursor: se-resize;
+}
+
+/* reset */
+.hz-m-modal,
+.hz-m-wrap {
+ font-size: 12px;
+ /* 清除内外边距 */
+ /* 重置列表元素 */
+ /* 重置文本格式元素 */
+ /* 初始化 input */
+}
+
+.hz-m-modal ul,
+.hz-m-wrap ul,
+.hz-m-modal ol,
+.hz-m-wrap ol,
+.hz-m-modal li,
+.hz-m-wrap li {
+ margin: 0;
+ padding: 0;
+}
+
+.hz-m-modal ul,
+.hz-m-wrap ul,
+.hz-m-modal ol,
+.hz-m-wrap ol {
+ list-style: none;
+}
+
+.hz-m-modal a,
+.hz-m-wrap a {
+ text-decoration: none;
+}
+
+.hz-m-modal a:hover,
+.hz-m-wrap a:hover {
+ text-decoration: underline;
+}
+
+.hz-m-modal p,
+.hz-m-wrap p {
+ -webkit-margin-before: 0;
+ -webkit-margin-after: 0;
+}
+
+.hz-m-modal input[type="checkbox"],
+.hz-m-wrap input[type="checkbox"] {
+ cursor: pointer;
+}
+
+/* basic */
+/* modal 样式 */
+.hz-m-modal {
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ z-index: 1000;
+ overflow-y: auto;
+ -webkit-overflow-scrolling: touch;
+ touch-action: cross-slide-y pinch-zoom double-tap-zoom;
+ text-align: center;
+ overflow: hidden;
+}
+
+.hz-m-modal:before {
+ content: "";
+ display: inline-block;
+ vertical-align: middle;
+ height: 100%;
+}
+
+.hz-m-modal .hz-modal_dialog {
+ display: inline-block;
+ vertical-align: middle;
+ text-align: left;
+ border-radius: 3px;
+}
+
+.hz-m-modal .hz-modal_title {
+ margin: 0;
+}
+
+.hz-m-modal .hz-modal_close {
+ float: right;
+ margin: -6px -4px 0 0;
+}
+
+@media (max-width: 767px) {
+ .hz-m-modal .hz-modal_dialog {
+ width: auto;
+ }
+}
+
+html.z-modal,
+html.z-modal body {
+ overflow: hidden;
+}
+
+.hz-m-modal {
+ background: rgba(0, 0, 0, 0.6);
+}
+
+.hz-m-modal .hz-modal_dialog {
+ width: 450px;
+ background: #fff;
+ -webkit-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
+ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
+}
+
+.hz-m-modal .hz-modal_hd {
+ padding: 15px;
+ border-bottom: 1px solid #f4f4f4;
+}
+
+.hz-m-modal .hz-modal_title {
+ font-size: 18px;
+}
+
+.hz-m-modal .hz-modal_close {
+ margin: -15px -15px 0 0;
+ padding: 6px;
+ color: #bbb;
+ cursor: pointer;
+}
+
+.hz-m-modal .hz-modal_close:hover {
+ color: #888;
+}
+
+.hz-m-modal .hz-modal_close .hz-u-icon-close {
+ font-size: 18px;
+ transition: transform 500ms ease-in-out;
+ transform: rotate(0deg);
+ width: 18px;
+ text-align: center;
+}
+
+.hz-m-modal .hz-modal_close:hover .hz-u-icon-close {
+ transform: rotate(270deg);
+}
+
+.hz-m-modal .hz-modal_bd {
+ padding: 15px 15px 0 15px;
+ min-height: 10px;
+}
+
+.hz-m-modal .hz-modal_ft {
+ padding: 15px;
+ text-align: center;
+ border-top: 1px solid #f4f4f4;
+}
+
+.hz-m-modal .hz-modal_ft .hz-u-btn {
+ margin: 0 10px;
+}
+
+@media (max-width: 767px) {
+ .hz-m-modal .hz-modal_dialog {
+ margin: 10px;
+ }
+}
+
+/* 基本按钮样式 btn */
+.hz-u-btn {
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ -webkit-appearance: none;
+ border: none;
+ overflow: visible;
+ font: inherit;
+ text-transform: none;
+ text-decoration: none;
+ cursor: pointer;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ background: none;
+ display: inline-block;
+ vertical-align: middle;
+ text-align: center;
+ font-size: 12px;
+}
+
+.hz-u-btn:hover,
+.hz-u-btn:focus {
+ outline: none;
+ text-decoration: none;
+}
+
+.hz-u-btn:disabled {
+ cursor: not-allowed;
+}
+
+.hz-u-btn-block {
+ display: block;
+ width: 100%;
+}
+
+.hz-u-btn {
+ padding: 0 16px;
+ height: 28px;
+ line-height: 26px;
+ background: #f4f4f4;
+ color: #444;
+ border: 1px solid #ddd;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
+
+.hz-u-btn:hover,
+.hz-u-btn:focus {
+ background: #e5e5e5;
+ border: 1px solid #adadad;
+}
+
+.hz-u-btn:active {
+ background: #e5e5e5;
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+
+.hz-u-btn:disabled {
+ background: #fff;
+ border: 1px solid #ccc;
+ filter: alpha(opacity=65);
+ opacity: 0.65;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+/* 按钮类型 */
+.hz-u-btn-primary {
+ background: #67739b;
+ color: #fff;
+ border: 1px solid #67739b;
+}
+
+.hz-u-btn-primary:hover,
+.hz-u-btn-primary:focus {
+ background: #31384b;
+ color: #fff;
+ border: 1px solid #31384b;
+}
+
+.hz-u-btn-primary:active {
+ background: #367fa9;
+ color: #fff;
+ border: 1px solid #367fa9;
+}
+
+.hz-u-btn-primary:disabled {
+ background: #444;
+ color: #fff;
+ border: 1px solid #444;
+}
+
+/* input */
+.hz-u-input {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ border-radius: 0;
+ font: inherit;
+ color: inherit;
+ vertical-align: middle;
+}
+
+.hz-u-input {
+ position: relative;
+ z-index: 0;
+ padding: 5px 6px;
+ border: 1px solid #d2d6de;
+ color: #555;
+ background: #fff;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
+
+.hz-u-input::-webkit-input-placeholder {
+ color: #bbb;
+ filter: alpha(opacity=100);
+ opacity: 1;
+}
+
+.hz-u-input::-moz-placeholder {
+ color: #bbb;
+ filter: alpha(opacity=100);
+ opacity: 1;
+}
+
+.hz-u-input:-moz-placeholder {
+ color: #bbb;
+ filter: alpha(opacity=100);
+ opacity: 1;
+}
+
+.hz-u-input:-ms-placeholder {
+ color: #bbb;
+ filter: alpha(opacity=100);
+ opacity: 1;
+}
+
+.hz-u-input:focus {
+ outline: 0;
+ background: #fff;
+ color: #555;
+ border: 1px solid #3c8dbc;
+}
+
+.hz-u-input:disabled {
+ cursor: not-allowed;
+ background: #eee;
+ color: #999;
+ border: 1px solid #d2d6de;
+}
+
+.hz-u-input {
+ width: 280px;
+ height: 34px;
+}
+
+.hz-u-input.hz-u-input-success {
+ color: #00a65a;
+ border-color: #00a65a;
+}
+
+.hz-u-input.hz-u-input-warning {
+ color: #f39c12;
+ border-color: #f39c12;
+}
+
+.hz-u-input.hz-u-input-error {
+ color: #dd4b39;
+ border-color: #dd4b39;
+}
+
+.hz-u-input.hz-u-input-blank {
+ border-color: transparent;
+ border-style: dashed;
+ background: none;
+}
+
+.hz-u-input.hz-u-input-blank:focus {
+ border-color: #ddd;
+}
+
+/* formItem */
+.hz-u-formitem {
+ display: inline-block;
+ *zoom: 1;
+ margin-bottom: 1em;
+}
+
+.hz-u-formitem:before,
+.hz-u-formitem:after {
+ display: table;
+ content: "";
+ line-height: 0;
+}
+
+.hz-u-formitem:after {
+ clear: both;
+}
+
+.hz-u-formitem .hz-formitem_tt {
+ display: block;
+ float: left;
+ text-align: right;
+}
+
+.hz-u-formitem .hz-formitem_ct {
+ display: block;
+}
+
+.hz-u-formitem .hz-formitem_rqr {
+ line-height: 28px;
+ color: #dd4b39;
+}
+
+.hz-u-formitem .hz-formitem_tt {
+ line-height: 34px;
+ width: 100px;
+}
+
+.hz-u-formitem .hz-formitem_ct {
+ line-height: 34px;
+ margin-left: 108px;
+}
+
+/* icon */
+.hz-u-icon {
+ display: inline-block;
+ font: normal normal normal 14px/1 FontAwesome;
+ font-size: inherit;
+ text-rendering: auto;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+/* label */
+.hz-u-label {
+ display: inline-block;
+ cursor: pointer;
+}
+
+/* margin */
+.hz-f-ml0 {
+ margin-bottom: 0;
+}
+
+/* replicator */
+.hz-u-copy input[data-for-copy] {
+ transform: translateZ(0);
+ position: fixed;
+ bottom: 0;
+ right: 0;
+ width: 1px;
+ height: 1px;
+ opacity: 0;
+ overflow: hidden;
+ z-index: -999;
+ color: transparent;
+ background-color: transparent;
+ border: none;
+ outline: none;
+}
+
+@font-face {
+ font-family: 'iconfont';
+ /* project id 525460 */
+ src: url('//at.alicdn.com/t/font_525460_d0ysfwzacahsemi.eot');
+ src: url('//at.alicdn.com/t/font_525460_d0ysfwzacahsemi.eot?#iefix') format('embedded-opentype'), url('//at.alicdn.com/t/font_525460_d0ysfwzacahsemi.woff') format('woff'), url('//at.alicdn.com/t/font_525460_d0ysfwzacahsemi.ttf') format('truetype'), url('//at.alicdn.com/t/font_525460_d0ysfwzacahsemi.svg#iconfont') format('svg');
+}
+
+.hz-icon {
+ font-family: "iconfont" !important;
+ font-size: 20px;
+ font-style: normal;
+ text-align: center;
+ user-select: none;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.hz-icon-edit {
+ position: absolute;
+ top: -4px;
+ left: 50%;
+ transform: translateX(-50%);
+}
+
+.hz-flex-img {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.hz-flex-img img {
+ width: 100%;
+ height: 100%;
+}
+
+.hz-icon-trash:before {
+ content: "\e605";
+}
+
+.hz-edit-img {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+
+}
+
+.hz-edit-img img {
+ max-width: 300px;
+ max-height: 200px;
+ margin-bottom: 10px;
+}
+
+.hz-edit-del {
+ width: 100%;
+ display: flex;
+ justify-content: flex-end;
+}
\ No newline at end of file
diff --git a/seller/src/views/shop/hotzone/components/Hotzone.vue b/seller/src/views/shop/hotzone/components/Hotzone.vue
new file mode 100644
index 00000000..6df13e4c
--- /dev/null
+++ b/seller/src/views/shop/hotzone/components/Hotzone.vue
@@ -0,0 +1,293 @@
+
+
-
+
-
-
+
-
+
+
+
+
+
+
diff --git a/seller/src/views/shop/hotzone/components/Zone.vue b/seller/src/views/shop/hotzone/components/Zone.vue
new file mode 100644
index 00000000..d9d2df9e
--- /dev/null
+++ b/seller/src/views/shop/hotzone/components/Zone.vue
@@ -0,0 +1,244 @@
+
+
+
+
+ ![]()
+
+ -
+
+
+
+
+
+
+
+
+
+ {{ index + 1 }}
+
+
+
+ {{ showZoneText(zone) }}
+
+
+
+ 修改
+
+ 删除
+
+
+
选择模式
+
+
+
+ 链接
+ 热区
+
+
+ 选择链接
-
+
+
已选链接：
- {{
+
+
+ {{ item.url.name }}
- {{ item.url.goodsName }}
+
+ {{ item.url.goodsName }}
- {{ item.url.name }}
+
+ {{ item.url.name }}
- {{ item.url.memberName }}
+
+ {{ item.url.memberName }}
- {{ item.url.title }}
+
+ {{ item.url.title }}
+
+
+ {{ item.url.name }}
+
秒杀
- 满减
+
+ 满减
+
拼团
{{ item.url.title || item.url.goodsName }}
- {{ item.url.title }}
+
+ {{ item.url.title }}
-
+ {{ item.model === "hotzone" ? "绘制热区" : "选择链接" }}