diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 56071f4eb..d876169fe 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -407,14 +407,34 @@
第二步: 选择用户数据上传并导入会员
点击上传
只能上传xls/xlsx文件，单次最大5000行会员数据且不超过1M 超出请分文件处理
 + + + + + +
+ 会员总数：{{result.total}} 人 +
+
+ 成功人数：{{result.success}} 人 +
+
+ 失败人数：{{result.error}} 人 + 手机号不可为空 +
+
+ 重复人数：{{result.repeat}} 人
@@ -441,6 +461,9 @@ export default { dicts: ['official','zhzt'], data() { return { + result:{}, + // 是否自动上传 + isUpload:false, headers: { 'Access-Token': getToken(), }, @@ -462,6 +485,8 @@ export default { yesterdayAddNum:'', // 遮罩层 loading: true, + uploading: false, + uploadingFile: 0, // 标题 title: "", // 选中数组 @@ -485,6 +510,7 @@ export default { open: false, openUser: false, openUpload: false, + openResult: false, // 当前操作用户 userId: '', // 是否弹层充值 @@ -627,7 +653,9 @@ export default { }, // 导入会员信息 importUser(){ - + this.openResult = true; + this.title = "会员创建结果"; + this.getList(); }, // 积分变更操作 handlePoint(userId) { @@ -721,8 +749,16 @@ export default { }).catch(() => {}); }, handleChange(file, fileList) { - this.fileList = fileList.slice(-3); - } + this.uploading = true; + if(file.status === 'success'){ + this.uploading = false; + this.openUpload = false; + this.openUser = false; + this.importUser(); + this.fileList.splice(0,1) + this.result = file.response.data + } + }, } }; @@ -739,9 +775,14 @@ export default { background: #f6f8f9; padding-top: 30px; } - .el-upload, .el-upload--text { - width: 150px; - height: 60px !important; - line-height: 60px !important; + .huiyuan{ + height: 30px; + line-height: 30px; + font-size: 16px; + } + .num{ + font-weight: bold; + color: red; + font-size: 18px; } diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index 7a5cff03a..a968b84b7 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -17,8 +17,8 @@ - 绑定实体卡
- 会员充值 + 绑定实体卡
+ 会员充值
@@ -39,7 +39,7 @@ 副卡管理 - {{ grade.name }} + {{ grade.name }} @@ -293,8 +293,249 @@ + + + + - + + +
付款金额
+
+ ￥300.00 + + 汽油 + +
+
赠送金额
+
+ + + + + +
+
+
+ +
+
+ +
+ 取消收款 + 确定收款 +
+ + + @@ -360,81 +601,20 @@
- - + + +
+ + +
+

{{form.name}}

+

{{form.mobile}}

+

请绑定实体卡号

- - -
-
- - -
-
-
{{form.name}}
- {{form.mobile}} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 增加 - 减少 - - - - - - - - - - - - - - +
+ +

实体卡号最低5位且不可重复、绑定后不可删除、如需更换卡号请在会员详情页面内进行卡片重新绑定

+
确 定 @@ -562,15 +742,7 @@ - - - - - - - - - + { @@ -717,27 +935,30 @@ export default { this.store = response.data; }); }, + // 获取会员等级详情 getGrade(id){ getUserGrade(id).then(response => { this.grade = response.data; }); }, + // 选择充值金额 + recharge(index){ + this.activeKey = index; + }, // 提交按钮 submitForm: function() { this.$refs["form"].validate(valid => { if (valid) { + console.log(this.form) if (this.form.id) { updateUser(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.openMobile = false; + this.openConfig = false; + this.openLevel = false; + this.openBindIdCard = false; this.getUserInfo(); }); - } else { - // addUser(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); } } }); @@ -750,9 +971,13 @@ export default { // 取消按钮 cancel() { this.openMobile = false; - this.openUserGrade = false; this.openConfig = false; this.openLevel = false; + this.openBindIdCard = false; + this.openRecharge = false; + }, + cancelCollection(){ + this.openConfirm = false; }, handleClick(tab, event) { console.log(tab, event); @@ -764,6 +989,7 @@ export default { goBack() { this.$router.back(-1); } + // 积分表、储值卡详情表、积分详情表、储值卡表、储值卡模板表、用户储值卡关联表、 } } @@ -790,4 +1016,78 @@ export default { margin-top: 10px; padding-top: 30px; } + .idcard{ + text-align: center; + font-weight: bold + } + .mon{ + width: 20%; + height: 50px; + border: 0.5px #dadfe6 solid; + line-height: 25px; + border-radius: 5px; + text-align: center; + margin: 0 10px; + } + .select { + position: relative; + background-color: #fff; + box-shadow: 0px 2px 7px 0px rgba(85, 110, 97, 0.35); + border-radius: 5px; + border: 1px solid #00aaff; + } + + .select:before { + content: ''; + position: absolute; + right: 0; + bottom: 0; + border: 10px solid #00aaff; + border-top-color: transparent; + border-left-color: transparent; + } + + .select:after { + content: ''; + width: 4px; + height: 6px; + position: absolute; + right: 4px; + bottom: 3px; + border: 2px solid #fff; + border-top-color: transparent; + border-left-color: transparent; + transform: rotate(45deg); + } + .amount{ + color: #00afff; + } + .amount1{ + color: #00afff; + font-size: 20px; + } + .top1{ + font-size: 16px; + } + .jine{ + width: 24%; + display: flex; + } + .bom{ + font-size: 12px; + color: grey; + } + .zeng{ + width: 95%; + line-height: 40px; + } + .mon2{ + width: 20%; + height: 75px; + border: 0.5px #dadfe6 solid; + line-height: 25px; + border-radius: 5px; + text-align: center; + margin: 0 10px; + } diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue index aa80b264f..26f3cfbbe 100644 --- a/fuintAdmin/src/views/userGrade/index.vue +++ b/fuintAdmin/src/views/userGrade/index.vue @@ -157,7 +157,7 @@ - +