Skip to content

H
hls-rljj-wx
Commit eb426add authored by 5359's avatar 5359
Browse files
Options

Merge branch 'master' into develop 

# Conflicts:
#	config/dev.env.js
#	src/main.js
#	src/pages/applications/electronicContract/electronicContract.vue
#	src/pages/applications/userRegisters/companyRegister.vue
#	src/pages/applications/userRegisters/userRegister.vue
parents 2d651eab 61fd8827
Show whitespace changes
Inline Side-by-side
Showing with 789 additions and 67 deletions
config/prod.env.js
View file @ eb426add
......@@ -2,7 +2,7 @@
module.exports = {
NODE_ENV: '"production"',
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: false,
debug: true,
isMobilePlatform: false,
appCode: '"HLS_APP"',
clearTable: true,
......
src/pages/applications/contractDownload/contractDownload.vue
View file @ eb426add
......@@ -17,6 +17,7 @@
<scroll ref="scroll">
<list-item :item-height="80">
<div :key="index" :proportion="[5,1]" :show-arrow="true">
<div class="cont-type" style="color: #e42112;font-size: 18px;text-align: center;margin-top: 10px;">提示：待签署人全部签署完成以后，可进行合同下载</div>
<!-- <div class="con-num">合同编号: <span style="font-weight: 600">201821023721847</span></div> -->
<item
style="margin-top:10px"
......@@ -126,7 +127,6 @@ export default {
vm.$post(url).then(function(res) {
vm.hlsPopup.hideLoading();
if (res.rows.length > 0) {
console.log(res.rows);
var results = res.rows[0];
vm.userInfo = results;
vm.getData();
......@@ -139,9 +139,17 @@ export default {
let params = {
// name: "北京骏马机械有限公司",
name: vm.userInfo.name,
ctino: vm.userInfo.idNo
ctino: vm.userInfo.idNo,
isManagerFlag: vm.userInfo.isManagerFlag,
agentIdNo: vm.userInfo.agentIdNo,
agentName: vm.userInfo.agentName
// ctino: ""
};
if (vm.userInfo.ctitype == 2 && vm.userInfo.managerAuthFlag == 'N') {
return;
}
vm.hlsPopup.showLoading("请稍等");
vm.$post(url, params).then(function(res) {
vm.hlsPopup.hideLoading();
......@@ -149,7 +157,6 @@ export default {
var dataInfo = JSON.parse(res.result.json);
vm.signData = dataInfo.sign_con_list;
vm.count = dataInfo.sign_con_list.length;
console.log("skskkskssk", dataInfo.un_sign_con_list);
}
});
},
......@@ -178,7 +185,7 @@ export default {
hlsHttp.post(url, param).then(function(res) {
wx.config({
beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......@@ -213,8 +220,16 @@ export default {
// name: "北京骏马机械有限公司",
name: vm.userInfo.name,
ctino: vm.userInfo.idNo,
agentIdNo: vm.userInfo.agentIdNo,
agentName: vm.userInfo.agentName,
isManagerFlag: vm.userInfo.isManagerFlag,
tenant_name: vm.searchCondition.input
};
if (vm.userInfo.ctitype == 2 && vm.userInfo.managerAuthFlag == 'N') {
return;
}
vm.hlsPopup.showLoading("请稍等");
vm.$post(url, params).then(function(res) {
vm.hlsPopup.hideLoading();
......
src/pages/applications/contractDownload/contractDownloadList.vue
View file @ eb426add
......@@ -43,7 +43,6 @@ export default {
}
// console.log(JSON.parse(window.localStorage.unSignData));
this.data = JSON.parse(window.localStorage.SignDownloadData);
console.log("22222222222", this.data);
this.offsize = 1;
this.pagesize = 10;
this.index = [1, 0, 0];
......@@ -109,7 +108,7 @@ export default {
hlsHttp.post(url, param).then(function(res) {
wx.config({
beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/pages/applications/electronicContract/electronicContract.vue
View file @ eb426add
......@@ -31,10 +31,10 @@
src="../../../assets/electronicContract/contract-icon.png"
class="left-icon"
/>
<div slot="name" class="text" style="width: 70%;font-size: 12px;">
<div slot="name" class="text" style="width: 82%;font-size: 12px;">
<div
class="cont-type"
style="color: #5a5959;font-size: 14px"
style="color: #5a5959;font-size: 14px;font-weight:bold"
>承租人：{{item.customername}}</div>
<div class="cont-type" style="color: #5a5959;font-size: 14px">经销商：{{item.dealername}}</div>
<div class="cont-type" style="color: #5a5959;font-size: 14px">产品名称：{{item.modelname}}</div>
......@@ -61,17 +61,17 @@
<!-- 已签约 -->
<list-item :item-height="80" v-if="myIndex == 1">
<!-- <div :key="index" :proportion="[5,1]" :show-arrow="true"> -->
<div class="cont-type" style="color: #e42112;font-size: 18px;text-align: center;margin-top: 10px;">提示：待签署人全部签署完成以后，可进行合同下载</div>
<div class="cont-type" style="color: #e42112;font-size: 18px;text-align: center;margin-top: 10px;">提示：查看合同详情请至“电子合同下载”进行</div>
<item style="margin-top:10px" v-for="(item,index) in signData" :key="index">
<!-- <img
slot="left-icon"
src="../../../assets/electronicContract/contract-icon.png"
class="left-icon"
/> -->
<div slot="name" class="text" style="width: 70%;font-size: 12px;">
<div slot="name" class="text" style="width: 86%;font-size: 12px;">
<div
class="cont-type"
style="color: #5a5959;font-size: 14px"
style="color: #5a5959;font-size: 14px;font-weight:bold"
>承租人：{{item.customername}}</div>
<div class="cont-type" style="color: #5a5959;font-size: 14px">经销商：{{item.dealername}}</div>
<div class="cont-type" style="color: #5a5959;font-size: 14px">产品名称：{{item.modelname}}</div>
......@@ -154,8 +154,15 @@ export default {
let params = {
// name: "北京骏马机械有限公司",
name: vm.userInfo.name,
ctino: vm.userInfo.idNo
ctino: vm.userInfo.idNo,
agentIdNo: vm.userInfo.agentIdNo,
isManagerFlag: vm.userInfo.isManagerFlag,
agentName: vm.userInfo.agentName
};
if (vm.userInfo.ctitype == 2 && vm.userInfo.managerAuthFlag == 'N') {
return;
}
vm.hlsPopup.showLoading("请稍等");
vm.$post(url, params).then(function(res) {
vm.hlsPopup.hideLoading();
......@@ -163,7 +170,6 @@ export default {
var dataInfo = JSON.parse(res.result.json);
vm.unSignData = dataInfo.un_sign_con_list;
vm.signData = dataInfo.sign_con_list;
console.log("skskkskssk", dataInfo.un_sign_con_list);
}
});
},
......@@ -174,8 +180,14 @@ export default {
// name: "北京骏马机械有限公司",
name: vm.userInfo.name,
ctino: vm.userInfo.idNo,
agentIdNo: vm.userInfo.agentIdNo,
agentName: vm.userInfo.agentName,
isManagerFlag: vm.userInfo.isManagerFlag,
tenant_name: vm.searchCondition.input
};
if (vm.userInfo.ctitype == 2 && vm.userInfo.managerAuthFlag == 'N') {
return;
}
vm.hlsPopup.showLoading("请稍等");
vm.$post(url, params).then(function(res) {
vm.hlsPopup.hideLoading();
......@@ -231,7 +243,7 @@ export default {
hlsHttp.post(url, param).then(function(res) {
wx.config({
beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/pages/applications/electronicContract/electronicContractList.vue
View file @ eb426add
......@@ -147,7 +147,7 @@ export default {
hlsHttp.post(url, param).then(function(res) {
wx.config({
beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/pages/applications/userRegisters/authorizedAgent.vue 0 → 100644
View file @ eb426add
<template>
<h-view class="public-style authorizedAgent" title="授权经办人">
<h-content>
<list-item class="reg-content">
<div class="repre-type">
<span>授权类型：</span>
<input
type="radio"
name="peopleType"
v-model="staffType"
@change="getRadioVal"
value="已授权"
/>已授权
<input
type="radio"
name="peopleType"
v-model="staffType"
@change="getRadioVal"
value="未授权"
/>未授权
</div>
<!-- 法定代表人 -->
<div v-if="staffType == '已授权'">
<div class="list" v-for="(item,index) in authorizedList" :key="index">
<div class="info_title">
<div class="list_left" style="width:30%;">
<img v-if="!item.choose" @click.stop="changeChoose(item)"
src="../../../assets/userRegister/unchoose.png"
alt
style="width:15px;height:15px;margin-right:5px;"
/>
<img v-if="item.choose" @click.stop="changeChoose(item)"
src="../../../assets/userRegister/choosed.png"
alt
style="width:15px;height:15px;margin-right:5px;"
/>
<div class="left">经办人<span>{{index+1}}</span> ：</div>
</div>
<div class="list_right" style="width:61%;">
<input type="text" class="edit" readonly/>
</div>
</div>
<div class="info_all">
<div class="info_list">
<div class="list_left" style="width:39%;">
<img
src="../../../assets/userRegister/people.png"
alt
style="width:16px;height:16px;margin-right:5px;"
/>
经办人姓名：
</div>
<div class="list_right" style="width:61%;">
<input type="text" class="edit" v-model="item.agentName" readonly/>
</div>
</div>
<div class="info_list">
<div class="list_left" style="width:48%;">
<img
src="../../../assets/userRegister/idCard.png"
alt
style="width:16px;height:16px;margin-right:5px;"
/>
经办人身份证号：
</div>
<div class="list_right" style="width:52%;">
<input type="text" class="edit" v-model="item.agentIdNo" readonly/>
</div>
</div>
<div class="info_list">
<div class="list_left" style="width:39%;">
<img
src="../../../assets/userRegister/phone.png"
alt
style="width:16px;height:16px;margin-right:5px;"
/>
手机号码：
</div>
<div class="list_right" style="width:61%;">
<input type="text" class="edit" v-model="item.mobile" readonly/>
</div>
</div>
<div class="info_list">
<div class="list_left" style="width:39%;">
<img
src="../../../assets/userRegister/package.png"
alt
style="width:16px;height:16px;margin-right:5px;"
/>
是否授权：
</div>
<div v-if="item.managerAuthFlag == 'Y'" class="list_right" style="width:61%;">
已授权
</div>
<div v-if="item.managerAuthFlag == 'N'" class="list_right" style="width:61%;">
未授权
</div>
</div>
</div>
</div>
<div v-if="authorizedList.length && showButton" class="button_all">
<div
class="next_step"
@click="managerTransfer"
>管理转移
</div>
<div
class="next_step"
@click="autohrized('N')"
>取消授权
</div>
</div>
</div>
<!-- 未授权 -->
<div v-if="staffType ==='未授权'">
<div class="list" v-for="(item,index) in unAuthorizedList" :key="index">
<div class="info_title">
<div class="list_left" style="width:30%;">
<img v-if="!item.choose" @click.stop="changeChoose(item)"
src="../../../assets/userRegister/unchoose.png"
alt
style="width:15px;height:15px;margin-right:5px;"
/>
<img v-if="item.choose" @click.stop="changeChoose(item)"
src="../../../assets/userRegister/choosed.png"
alt
style="width:15px;height:15px;margin-right:5px;"
/>
<div class="left">经办人<span>{{index+1}}</span> ：</div>
</div>
<div class="list_right" style="width:61%;">
<input type="text" class="edit" readonly/>
</div>
</div>
<div class="info_all">
<div class="info_list">
<div class="list_left" style="width:39%;">
<img
src="../../../assets/userRegister/people.png"
alt
style="width:16px;height:16px;margin-right:5px;"
/>
经办人姓名：
</div>
<div class="list_right" style="width:61%;">
<input type="text" class="edit" v-model="item.agentName" readonly/>
</div>
</div>
<div class="info_list">
<div class="list_left" style="width:48%;">
<img
src="../../../assets/userRegister/idCard.png"
alt
style="width:16px;height:16px;margin-right:5px;"
/>
经办人身份证号：
</div>
<div class="list_right" style="width:52%;">
<input type="text" class="edit" v-model="item.agentIdNo" readonly/>
</div>
</div>
<div class="info_list">
<div class="list_left" style="width:39%;">
<img
src="../../../assets/userRegister/phone.png"
alt
style="width:16px;height:16px;margin-right:5px;"
/>
手机号码：
</div>
<div class="list_right" style="width:61%;">
<input type="text" class="edit" v-model="item.mobile" readonly/>
</div>
</div>
<div class="info_list">
<div class="list_left" style="width:39%;">
<img
src="../../../assets/userRegister/package.png"
alt
style="width:16px;height:16px;margin-right:5px;"
/>
是否授权：
</div>
<div v-if="item.managerAuthFlag == 'Y'" class="list_right" style="width:61%;">
已授权
</div>
<div v-if="item.managerAuthFlag == 'N'" class="list_right" style="width:61%;">
未授权
</div>
</div>
</div>
</div>
<div v-if="unAuthorizedList.length && showButton" class="button_all">
<div
class="next_step"
@click="autohrized('Y')"
>授权
</div>
</div>
</div>
</list-item>
</h-content>
</h-view>
</template>
<script>
// import { Grid, GridItem } from "vux";
import {getUrlParam} from "@/scripts/utils";
export default {
data() {
return {
staffType: "已授权",
authorizedList: [], //已授权数组
unAuthorizedList: [],//未授权数组,
id: null,
choosedList: [],//已选择数组
obj: {},
showButton: true,
};
},
components: {
// Grid,
// GridItem
},
activated: function () {
},
updated: function () {
},
created() {
let vm = this
},
beforeRouteEnter: function (to, form, next) {
next(vm => {
vm.id = window.localStorage.AuthSocialCode;
vm.init()
})
},
methods: {
// tab切换
getRadioVal() {
// console.log(this.staffType);
},
changeChoose(item) {
let vm = this
vm.$set(item, 'choose', !item.choose)
},
//管理转移
managerTransfer() {
let vm = this
vm.choosedList = []
vm.authorizedList.forEach(function (value) {
vm.obj = {};
if (value.choose) {
vm.obj.openId = value.openId
vm.choosedList.push(vm.obj)
}
})
if (vm.choosedList.length == 1) {
let url = process.env.rootPath + '/auth/api/individual/assignment'
let param = {
"oldOpenId": window.localStorage.openId,
"openId": vm.choosedList[0].openId
}
hlsPopup.showConfirm({
title: '“授权管理转移”须知：',
content: '您即将转移您的管理员权限，一旦您点击了“管理转移”按钮，相应的授权经办人员应该在获得贵司线下授权函的前提下，即获得贵司管理员的身份。请您作为贵司的管理员，在完全理解和明白前述点击“管理转移”按钮的法律后果并确保贵司愿意接受该种法律后果的情况下点击“管理转移”按钮。如您因误操作点击了“管理转移”按钮，请您立即进行取消转移的操作，否则贵司也将承担因误操作所引发的一切法律后果。',
onConfirm: function (index) {
if (index === 1) {
vm.hlsPopup.showLoading('请稍等')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.code == '000000') {
hlsPopup.showLongCenter('管理员转让成功!')
vm.obj = {}
vm.choosedList = []
vm.showButton = false
this.$router.push({
name: 'CompanyRegister'
})
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
},
})
} else {
hlsPopup.showLongCenter('请选择经办人且只能转移给一人!')
}
},
//授权
autohrized(flag) {
let vm = this
vm.choosedList = [];
if (flag == 'N') { //已经授权的 取消授权
vm.authorizedList.forEach(function (value) {
vm.obj = {};
if (value.choose) {
vm.obj.openId = value.openId
vm.obj.managerAuthFlag = 'N'
vm.choosedList.push(vm.obj);
}
})
} else if (flag == 'Y') { //未授权的 授权
vm.unAuthorizedList.forEach(function (value) {
vm.obj = {};
if (value.choose) {
vm.obj.openId = value.openId
vm.obj.managerAuthFlag = 'Y'
vm.choosedList.push(vm.obj);
}
})
}
if (vm.choosedList.length > 0) {
let url = process.env.rootPath + '/auth/api/individual/authorize'
let param = vm.choosedList
if (flag == 'Y') {
hlsPopup.showConfirm({
title: '“授权”须知',
content: '您即将授权“未授权”的经办人员作为贵司的签约授权代表，一旦您点击了“授权”按钮，相应的授权经办人员即完全取得代表贵司签约的权利，其所有签约操作行为都完全代表贵司。请您作为贵司签约授权管理人，在完全理解和明白前述点击“授权”按钮的法律后果并确保贵司愿意接受该种法律后果的情况下点击“授权”按钮。如您因误操作点击了“授权”按钮，请您立即进行取消授权的操作，否则贵司也将承担因误操作所引发的一切法律后果。',
onConfirm: function (index) {
if (index === 1) {
vm.hlsPopup.showLoading('请稍等')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.code == '000000') {
hlsPopup.showLongCenter('操作成功!')
vm.obj = {}
vm.choosedList = []
vm.init()
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
},
})
} else if (flag == 'N') {
vm.hlsPopup.showLoading('请稍等')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.code == '000000') {
hlsPopup.showLongCenter('操作成功!')
vm.obj = {}
vm.choosedList = []
vm.init()
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
} else {
hlsPopup.showLongCenter('请选择经办人!')
}
},
//数据初始化查询
init() {
let vm = this
let url = process.env.rootPath + '/auth/api/individual/info/query'
let param = {
idNo: vm.id
}
vm.hlsPopup.showLoading('请稍等')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.success) {
vm.authorizedList = [];
vm.unAuthorizedList = [];
res.rows.forEach(function (value) {
// 是否被选中标志
vm.$set(value, 'choose', false)
if (value.managerAuthFlag == 'Y') {
vm.authorizedList.push(value)
} else if (value.managerAuthFlag == 'N') {
vm.unAuthorizedList.push(value)
}
})
}
})
}
},
};
</script>
<style lang="less" type="text/less" scoped>
@import "../../../styles/vue-1px.less";
.authorizedAgent {
.reg-content {
padding: 20px;
font-size: 14px;
.repre-type {
padding: 10px;
border-bottom: 1px solid #d0d0d0;
color: #11111187;
font-size: 16px;
font-weight: 700;
}
.info_all {
width: 100%;
border: 1px solid #d0d0d0;;
}
.info_title {
width: 94%;
margin-left: 3%;
font-size: 14px;
display: flex;
display: -webkit-flex;
.list_left {
width: 35%;
// margin-left: 3%;
height: 50px;
font-family: "微软雅黑";
font-size: 14px;
color: #636363;
line-height: 50px;
// float: left;
display: -webkit-flex;
display: flex;
align-items: center;
justify-content: space-around;
-webkit-align-items: center;
-webkit-justify-content: space-around;
}
.list_right {
// width: auto;
// margin-right: 3%;
height: 50px;
color: #636363;
line-height: 50px;
// float: right;
}
.edit {
width: 100%;
// height: 50px;
color: #898989;
font-family: "微软雅黑";
font-size: 14px;
border: none;
}
.list_left2 {
width: 97%;
margin-left: 3%;
height: 50px;
font-family: "微软雅黑";
font-size: 14px;
color: #636363;
line-height: 50px;
// float: left;
}
}
.info_list {
width: 94%;
margin-left: 3%;
// height: 50px;
// border-bottom: 1px solid #f2f2f2;
font-size: 14px;
border-bottom: 1px solid #d0d0d0;
display: flex;
display: -webkit-flex;
.list_left {
width: 35%;
// margin-left: 3%;
height: 50px;
font-family: "微软雅黑";
font-size: 14px;
color: #636363;
line-height: 50px;
// float: left;
}
.list_right {
// width: auto;
// margin-right: 3%;
height: 50px;
color: #636363;
line-height: 50px;
// float: right;
}
.edit {
width: 100%;
// height: 50px;
color: #898989;
font-family: "微软雅黑";
font-size: 14px;
border: none;
}
.list_left2 {
width: 97%;
margin-left: 3%;
height: 50px;
font-family: "微软雅黑";
font-size: 14px;
color: #636363;
line-height: 50px;
// float: left;
}
}
.info_list:last-child {
border: none
}
.button_all {
width: 100%;
font-size: 14px;
display: -webkit-flex;
display: flex;
align-items: center;
justify-content: space-around;
-webkit-align-items: center;
-webkit-justify-content: space-around;
.next_step {
// width:30%;
height: 30px;
line-height: 30px;
text-align: center;
border-radius: 15px;
background-color: #09bb07;
color: #FFFFFF;
}
}
.uppic {
height: 100%;
width: 100%;
margin: 0 auto;
opacity: 0;
z-index: 1000;
position: absolute;
}
.pic {
width: 100%;
height: 100%;
position: absolute;
}
.bus-license {
width: 140px;
height: 100px;
margin: 10px auto;
border: 1px solid #b2b2b2;
border-radius: 8px;
position: relative;
}
.next_step {
width: 120px;
height: 30px;
border-radius: 15px;
background-color: #999999;
color: #ffffff;
margin-top: 50px;
}
}
}
// iPhoneX适配
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
#home {
}
}
}
// iPhoneX Max适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
.platform-ios {
#home {
}
}
}
}
</style>
src/pages/applications/userRegisters/companyRegister.vue
View file @ eb426add
......@@ -229,8 +229,7 @@
position: relative;
left: 50%;"
@click="next_step()"
>下一步
</button>
>下一步</button>
<p/>
<button v-if="showStatus== 1"
@click="go_forword()"
......@@ -434,8 +433,7 @@
@click="go_forword()"
class="next-step"
style="margin-top:20px"
>退出
</button>
>退出</button>
</div>
</list-item>
</h-content>
......@@ -585,8 +583,18 @@
class="next_step"
style="width:120px;height:30px;border-radius:15px;background-color:#09bb07;color:#FFFFFF;margin:100px 0 0 -60px;position:relative;left:50%;"
@click="logout()"
>注销
</button>
>注销</button>
<!-- <div class="button_all">
<div v-if="isManagerFlag=='Y'"
class="next_step"
@click="goAutohrized()"
>授权管理</div>
<div
class="next_step"
@click="logout()"
>注销</div>
</div> -->
</div>
<!-- 组织其他员工 -->
<div v-if="staffType ==='组织其他员工'">
......@@ -721,8 +729,7 @@
class="next_step"
style="width:120px;height:30px;border-radius:15px;background-color:#09bb07;color:#FFFFFF;margin:100px 0 0 -60px;position:relative;left:50%;"
@click="logout()"
>注销
</button>
>注销</button>
</div>
</list-item>
</h-content>
......@@ -835,7 +842,7 @@
hlsHttp.post(url, param).then(function (res) {
wx.config({
beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......@@ -931,7 +938,7 @@
},
// 上传到业务系统并且进行ocr识别
uploadCardToserver(serverId) {
console.log("mediaId", serverId);
// console.log("mediaId", serverId);
let vm = this;
let url = process.env.rootPath + "/auth/upload/image/hls/from/wx";
let param = {
......@@ -1086,7 +1093,7 @@
agentType: "1",
// dealerFlag: vm.agentType,
redirectUrl:
"http://sign.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=1"
"http://lease.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=1"
};
vm.hlsPopup.showLoading("请稍等");
vm.$post(url, param).then(function (res) {
......@@ -1150,7 +1157,7 @@
legalIdNo: vm.legalRepresentativeCardNumber1,
agentType: "2",
redirectUrl:
"http://sign.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=2"
"http://lease.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=2"
};
vm.hlsPopup.showLoading("请稍等");
vm.$post(url, param).then(function (res) {
......@@ -1199,7 +1206,7 @@
if (res.code == 0) {
vm.$vux.toast.text(res.message, "middle");
window.open(
"http://sign.hitachics.com/www/#/UserRegister",
"http://lease.hitachics.com/www/#/UserRegister",
"_self"
);
} else {
......@@ -1224,7 +1231,7 @@
if (res.code == 0) {
vm.$vux.toast.text(res.message, "middle");
window.open(
"http://sign.hitachics.com/www/#/UserRegister",
"http://lease.hitachics.com/www/#/UserRegister",
"_self"
);
} else {
......@@ -1235,7 +1242,7 @@
// 认证结果返回给接口
authResult(id, code, suc) {
let vm = this;
let url = "http://sign.hitachics.com/core/api/public/listen/auth/result";
let url = "http://lease.hitachics.com/core/api/public/listen/auth/result";
let param = {
contextId: id,
verifycode: code,
......@@ -1251,10 +1258,19 @@
setTimeout(function () {
var scrollHeight =
document.documentElement.scrollTop || document.body.scrollTop || 0;
console.log(scrollHeight);
// console.log(scrollHeight);
window.scrollTo(0, Math.max(scrollHeight, 0));
}, 100);
},
// 进入授权管理
// goAutohrized(){
// this.$router.push({
// name: 'AuthorizedAgent',
// params: {
// id: vm.socialCode
// },
// })
// },
// 查询用户信息
getUserInfo() {
var Request = new this.UrlSearch(); //实例化
......@@ -1262,7 +1278,6 @@
var contextId = Request.contextId;
var verifycode = Request.verifycode;
var success = Request.passed;
// console.log('wwwwww',status)
let vm = this;
let url =
process.env.rootPath +
......@@ -1439,6 +1454,25 @@
line-height: 50px;
// float: left;
}
}
.button_all{
width: 100%;
font-size: 14px;
display: -webkit-flex;
display: flex;
align-items: center;
justify-content: space-around;
-webkit-align-items: center;
-webkit-justify-content: space-around;
.next_step{
// width:30%;
height:30px;
line-height: 30px;
text-align: center;
border-radius:15px;
background-color:#09bb07;
color:#FFFFFF;
}
}
.uppic {
height: 100%;
......
src/pages/applications/userRegisters/personalRegister.vue
View file @ eb426add
......@@ -255,7 +255,7 @@
hlsHttp.post(url, param).then(function (res) {
wx.config({
beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......@@ -275,7 +275,6 @@
});
},
addCardImage: function () {
console.log("11111111");
let self = this;
// if(!self.cardUp){
wx.chooseImage({
......@@ -314,7 +313,6 @@
});
},
uploadToserver(serverId) {
console.log("mediaId", serverId);
let vm = this;
let url = process.env.rootPath + "/auth/upload/image/hls/from/wx";
let param = {
......
src/pages/applications/userRegisters/readonlyCompanyReg.vue
View file @ eb426add
......@@ -123,11 +123,25 @@
</div>
</div>
<p style="margin-top:10px;text-align:center;">正面</p>
<button
<!-- <button
class="next_step"
style="width:120px;height:30px;border-radius:15px;background-color:#09bb07;color:#FFFFFF;margin:100px 0 0 -60px;position:relative;left:50%;"
@click="logout()"
>注销</button>
>注销</button> -->
<div class="button_all">
<div v-if="isManagerFlag=='Y'"
class="next_step"
@click="goAutohrized()"
>授权管理</div>
<div
class="next_step"
@click="logout()"
>注销</div>
</div>
</div>
<!-- 组织其他员工 -->
......@@ -258,11 +272,21 @@
<input type="text" class="edit" v-model="legalRepresentativeCardNumber1" readonly />
</div>
</div>
<button
<!--<button-->
<!--class="next_step"-->
<!--style="width:120px;height:30px;border-radius:15px;background-color:#09bb07;color:#FFFFFF;margin:100px 0 0 -60px;position:relative;left:50%;"-->
<!--@click="logout()"-->
<!--&gt;注销</button>-->
<div class="button_all">
<div v-if="isManagerFlag=='Y'"
class="next_step"
@click="goAutohrized()"
>授权管理</div>
<div
class="next_step"
style="width:120px;height:30px;border-radius:15px;background-color:#09bb07;color:#FFFFFF;margin:100px 0 0 -60px;position:relative;left:50%;"
@click="logout()"
>注销</button>
>注销</div>
</div>
</div>
</list-item>
</h-content>
......@@ -296,7 +320,10 @@ export default {
attachmentId: "",
orgAttachmentId: "",
attachmentId1: "",
orgAttachmentId1: ""
orgAttachmentId1: "",
isManagerFlag:"",
managerAuthFlag:"",
// agentType: ""
};
},
......@@ -366,10 +393,23 @@ export default {
}
});
}
console.log(index);
// console.log(index);
}
});
},
// 进入授权管理
goAutohrized(){
if(this.agentType=="1"){
window.localStorage.setItem('AuthSocialCode',this.socialCode);
}else{
window.localStorage.setItem('AuthSocialCode',this.socialCode1);
}
this.$router.push({
name: 'AuthorizedAgent',
params: {
},
})
},
// 调用微信接口的基础配置
wxConfig() {
let clientUrl = "";
......@@ -395,7 +435,7 @@ export default {
hlsHttp.post(url, param).then(function(res) {
wx.config({
beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......@@ -419,9 +459,9 @@ export default {
this.wxConfig();
var data = this.$route.params.userInfo;
var agentType = data.agentType;
console.log(data);
// console.log(data);
if (agentType == 1) {
// this.agentType = data.dealerFlag;
this.agentType = agentType;
this.organizationName = data.name;
this.socialCode = data.idNo;
this.legalRepresentativeName = data.legalName;
......@@ -429,6 +469,12 @@ export default {
this.legalPhoneNumber = data.mobile;
this.attachmentId = data.attachmentId;
this.orgAttachmentId = data.orgAttachmentId;
window.localStorage.setItem('isManagerFlag', data.isManagerFlag);
window.localStorage.setItem('managerAuthFlag', data.managerAuthFlag);
this.isManagerFlag = data.isManagerFlag;
this.managerAuthFlag = data.managerAuthFlag;
this.cardUp =
process.env.rootPath +
"/app/fileViewSvc?attachment_id=" +
......@@ -442,7 +488,7 @@ export default {
"&apiName=download&sysName=HCL_UPLOAD_FILE&access_token=" +
window.localStorage.access_token_rl;
} else if (agentType == 2) {
// this.agentType = data.dealerFlag;
this.agentType = agentType;
this.staffType = "组织其他员工";
this.jbName = data.agentName;
this.jbPhoneNumber = data.mobile;
......@@ -453,6 +499,10 @@ export default {
this.legalRepresentativeCardNumber1 = data.legalIdNo;
this.attachmentId1 = data.attachmentId;
this.orgAttachmentId1 = data.orgAttachmentId;
window.localStorage.setItem('isManagerFlag', data.isManagerFlag);
window.localStorage.setItem('managerAuthFlag', data.managerAuthFlag);
this.isManagerFlag = data.isManagerFlag;
this.managerAuthFlag = data.managerAuthFlag;
this.cardUp1 =
process.env.rootPath +
"/app/fileViewSvc?attachment_id=" +
......@@ -528,6 +578,25 @@ export default {
// float: left;
}
}
.button_all{
width: 100%;
font-size: 14px;
display: -webkit-flex;
display: flex;
align-items: center;
justify-content: space-around;
-webkit-align-items: center;
-webkit-justify-content: space-around;
.next_step{
// width:30%;
height:30px;
line-height: 30px;
text-align: center;
border-radius:15px;
background-color:#09bb07;
color:#FFFFFF;
}
}
.uppic {
height: 100%;
width: 100%;
......
src/pages/applications/userRegisters/readonlyPersonalReg.vue
View file @ eb426add
......@@ -147,7 +147,7 @@ export default {
hlsHttp.post(url, param).then(function(res) {
wx.config({
beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/pages/applications/userRegisters/uploadImg.vue
View file @ eb426add
......@@ -61,7 +61,6 @@ export default {
});
},
addVipImage: function() {
console.log("11111111");
let self = this;
wx.chooseImage({
count: 1, //张数， 默认9
......
src/pages/applications/userRegisters/userRegister.vue
View file @ eb426add
......@@ -180,9 +180,9 @@
vm.hlsPopup.hideLoading();
if (res.rows) {
if (res.rows.length > 0) {
console.log(res.rows);
// console.log(res.rows);
var results = res.rows[0];
var historyFlag = data.historyFlag;
var historyFlag = results.historyFlag;
if (historyFlag == 'N') {
vm.ctitype = results.ctitype;
if (results.ctitype == 1) {
......@@ -231,7 +231,7 @@
hlsHttp.post(url, param).then(function (res) {
wx.config({
beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/pages/home.vue
View file @ eb426add
......@@ -135,7 +135,7 @@
hlsHttp.post(url, param).then(function (res) {
wx.config({
beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/router/index.js
View file @ eb426add
......@@ -26,6 +26,8 @@ import UserRegister from '@/pages/applications/userRegisters/userRegister'
// 企业注册
import CompanyRegister from '@/pages/applications/userRegisters/companyRegister'
import ReadonlyCompanyReg from '@/pages/applications/userRegisters/readonlyCompanyReg'
//授权经办人
import AuthorizedAgent from '@/pages/applications/userRegisters/authorizedAgent'
// 个人注册
import PersonalRegister from '@/pages/applications/userRegisters/personalRegister'
......@@ -193,6 +195,15 @@ export default new Router({
keepAlive: false
},
},
// 授权经办人
{
path: '/AuthorizedAgent',
component: AuthorizedAgent,
name: 'AuthorizedAgent',
meta: {
keepAlive: false
},
},
......
src/scripts/hlsHttp.js
View file @ eb426add
......@@ -24,9 +24,9 @@ axios.interceptors.request.use(config => {
axios.interceptors.response.use(response => {
if ($config.debug) {
let postName = 'post'
console.log(postName + ' success')
console.log(postName + ' response ' + JSON.stringify(response.data, '', 2))
console.log(postName + ' End!')
// console.log(postName + ' success')
// console.log(postName + ' response ' + JSON.stringify(response.data, '', 2))
// console.log(postName + ' End!')
}
if (response.data.result === 'E' || response.data.code === 'E') {
hlsPopup.hideLoading()
......
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