Commit c62fe9aa by 董有沛

Merge remote-tracking branch 'origin/master'

parents 5787a6d6 8a36b74f
...@@ -31,6 +31,16 @@ const local = { ...@@ -31,6 +31,16 @@ const local = {
//默认所有请求都加了api前缀,需要去掉 //默认所有请求都加了api前缀,需要去掉
'^/api/report': '/' '^/api/report': '/'
} }
},
'/api/app': {
target: 'http://localhost:11092',
//target: 'http://132.97.54.60:58334',
ws: false,
changeOrigin: true,
pathRewrite: {
//默认所有请求都加了api前缀,需要去掉
'^/api/app': '/'
}
} }
} }
} }
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"reqwest": "^2.0.5", "reqwest": "^2.0.5",
"tinymce": "^5.1.1", "tinymce": "^5.1.1",
"vant": "^2.5.2",
"viser-vue": "^2.4.7", "viser-vue": "^2.4.7",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-apexcharts": "^1.5.1", "vue-apexcharts": "^1.5.1",
......
/**
* report的接口管理
*/
import {postAction,postFormAction} from '@/api/manage'
let prefix = 'app/ciop/'
let selectPackage = (params) => postAction(prefix +"packageUpgrade/selectPackage" , params);
let sendVerificationCode = (params) => postAction(prefix +"packageUpgrade/sendVerificationCode" , params);
export {
selectPackage,
sendVerificationCode
}
...@@ -27,19 +27,45 @@ export const asyncRouterMap = [{ ...@@ -27,19 +27,45 @@ export const asyncRouterMap = [{
} }
] ]
}, { }, {
path: '/test', path: '/404',
component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
}
, {
path: '/hhr',
component: BlankLayout, component: BlankLayout,
redirect: '/test/home', redirect: '/hhr/home',
children: [ children: [
{ {
path: 'home', path: 'home',
name: 'TestHome', name: 'TestHome',
component: () => import('@/views/Home') component: () => import('@/views/hhr-view/hhrCustomer.vue')
},
{
path: 'newPackageTips',
name: 'newPackageTips',
component: () => import('@views/hhr-view/newpackage/newPackageTips.vue')
},
{
path: 'orderNewCar',
name: 'orderNewCar',
component: () => import('@views/hhr-view/newpackage/orderNewCar.vue')
},
{
path: 'danKuan',
name: 'danKuan',
component: () => import('@views/hhr-view/bandwidth/danKuan.vue')
},
{
path: 'rongHe',
name: 'rongHe',
component: () => import('@views/hhr-view/bandwidth/rongHe.vue')
},
{
path: 'packageUpgrade',
name: 'packageUpgrade',
component: () => import('@views/hhr-view/packageUpgrade/packageUpgrade.vue')
} }
] ]
}, {
path: '/404',
component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
} }
] ]
...@@ -60,18 +86,25 @@ export const constantRouterMap = [{ ...@@ -60,18 +86,25 @@ export const constantRouterMap = [{
} }
] ]
}, { }, {
path: '/test', path: '/404',
component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
}
, {
path: '/hhr',
component: BlankLayout, component: BlankLayout,
redirect: '/test/home', redirect: '/hhr/home',
children: [ children: [
{ {
path: 'home', path: 'home',
name: 'TestHome', name: 'TestHome',
component: () => import('@/views/Home') component: () => import('@/views/hhr-view/hhrCustomer.vue')
}
,
{
path: 'newPackageTips',
name: 'newPackageTips',
component: () => import('@views/hhr-view/newpackage/newPackageTips.vue')
} }
] ]
}, {
path: '/404',
component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
} }
] ]
...@@ -3,7 +3,8 @@ import App from './App.vue' ...@@ -3,7 +3,8 @@ import App from './App.vue'
import Storage from 'vue-ls' import Storage from 'vue-ls'
import router from './router' import router from './router'
import store from './store/' import store from './store/'
import Vant from 'vant';
import 'vant/lib/index.css';
import { VueAxios } from "@/utils/request" import { VueAxios } from "@/utils/request"
import Antd from 'ant-design-vue' import Antd from 'ant-design-vue'
...@@ -42,6 +43,7 @@ import JeecgComponents from '@/components/jeecg/index' ...@@ -42,6 +43,7 @@ import JeecgComponents from '@/components/jeecg/index'
import '@/assets/less/ws.less' import '@/assets/less/ws.less'
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.use(Vant)
Vue.use(Storage, config.storageOptions) Vue.use(Storage, config.storageOptions)
Vue.use(Antd) Vue.use(Antd)
Vue.use(VueAxios, router) Vue.use(VueAxios, router)
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<template>
<div>
<img src="/picture/hhr/banner.png" style="width: 100%">
<van-button type="info" style="width: 150px; height: 50px;margin: 10px 20px 10px 20px;">30元/月</van-button>
<van-row type="flex" justify="center">
<p style="width: auto; height: 40px;margin: 10px 10px 0px 10px;">面向学校:广州工商学院(花都校区)</p>
</van-row>
<div style=" background-image: url('./picture/hhr/info_logo_bg.png');
background-repeat: no-repeat;
background-size: 50%;
width: 85%;
height: 85%;
background-position: 70% 0%,right center;
Text-align:center;">
<div style="height:60px;Text-align:center;">资费介绍</div>
</div>
</div>
</template>
<script>
export default {
name: "danKuan"
}
</script>
<style scoped>
</style>
<template>
<div style=" background-image: url('./picture/hhr/01.jpg');
background-repeat: no-repeat;
background-size: 100%;
width: 100%;
height: 150%;">
<div style="height:60px"></div>
<div style="width: auto; height: 80px; background: white;">
<van-row type="flex" justify="center">
<span style="font-size: 28px;text-align: center;color: rgb(1,12,146);width: 80%;margin: auto">绑定29元新黑牛卡校园网提速到50M</span>
</van-row>
<van-divider :style="{ color: '#1989fa', borderColor: '#1989fa', padding: '0 16px' }" />
<van-row type="flex" justify="center">
<span style="font-size: 22px;padding-top: 10px;text-align: center;color: black;width: 80%;margin: auto">请填写以下有效消息</span>
</van-row>
<van-form validate-first @submit="onSubmit" @failed="onFailed">
<van-field v-model="phone" name="phone" label="手机号" :rules="phoneRules" />
<van-field
v-model="code"
center
clearable
label="验证码"
:rules="codeRules"
placeholder="请输入短信验证码"
>
<van-button slot="button" size="small" type="primary">发送验证码</van-button>
</van-field>
<div style=" width: 15.0rem;margin: 10px 20px 10px 70px;">
<span style="color: black;font-size: 14px;"><font style="color:red">注意:</font>
以上填写的手机号和身份证号必须要和办理校园网的本人一致,否则无法绑定进行提速。
</span>
</div>
<div>
<van-grid :column-num="1">
<van-row >
<van-col span="20" offset="2"> <div style="color: black;font-size: 17px;text-align: center;">未有电信号码请按以下按钮办理</div></van-col>
<van-col span="10" offset="8"> <div style="color: black;font-size: 17px;text-align: center;"><van-sticky :offset-top="50">
<van-button type="info">申请办理手机卡</van-button>
</van-sticky></div></van-col>
</van-row>
<van-row type="flex" justify="center">
<p style="color: red;font-size: 14px">请办理完手机卡后,重新访问此网页进行绑定,申请校园网提速。</p>
</van-row>
</van-grid>
</div>
<div style="margin: 16px;">
<van-button round block type="info" native-type="submit">
提交
</van-button>
</div>
</van-form>
</div>
</div>
</template>
<script>
import { Toast } from 'vant';
export default {
name:"rongHe",
data(){
this.phoneRules = [
{ required: true, message: '请输入手机号' },
{ validator: this.phoneValidator, message: '手机号格式错误' },
];
this.codeRules = [
{ required: true, message: '请输入验证码' },
{ validator: this.codeValidator, message: '验证码错误' },
];
return{
code: '',
phone: '',
}
}
,
methods: {
// 校验函数返回 true 表示校验通过,false 表示不通过
phoneValidator(val) {
return /1\d{10}/.test(val);
},
// 校验函数返回 Promise 来实现异步校验
codeValidator(val) {
return new Promise(resolve => {
Toast.loading('验证中...');
setTimeout(() => {
Toast.clear();
resolve(/\d{6}/.test(val));
}, 1000);
});
},
onSubmit(values) {
console.log('submit', values);
},
onFailed(errorInfo) {
console.log('failed', errorInfo);
},
},
}
</script>
<style scoped>
</style>
<template>
<div style=" background-image: url('./picture/hhr/01.jpg');
background-repeat: no-repeat;
background-size: 100%;
width: 100%;
height: 150%; position:relative">
<img src="/picture/hhr/kefu.png" style="width: 10%;position:fixed ;right: 15px;top: 15px" @click="showPopup">
<div style="height:40px"></div>
<div style="background-image: url('./picture/hhr/02.png');background-repeat: no-repeat;background-position: center;background-size: 100%;width: 77%;height: 280px;margin: auto;">
</div>
<div v-show="newcarAll">
<div @click="newcartouch" style="background-image: url('./picture/hhr/03.png'); width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;">
</div>
<div style="text-align: center;color: white;font-size: 14px;margin-top: -20px">(新开卡优惠+0息分期购机)</div>
<div @click="packageUpgrade" style="background-image: url('./picture/hhr/04.png'); width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;"></div>
<div @click="newcartouchB" style="background-image: url('./picture/hhr/05.png'); width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;"></div>
<fieldset class="layui-elem-field"
style="width: 85%;margin: 0 auto;border-radius: 10px;margin-bottom: 10px;background-color: rgba(255,255,255, 0.8);">
<legend style="text-align: center;background-color: white;border-radius: 10px;font-weight: bold;background-color: rgb(244,194,124);width: 50%;">
温馨提示
</legend>
<div style="padding: 10px 15px; font-size: 11px">
<div style="width: 100%;color: black;margin: 0 auto;">
1、下单限制:根据工信部要求,未满16周岁及其他无民事行文能力的用户,应有法定代理人代为办理线上入网。
</div>
<div style="width: 100%; color: black; margin: 0 auto;">
2、异常订单:为了保障普通用户的购买需求和权益,我司有权取消异常订单。如同一用户订购两个或两个以上相同商品的订单,不予发货。
同一用户的定义包括但不限于以下情况:同一身份证、或同一联系号码、或同一个收件人(同名除外)、相同(雷同、邻近、虚构、乱码)的收货地址等。
</div>
</div>
</fieldset>
</div>
<div v-show="newcar" >
<div style="background-image: url('./picture/hhr/06.png'); width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;" @click="newPackage"></div>
<div style="height: 250px"></div>
</div>
<div v-show="newcarB">
<div style="background-image: url('./picture/hhr/b1.png');width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;" @click="danKuan"></div>
<div style="background-image: url('./picture/hhr/b2.png');width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;" @click="rongHe"></div>
<div style="height: 250px"></div>
</div>
<van-popup v-model="kefushow" style="width: 90%;height: 45%; display: flex; align-items: center;justify-content: center;">
<div style="border: 1px solid #e2e2e2;width: 92%;height: 90%;position: fixed;display: flex; align-items: center;justify-content: center;">
<div style="font-size: 20px; color: black;text-align: center;position: fixed;top: 3px">您的专属客服</div>
<img src="/picture/hhr/service-qrcode.jpg" style="width:55%;" >
</div>
</van-popup>
</div>
</template>
<script>
export default {
name:"hhrCustomer",
data(){
return{
newcarAll:true,
newcar:false,
newcarB:false,
kefushow: false
}
}
,
methods: {
newcartouch(){
this.newcar=true
this.newcarAll=false
},
newcartouchB(){
this.newcarB=true
this.newcarAll=false
},
newcargoback(){
this.newcar=false
},
showPopup() {
this.kefushow = true;
},
newPackage(){
this.$router.push({path: 'newPackageTips'})
},
danKuan(){
this.$router.push({path: 'danKuan'})
},
rongHe(){
this.$router.push({path: 'rongHe'})
},
packageUpgrade(){
this.$router.push({path: 'packageUpgrade'})
}
}
}
</script>
<style scoped>
</style>
<template>
<div style="position:relative ">
<img src="/picture/hhr/adv_img.jpg" style="width: 100%; float: right">
<img src="/picture/hhr/kefu.png" style="width: 10%;position:fixed ;right: 15px;top: 15px" @click="showPopup">
<div style="position:fixed ;bottom: 0px;width: 100%">
<van-button type="info" :round="true" size="large" @click="ordercar">我要领卡</van-button>
</div>
<van-popup v-model="kefushow" style="width: 90%;height: 45%; display: flex; align-items: center;justify-content: center;">
<div style="border: 1px solid #e2e2e2;width: 92%;height: 90%;position: fixed;display: flex; align-items: center;justify-content: center;">
<div style="font-size: 20px; color: black;text-align: center;position: fixed;top: 3px">您的专属客服</div>
<img src="/picture/hhr/service-qrcode.jpg" style="width:55%;" >
</div>
</van-popup>
</div>
</template>
<script>
export default {
name: "newPackageTips",
data(){
return{
kefushow:false
}
}
,
methods:{
showPopup(){
this.kefushow=true
},
ordercar(){
this.$router.push({path: 'orderNewCar'})
}
}
}
</script>
<style scoped>
</style>
<template>
<div style="position:fixed">
<img src="/picture/hhr/01.jpg" style="width: 100%; float: right">
<img src="/picture/hhr/kefu.png" style="width: 10%;position:fixed ;right: 5%;top: 3%" @click="showPopup">
<span style="width: 20%;position:fixed ;right: -2%;top: 8%;font-size: 13px">联系客服</span>
<img src="/picture/hhr/question.png" style="width: 10%;position:fixed ;right: 22%;top: 3%">
<span style="width: 20%;position:fixed ;right: 15%;top: 8%;font-size: 13px">常见问题</span>
<div style="position:fixed;top: 11%;width: 100%;background-color: white;">
<div style="padding-left: 12px;padding-top: 20px ;color: black;text-align: left;width: 100%;height: 20%;line-height: 10px">
<div style="width: 15%;height: 80px;float: left; margin-right: 10px">
<img src="/picture/hhr/sim-bg.png" style="width: 100%;">
</div>
<p >天翼学生证</p>
<p >10元/月</p>
<p style="color: red">适用于中小学生,号码卡将统一配送至学生</p>
<p style="color: red"> 所在学校,由学校发放给学生。</p>
</div>
<h2 style ="font-weight:900" >
请填写有效信息
</h2>
<van-cell-group>
<van-field left-icon="user-o" label="学生姓名" v-model="value" placeholder="请输入用户名" />
<van-field left-icon="user-o" label="学校" v-model="value" placeholder="请输入9月开学时就读的院校名称" />
<van-field
left-icon="user-o"
readonly
clickable
name="area"
:value="value"
label="学校所在地区"
placeholder="点击选择省市区"
@click="showArea = true"
/>
<van-popup v-model="showArea" position="bottom">
<van-area
:area-list="areaList"
@confirm="onConfirm"
@cancel="showArea = false"
/>
</van-popup>
<van-field left-icon="user-o" label="班级" v-model="value" placeholder="请输入学生所属班级" />
<van-field left-icon="user-o" label="学号" v-model="value" placeholder="请输入学生学号" />
<van-field left-icon="user-o" label="家长名称" v-model="value" placeholder="请输入家长名称" />
<van-field left-icon="user-o" label="家长身份证" v-model="value" placeholder="请输入家长身份证" />
<van-field left-icon="user-o" label="备注" v-model="value" placeholder="请输入备注" />
</van-cell-group>
<h2 style="margin-top: 20px">请家长持本人以下证件拍照上传,16岁以上学生可学生本人拍照上传</h2>
<van-grid :border="false" :column-num="3">
<van-grid-item @click="tips">
<van-image src="/picture/hhr/upload01.png" />
</van-grid-item >
<van-grid-item @click="tips">
<van-image src="/picture/hhr/upload02.png" />
</van-grid-item >
<van-grid-item @click="tips">
<van-image src="/picture/hhr/upload03.png" />
</van-grid-item>
</van-grid>
</div>
<van-popup v-model="kefushow" style="width: 90%;height: 45%; display: flex; align-items: center;justify-content: center;">
<div style="border: 1px solid #e2e2e2;width: 92%;height: 90%;position: fixed;display: flex; align-items: center;justify-content: center;">
<div style="font-size: 20px; color: black;text-align: center;position: fixed;top: 3px">您的专属客服</div>
<img src="/picture/hhr/service-qrcode.jpg" style="width:55%;" >
</div>
</van-popup>
</div>
</template>
<script>
import area from "../../../utils/area";
import { Dialog } from 'vant';
export default {
name: "orderNewCar",
data(){
return{
kefushow:false,
list:[1,2],
value: '',
showArea: false,
areaList: area, // 数据格式见 Area 组件文档
fileList: [
{ url: 'https://img.yzcdn.cn/vant/leaf.jpg' },
// Uploader 根据文件后缀来判断是否为图片文件
// 如果图片 URL 中不包含类型信息,可以添加 isImage 标记来声明
{ url: 'https://cloud-image', isImage: true }
],
sfzshow:false
}
}
,
methods:{
fileChange(el){
if (!el.target.files[0].size) return;//判断是否有文件数量
this.fileListg(el.target.files);//获取files文件组传入处理
el.target.value = ''//清空val值,以便可以重复添加一张图片
},
fileListg(files){
for (let i = 0; i < files.length; i++) {
this.fileAdd(files[i]);
}
},
fileAdd(file){
this.size = this.size + file.size;//总大小
let reader = new FileReader();
reader.vue = this;
reader.readAsDataURL(file);
reader.onload = function () {
file.src = this.result;
this.vue.imgList.push({
file
});
}
},
bytesToSize(bytes){
if (bytes === 0) return '0 B';
let k = 1000, // or 1024
sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
i = Math.floor(Math.log(bytes) / Math.log(k));
return (bytes / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i];
},
handelup(e) {
document.getElementById('upload_file').click()
},
// 选择文件
afterRead(e) {
console.log("this.$refs.uploader.onChange")
},
showPopup(){
this.kefushow=true
}
,onConfirm(values) {
this.value = values.map(item => item.name).join('/');
this.showArea = false;
},
tips(){
Dialog.setDefaultOptions({
})
Dialog.alert({
// title: '证件上传示例',
message: `<div style="font-weight:1000;font-size:12px">
<img src="/picture/hhr/idcard.jpg" style="width:100%;height: 100%" >
<p >注意照片亮度均匀、图像清晰</p>
</div>`
}).then(() => {
// on close
});
}
}
}
</script>
<style scoped>
</style>
<template>
<div style=" background-image: url('./picture/hhr/yrym-ruanyan-adv-bg.jpg');
background-repeat: no-repeat;
background-size: 100%;
width: 100%;
height: 100%;">
<img src="/picture/hhr/kefu.png" style="width: 10%;position:fixed ;right: 15px;top: 15px" @click="showPopup">
<div style="height: 700px;"></div>
<div style="font-size: 28px;text-align: center;background: white;height: 100px" class="van-hairline--surround">
<van-cell-group style="">
<van-field v-model="value" placeholder="身份证/手机号/宽带账号"/>
</van-cell-group>
<van-button round block type="info" native-type="submit" @click="selectPackage">优惠查询</van-button>
</div>
<div v-show="kefushow">
<van-popup v-model="kefushow"
style="width: 90%;height: 45%; display: flex; align-items: center;justify-content: center;">
<div style="border: 1px solid #e2e2e2;width: 92%;height: 90%;position: fixed;display: flex; align-items: center;justify-content: center;">
<div style="font-size: 20px; color: black;text-align: center;position: fixed;top: 3px">您的专属客服</div>
<img src="/picture/hhr/service-qrcode.jpg" style="width:55%;">
</div>
</van-popup>
</div>
<div v-show="show">
<van-popup v-model="show" style="width: 70%;height: 13%; display: flex; align-items: center;justify-content: center;">
<div style=" background-image: url('./picture/hhr/div-tips-dialog.png');
background-repeat: no-repeat;
background-size: 100%;
width: 100%;
height: 100%;font-size: 22px;padding-top: 10px;text-align: center;">
<span style="">一大波优惠正在赶来中!<br> 敬请期待!</span>
</div>
</van-popup>
</div>
<div v-show="duanxing">
<van-popup v-model="duanxing"
style="width: 80%;height: 30%; display: flex; align-items: center;justify-content: center;">
<div style="font-size: 20px; color: black;text-align: center;position: fixed;top: 3px">{{yanzhengma}}</div>
<van-field
center
clearable
placeholder="请输入短信验证码"
style="width: 100%;height: 30%;"
>
<van-button slot="button" size="small" type="info"
@click.stop.prevent="getCode"
>{{codeMsg}}
</van-button>
</van-field>
<van-button round block type="info" native-type="submit">
确认
</van-button>
</van-popup>
</div>
</div>
</template>
<script>
import {selectPackage,sendVerificationCode} from "@/api/app/package"
import Vue from 'vue';
import {Field} from 'vant';
export default {
name: "packageUpgrade",
data() {
return {
value: '',
countdown: 0,// 倒计时秒数
codeMsg: '获取验证码', // 按钮上的文字
timer: null,// 定时器
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 10 },
},
yanzhengma: '',
kefushow: false,
show: false,
duanxing: false
};
},
methods: {
getCode() {
let selectOrder = this.value;
// 验证码60秒倒计时
if (!this.timer) {
sendVerificationCode({selectOrder}).then(res => {
if (res.state == 'error'){
console.log()
}else {
console.log()
}
})
//初始化倒计时
this.countdown=60;
this.timer = setInterval(() => {
if (this.countdown > 0 && this.countdown <= 60) {
this.countdown--;
if (this.countdown !== 0) {
this.codeMsg = "重新发送(" + this.countdown + ")";
} else {
clearInterval(this.timer);
this.codeMsg = "获取验证码";
this.countdown = 0;
this.timer = null;
}
}
}, 1000)
}
},
selectPackage() {
this.kefushow=false;
if (this.value == "") {
return;
} else {
let selectOrder = this.value;
sendVerificationCode({selectOrder}).then(res => {
if (res.state == 'error'){
this.show=true;
}else {
this.duanxing = true;
this.yanzhengma=res.data
//初始化倒计时
this.countdown=60;
this.timer = setInterval(() => {
if (this.countdown > 0 && this.countdown <= 60) {
this.countdown--;
if (this.countdown !== 0) {
this.codeMsg = "重新发送(" + this.countdown + ")";
} else {
clearInterval(this.timer);
this.codeMsg = "获取验证码";
this.countdown = 0;
this.timer = null;
}
}
}, 1000)
}
})
}
},
showPopup() {
if(this.kefushow == true){
this.kefushow = false
}else {
this.kefushow = true
}
},
duanxings(){
},
}
}
</script>
<style scoped>
</style>
...@@ -401,7 +401,7 @@ export default { ...@@ -401,7 +401,7 @@ export default {
if(event){ if(event){
userUnFreeze({userId:id}).then(res =>{ userUnFreeze({userId:id}).then(res =>{
if(res.code == 200){ if(res.code == 200){
notification.error({ message: '系统提示', description: '解冻成功'}) notification.success({ message: '系统提示', description: '解冻成功'})
}else{ }else{
notification.error({ message: '系统提示', description: '解冻失败'}) notification.error({ message: '系统提示', description: '解冻失败'})
} }
...@@ -409,7 +409,7 @@ export default { ...@@ -409,7 +409,7 @@ export default {
}else{ }else{
userFreeze({userId:id}).then(res =>{ userFreeze({userId:id}).then(res =>{
if(res.code == 200){ if(res.code == 200){
notification.error({ message: '系统提示', description: '冻结成功'}) notification.success({ message: '系统提示', description: '冻结成功'})
}else{ }else{
notification.error({ message: '系统提示', description: '冻结失败'}) notification.error({ message: '系统提示', description: '冻结失败'})
} }
...@@ -558,7 +558,7 @@ export default { ...@@ -558,7 +558,7 @@ export default {
handleUpdata() { handleUpdata() {
this.visible = false this.visible = false
let that = this let that = this
getEditUser(that.showModals).then(() => { getEditUser(that.showModals).then((res) => {
that.showModals.deptName = '' that.showModals.deptName = ''
that.showModals.deptid = '' that.showModals.deptid = ''
that.showModals.name = '' that.showModals.name = ''
...@@ -569,6 +569,11 @@ export default { ...@@ -569,6 +569,11 @@ export default {
that.showModals.account = '' that.showModals.account = ''
that.showModals.id = '' that.showModals.id = ''
that.showModals.roleid = '' that.showModals.roleid = ''
if(res.code == 200){
that.$notification.success({message: "系统提示", description: res.message, duration: 4})
}else {
that.$notification.error({message: "系统提示", description: res.message, duration: 4})
}
that.$refs.table.refresh({ search: true }) that.$refs.table.refresh({ search: true })
}) })
}, },
......
<template> <template>
<div> <div>
<form class="form-horizontal form-edit"> <!-- <form class="form-horizontal form-edit">-->
<ueditor></ueditor> <!-- <ueditor></ueditor>-->
</form> <!-- </form>-->
<van-button type="default">默认按钮</van-button>
<van-button type="info">信息按钮</van-button>
<van-button type="danger">危险按钮</van-button>
</div> </div>
</template> </template>
...@@ -31,11 +34,11 @@ ...@@ -31,11 +34,11 @@
</script> </script>
<style> <style>
.info{ /*.info{*/
border-radius: 10px; /* border-radius: 10px;*/
line-height: 20px; /* line-height: 20px;*/
padding: 10px; /* padding: 10px;*/
margin: 10px; /* margin: 10px;*/
background-color: #ffffff; /* background-color: #ffffff;*/
} /*}*/
</style> </style>
...@@ -773,6 +773,13 @@ ...@@ -773,6 +773,13 @@
core-js "^2.6.5" core-js "^2.6.5"
regenerator-runtime "^0.13.2" regenerator-runtime "^0.13.2"
"@babel/runtime@7.x":
version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
dependencies:
regenerator-runtime "^0.13.2"
"@babel/runtime@^7.0.0": "@babel/runtime@^7.0.0":
version "7.4.5" version "7.4.5"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
...@@ -926,6 +933,11 @@ ...@@ -926,6 +933,11 @@
resolved "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8" resolved "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw== integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
"@vant/icons@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@vant/icons/-/icons-1.2.1.tgz#309fecb97a4989866f045ce676b545c454701c8f"
integrity sha512-5ivsKQR4ySbdBW5UPoQDVqO6rdc1um3rvq/0VL+ZSA7Y3MdBQ3E4/NL0hoAY5/sZZeYfIDKEP21gpjUzdeEDQQ==
"@vue/babel-helper-vue-jsx-merge-props@^1.0.0": "@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
version "1.0.0" version "1.0.0"
resolved "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040" resolved "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040"
...@@ -11097,6 +11109,16 @@ validate-npm-package-license@^3.0.1: ...@@ -11097,6 +11109,16 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0" spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0" spdx-expression-parse "^3.0.0"
vant@^2.5.2:
version "2.5.2"
resolved "https://registry.yarnpkg.com/vant/-/vant-2.5.2.tgz#e8cbb6d7c4a2544e2585da6d75b4c3966b1498fb"
integrity sha512-EwMLdGu47rsMhi5AAfQVuZYo8oaBxueDJ8HIeiiAXEn1HIU5i1Z0HoU2CmeswWrcwWpaZ8AuZ0ctBP8xbDCETA==
dependencies:
"@babel/runtime" "7.x"
"@vant/icons" "1.2.1"
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
vue-lazyload "1.2.3"
vary@~1.1.2: vary@~1.1.2:
version "1.1.2" version "1.1.2"
resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
...@@ -11217,6 +11239,11 @@ vue-i18n@^8.15.0: ...@@ -11217,6 +11239,11 @@ vue-i18n@^8.15.0:
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.15.0.tgz#9b11ef8e7a124f67cdf788c8c90a81f3606240ed" resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.15.0.tgz#9b11ef8e7a124f67cdf788c8c90a81f3606240ed"
integrity sha512-juJ/avAP39bOMycC+qQDLJ8U9z9LtLF/9PsRoJLBSfsYZo9bqYntyyX5QPicwlb1emJKjgxhZ3YofHiQcXBu0Q== integrity sha512-juJ/avAP39bOMycC+qQDLJ8U9z9LtLF/9PsRoJLBSfsYZo9bqYntyyX5QPicwlb1emJKjgxhZ3YofHiQcXBu0Q==
vue-lazyload@1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.3.tgz#901f9ec15c7e6ca78781a2bae4a343686bdedb2c"
integrity sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g==
vue-loader@^13.0.5: vue-loader@^13.0.5:
version "13.7.3" version "13.7.3"
resolved "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.3.tgz#e07440f78230a639d00ada4da7b96d0e9d62037f" resolved "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.3.tgz#e07440f78230a639d00ada4da7b96d0e9d62037f"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment