-
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/index.js b/manager/src/views/lili-floor-renovation/wap/index.js
index c7aa1a99..37aa9768 100644
--- a/manager/src/views/lili-floor-renovation/wap/index.js
+++ b/manager/src/views/lili-floor-renovation/wap/index.js
@@ -1,5 +1,5 @@
import index from './index.vue' //首页
-import btn from './btn.vue' //按钮
+
import advertising from './advertising.vue' //全屏活动
import alertAdvertising from './alertAdvertising.vue' //弹窗活动
@@ -7,7 +7,7 @@ import alertAdvertising from './alertAdvertising.vue' //弹窗活动
const templates = {
index,
- btn,
+
advertising,
alertAdvertising
}
diff --git a/manager/src/views/lili-floor-renovation/wap/navbar.vue b/manager/src/views/lili-floor-renovation/wap/navbar.vue
index a777e892..20be9547 100644
--- a/manager/src/views/lili-floor-renovation/wap/navbar.vue
+++ b/manager/src/views/lili-floor-renovation/wap/navbar.vue
@@ -67,11 +67,7 @@ export default {
name: "index",
selected: true,
},
- {
- title: "悬浮按钮",
- name: "btn",
- selected: false,
- },
+
{
title: "全屏广告",
name: "advertising",
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 73d13435..fec0be21 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -21,11 +21,11 @@
-
+
-
+
@@ -137,12 +137,14 @@ export default {
loading: true, // 表单加载状态
addFlag: false, // modal显隐控制
updateRegion: false, // 地区
- addMemberForm: { // 添加用户表单
+ addMemberForm: {
+ // 添加用户表单
mobile: "",
username: "",
password: "",
},
- searchForm: { // 请求参数
+ searchForm: {
+ // 请求参数
pageNumber: 1,
pageSize: 10,
order: "desc",
@@ -152,7 +154,8 @@ export default {
},
picModelFlag: false, // 选择图片
formValidate: {}, // 表单数据
- addRule: { // 验证规则
+ addRule: {
+ // 验证规则
mobile: [
{ required: true, message: "请输入手机号码" },
{
@@ -229,6 +232,7 @@ export default {
{
props: {
size: "small",
+ type: params.row.___selected ? "primary" : "",
},
style: {
marginRight: "5px",
@@ -236,11 +240,11 @@ export default {
},
on: {
click: () => {
- this.callback(params.row);
+ this.callback(params.row, params.index);
},
},
},
- "选择"
+ params.row.___selected ? "已选择" : "选择"
),
h(
@@ -251,7 +255,8 @@ export default {
size: "small",
},
style: {
- marginRight: "5px", display: this.selectedMember ? "none" : "block",
+ marginRight: "5px",
+ display: this.selectedMember ? "none" : "block",
},
on: {
click: () => {
@@ -270,7 +275,8 @@ export default {
ghost: true,
},
style: {
- marginRight: "5px", display: this.selectedMember ? "none" : "block",
+ marginRight: "5px",
+ display: this.selectedMember ? "none" : "block",
},
on: {
click: () => {
@@ -308,9 +314,17 @@ export default {
total: 0, // 表单数据总数
};
},
+ props: {
+ // 是否为选中模式
+ selectedMember: {
+ type: Boolean,
+ default: false,
+ },
+ },
methods: {
// 回调给父级
- callback(val) {
+ callback(val, index) {
+ val.___selected = !val.___selected;
this.$emit("callback", val);
},
init() {
@@ -378,6 +392,9 @@ export default {
API_Member.getMemberListData(this.searchForm).then((res) => {
if (res.result.records) {
this.loading = false;
+ res.result.records.forEach((item) => {
+ item.___selected = false;
+ });
this.data = res.result.records;
this.total = res.result.total;
}
@@ -476,7 +493,7 @@ export default {
/deep/ .ivu-table-wrapper {
width: 100%;
}
-/deep/ .ivu-card{
+/deep/ .ivu-card {
width: 100%;
}
.face {
diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue
index 5ea885b3..c10a40a7 100644
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -4,21 +4,10 @@
-
+
+
-
-
-
-
+
+
+
+
+
-
+
@@ -94,7 +47,6 @@
+
+
+
diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue
index c22f8af0..3b2531ab 100644
--- a/manager/src/views/promotion/seckill/seckill.vue
+++ b/manager/src/views/promotion/seckill/seckill.vue
@@ -2,29 +2,12 @@
-
+
+
+
+
+
-
-
-
+
-
+
-
-
-
-
-
-
-
-
+ " class="mr_5" @click="off(row)">下架
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
diff --git a/manager/src/views/promotion/seckill/setupSeckill.vue b/manager/src/views/promotion/seckill/setupSeckill.vue
new file mode 100644
index 00000000..9ad7c77b
--- /dev/null
+++ b/manager/src/views/promotion/seckill/setupSeckill.vue
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue
index 05295e05..ccafc805 100644
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -224,7 +224,6 @@ import memberLayout from "@/views/member/list/index";
import ossManage from "@/views/sys/oss-manage/ossManage";
import { getCategoryTree } from "@/api/goods";
import { shopDetail, shopAdd, shopEdit, getShopByMemberId } from "@/api/shops";
-import * as filters from "@/utils/filters";
import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
import region from "@/views/lili-components/region";
import liliMap from "@/views/my-components/map/index";
diff --git a/manager/src/views/sys/message/sms.vue b/manager/src/views/sys/message/sms.vue
index b863d8ee..3583b5f5 100644
--- a/manager/src/views/sys/message/sms.vue
+++ b/manager/src/views/sys/message/sms.vue
@@ -116,7 +116,7 @@
@@ -181,7 +181,7 @@ export default {
this.liveGoodsData.forEach((item, index) => {
val.forEach((callback) => {
if (item.id == callback.id) {
- this.$set(this.liveGoodsData[index], "__selected", true);
+ this.$set(this.liveGoodsData[index], "___selected", true);
// this.selectedGoods.push(item);
}
});
@@ -208,15 +208,15 @@ export default {
* 回调参数补充
*/
selectedLiveGoods(val, index) {
- if (!val.__selected) {
- val.__selected = true;
- this.$set(this.liveGoodsData[index], "__selected", true);
+ if (!val.___selected) {
+ val.___selected = true;
+ this.$set(this.liveGoodsData[index], "___selected", true);
this.selectedGoods.push(this.liveGoodsData[index]);
} else {
this.$nextTick(() => {
- val.__selected = false;
+ val.___selected = false;
- this.$set(this.liveGoodsData[index], "__selected", true);
+ this.$set(this.liveGoodsData[index], "___selected", true);
this.selectedGoods.splice(index, 1);
});
}
diff --git a/seller/src/views/statistics/traffic.vue b/seller/src/views/statistics/traffic.vue
index 236e381e..131f30f0 100644
--- a/seller/src/views/statistics/traffic.vue
+++ b/seller/src/views/statistics/traffic.vue
@@ -64,8 +64,8 @@ export default {
return {
// 时间
- uvs: "", // 访客数
- pvs: "", // 浏览量
+ uvs: 0, // 访客数
+ pvs: 0, // 浏览量
dateList: [
// 日期选择列表
@@ -198,8 +198,8 @@ export default {
if (res.result) {
this.data = res.result;
res.result.forEach((item) => {
- this.uvs += item.uvNum;
- this.pvs += item.pvNum;
+ this.uvs += parseInt(item.uvNum);
+ this.pvs += parseInt(item.pvNum);
});
if (!this.orderChart) {