Skip to content

G
gdtel-gztel-school-center-ui
Commit 68c38246 by kyonback
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	yarn-error.log
parents c54bf43c 0e34f897
Showing with 193 additions and 111 deletions
.gitignore
......@@ -6,3 +6,4 @@ node_modules/
.git/
package-lock.json
dist/
deploy/winsun-docker-application-list/gdtel-gztel-school-center/ui/nginx/html/
Dockerfile deleted 100644 → 0
FROM nginx
LABEL maintainer="Liph <liph@gzwinsun.com>" app="gdtel-gztel-jyyy-ui"
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
&& apk update && apk add ca-certificates tzdata \
&& cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& echo "Asia/Shanghai" > /etc/timezone \
&& apk del tzdata
COPY dist/ /usr/share/nginx/html/
EXPOSE 80
deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/ui/Dockerfile 0 → 100644
FROM nginx
LABEL maintainer="Liph <liph@gzwinsun.com>" app="com.gdtel.gztel.schoolcenter.ui"
COPY nginx/html /etc/nginx/html
COPY nginx/config/ui.conf /etc/nginx/conf.d/default.conf
EXPOSE 11090
CMD ["nginx", "-g", "daemon off;"]
deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/ui/nginx/config/ui.conf 0 → 100644
server_tokens off;
server {
listen 11090;
server_name 172.18.101.171;
client_max_body_size 100M;
proxy_connect_timeout 180;
proxy_read_timeout 180;
proxy_send_timeout 180;
location / {
root /etc/nginx/html;
}
location /auth {
proxy_pass http://gateway:10001/auth;
}
location /jyyy {
proxy_pass http://gateway:10001/jyyy;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}
}
deploy/upload.sh 0 → 100755
#!/bin/bash
cp -r ../dist/* prod/winsun-docker-application-list/gdtel-gztel-school-center/ui/nginx/html
scp -r prod/winsun-docker-application-list/gdtel-gztel-school-center/* liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/gdtel-gztel-school-center
src/assets/bg_content.png
src/assets/bg_content.png

163 KB | W: | H:

src/assets/bg_content.png

172 KB | W: | H:

src/assets/bg_content.png
src/assets/bg_content.png
src/assets/bg_content.png
src/assets/bg_content.png
  • 2-up
  • Swipe
  • Onion skin
src/components/tools/UserPassword.vue
......@@ -20,23 +20,6 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="验证码">
<a-input
v-decorator="['inputCode',validatorRules.inputCode]"
type="text"
placeholder="请输入验证码">
</a-input>
<a-button
type="primary"
htmlType="submit"
@click.stop.prevent="getCode"
>{{codeMsg}}
</a-button>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="新密码">
<a-input type="password" placeholder="请输入新密码" v-decorator="[ 'newPwd', validatorRules.newPwd]"/>
</a-form-item>
......@@ -107,35 +90,6 @@
}
},
methods: {
getCode() {
// 验证码60秒倒计时
if (!this.timer) {
postAction(this.codeurl).then((res)=>{
if (res.code==200){
this.$notification.success({
message: res.data,
});
return null;
}
this.$notification.error({
message: res.data,
});
})
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 = 60;
this.timer = null;
}
}
}, 1000)
}
},
//密码加密
getPass(text){
/*let keyss = setMaxDigits(130);
......@@ -180,11 +134,11 @@
that.confirmLoading = true;
values.oldPwd=encodeURIComponent(this.getPass(values.oldPwd))
values.newPwd=encodeURIComponent(this.getPass(values.newPwd))
values.inputCode=encodeURIComponent(this.getPass(values.inputCode))
values.inputCode=encodeURIComponent(this.getPass("XXXXXX"))
values.rePwd=values.newPwd
let params = Object.assign(values)
postAction(this.url,params).then((res)=>{
if(res.code){
if(res.code!=200){
that.$message.error(res.message);
that.close();
}else{
......
src/config/router.config.js
......@@ -16,11 +16,6 @@ export const asyncRouterMap = [{
component: () => import(/* webpackChunkName: "user" */ '@/views/user/Login')
},
{
path: 'register',
name: 'register',
component: () => import(/* webpackChunkName: "user" */ '@/views/user/register')
},
{
path: 'ueditor2',
name: 'ueditor2',
component: () => import(/* webpackChunkName: "user" */ '@/views/user/ueditor2')
......@@ -74,6 +69,11 @@ export const asyncRouterMap = [{
path: 'readAgree',
name: 'readAgree',
component: () => import('@views/hhr-view/newpackage/readAgree.vue')
},
{
path: 'welfareScheme',
name: 'welfareScheme',
component: () => import('@views/hhr-view/packageUpgrade/welfareScheme.vue')
}
]
}
......
src/views/hhr-view/packageUpgrade/packageUpgrade.vue
......@@ -2,8 +2,10 @@
<div style="position:relative ">
<img src="/picture/hhr/yrym-ruanyan-adv-bg.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="height: 700px;"></div>
<div style="font-size: 28px;text-align: center;background: white;position:fixed ;bottom: 0px;width: 100%" class="van-hairline--surround">
<div v-show="inQuery">
<van-button loading type="info" loading-text="查询中..." />
</div>
<div style="width: 90%;margin-left: 5%">
<van-cell-group >
<van-field v-model="value" placeholder="身份证/手机号/宽带账号"/>
......@@ -25,7 +27,7 @@
</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;">
<van-popup v-model="show" style="width: 70%;height: 16%; 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%;
......@@ -39,23 +41,26 @@
<van-popup v-model="duanxing"
style="width: 80%;height: 30%; display: flex; align-items: center;justify-content: center;">
<div>
<div style="font-size: 20px; color: black;text-align: center;position: fixed;top: 3px;margin: 0px 0px 20px 0px;">{{yanzhengma}}</div>
<div style="font-size: 20px; color: black;text-align: center;position: fixed;top: 3px;margin: 0px 0px 20px 0px;">{{phone}}</div>
<div style="margin: 50px 0px 0px 0px;">
<div style="margin: 50px 0px 0px 0px;width: 90%;margin-left: 5%">
<van-field
center
clearable
placeholder="请输入短信验证码"
style="width: 100%;height: 30%;"
v-model="yanzhengma"
>
<van-button slot="button" size="small" type="info"
@click.stop.prevent="getCode"
>{{codeMsg}}
</van-button>
</van-field>
<div v-show="prompt" style="color:red;font-size: 20px; color: red;text-align: center;">
验证码有误
</div>
<van-button round block type="info" native-type="submit">
<van-button round block type="info" native-type="submit" @click="welfareScheme">
确认
</van-button>
</div>
......@@ -78,6 +83,8 @@
name: "packageUpgrade",
data() {
return {
inQuery:false,
prompt:false,
value: '',
countdown: 0,// 倒计时秒数
codeMsg: '获取验证码', // 按钮上的文字
......@@ -91,6 +98,7 @@
sm: { span: 10 },
},
yanzhengma: '',
phone: '',
kefushow: false,
show: false,
duanxing: false
......@@ -130,13 +138,19 @@
if (this.value == "") {
return;
} else {
this.inQuery=true
let selectOrder = this.value;
if(this.countdown!=0){
this.inQuery=false
this.duanxing = true;
}else {
sendVerificationCode({selectOrder}).then(res => {
this.inQuery=false
if (res.state == 'error'){
this.show=true;
}else {
this.duanxing = true;
this.yanzhengma=res.data
this.phone=res.data
//初始化倒计时
this.countdown=60;
this.timer = setInterval(() => {
......@@ -153,7 +167,7 @@
}
}, 1000)
}
})
})}
}
},
......@@ -164,9 +178,23 @@
this.kefushow = true
}
},
duanxings(){
welfareScheme(){
if(this.yanzhengma==''){
return;
}
let selectOrder = this.value;
let verificationCode = this.yanzhengma
selectPackage({selectOrder,verificationCode}).then(res => {
if (res.state == 'error'){
this.prompt=true;
}else {
this.$router.push({
path: 'welfareScheme',
})
}
})
},
}
}
}
</script>
......
src/views/hhr-view/packageUpgrade/welfareScheme.vue 0 → 100644
<template>
<div style="background-image: url('./picture/hhr/01.jpg');
background-repeat: no-repeat;
background-size: 100%;
width: 100%;
height: 150%; position:relative">
<div style="height:70px"></div>
<img src="/picture/hhr/kefu.png" style="width: 10%;position:fixed ;right: 15px;top: 15px" @click="showPopup">
<div style="background: white;" >
<div style="padding-top:20px">
<van-divider :style="{ borderColor: '#1989fa', padding: '0 16px' }">
<div style="font-size: 22px"> 福利方案</div>
</van-divider>
</div>
<div style="text-align: center;height:100%;margin: 10px 10px 10px 10px;background-color: rgba(128, 128, 128, 0.09);background:#adadad">
<div style=" border-bottom:2px solid green;font-size: 22px">
<van-row>
<van-col span="8"></van-col>
<van-col span="8">原套餐<br>(daiding)</van-col>
<van-col span="8">新套餐<br>(daiding)</van-col>
</van-row>
</div>
<div style=" border-bottom:2px solid green;font-size: 22px">
<van-row>
<van-col span="8">月租</van-col>
<van-col span="8">{{package}}</van-col>
<van-col span="8">(daiding)</van-col>
</van-row>
</div>
<div style=" border-bottom:2px solid green;font-size: 22px">
<van-row>
<van-col span="8">套餐</van-col>
<van-col span="8">(daiding)</van-col>
<van-col span="8">(daiding)</van-col>
</van-row>
</div>
<div style=" border-bottom:2px solid green;font-size: 22px">
<van-row>
<van-col span="8">语音</van-col>
<van-col span="8">(daiding)</van-col>
<van-col span="8">(daiding)</van-col>
</van-row>
</div>
<div style=" border-bottom:2px solid green;font-size: 22px">
<div style="margin: 10px 10px 10px 10px;">
<van-checkbox v-model="checked" shape="square">复选框</van-checkbox>
</div>
</div>
</div>
</div>
<div style="font-size: 28px;text-align: center;background: white;position:fixed ;bottom: 0px;width: 100%" class="van-hairline--surround">
<div style="width: 90%;margin-left: 5%;margin: 20px 5% 20px 5%;">
<van-button round block type="info" native-type="submit" @click="selectPackage">马上办理</van-button>
</div>
</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>
</template>
<script>
import {selectPackage,sendVerificationCode} from "@/api/app/package"
import Vue from 'vue';
import {Field} from 'vant';
export default {
name: "packageUpgrade",
package:'',
data() {
return {
phone: '',
kefushow: false,
};
},
methods: {
selectPackage() {
},
showPopup() {
if(this.kefushow == true){
this.kefushow = false
}else {
this.kefushow = true
}
},
}
}
</script>
<style scoped>
</style>
src/views/user/Login.vue
......@@ -39,31 +39,6 @@
</a-col>
</a-row>
<a-row :gutter="0">
<a-col :span="14">
<a-form-item>
<a-input
:disabled="!loginBtn"
v-decorator="['phonecode',validatorRules.phoneCode]"
size="large"
type="text"
placeholder="请输入手机验证码">
<a-icon slot="prefix" type="message" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
</a-col>
<a-col :span="10">
<a-button
size="small"
type="primary"
htmlType="submit"
class="code-button"
@click.stop.prevent="getCode"
:disabled="!loginBtn">{{codeMsg}}
</a-button>
<!-- <j-graphic-code @success="generateCode" style="float: right"></j-graphic-code>-->
</a-col>
</a-row>
<a-form-item>
<a-input
:disabled="!loginBtn"
......@@ -75,7 +50,7 @@
<a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
<div class="register">忘记密码?<router-link :to="{path: '/user/register'}">找回密码</router-link></div>
<!-- <div class="register">忘记密码?<router-link :to="{path: '/user/register'}">找回密码</router-link></div>-->
<a-form-item style="margin-top:24vw/@vw">
<a-button
......@@ -174,17 +149,6 @@ export default {
let data = {
username: username,
}
getPhoneCode(data).then(res => {
if (res.code == 200) {
this.$notification.success({
message: res.message ? res.message :"发送成功",
});
return null;
}
this.$notification.error({
message: res.message ? res.message :"发送错误",
});
})
//初始化倒计时
this.countdown=60;
this.timer = setInterval(() => {
......@@ -209,12 +173,12 @@ export default {
smsCode: "xxxx"
};
// 使用账户密码登陆
that.form.validateFields(['username', 'password', 'inputCode',"phonecode"], {force: true}, (err, values) => {
that.form.validateFields(['username', 'password', 'inputCode'], {force: true}, (err, values) => {
if (!err) {
loginParams.username = values.username;
loginParams.password = encodeURIComponent(this.getPass(values.password));
loginParams.remember = that.formLogin.remember;
loginParams.phonecode=encodeURIComponent(this.getPass(values.phonecode));
loginParams.phonecode=encodeURIComponent(this.getPass("XXXXXX"));
//console.log(loginParams);
that.Login(loginParams).then(() => {
this.departConfirm({});
......
yarn.lock
This source diff could not be displayed because it is too large. You can view the blob instead.
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