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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 789 additions and 67 deletions
config/prod.env.js
View file @ eb426add
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module.exports = { module.exports = {
NODE_ENV: '"production"', NODE_ENV: '"production"',
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV), CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: false, debug: true,
isMobilePlatform: false, isMobilePlatform: false,
appCode: '"HLS_APP"', appCode: '"HLS_APP"',
clearTable: true, clearTable: true,
......
src/pages/applications/contractDownload/contractDownload.vue
View file @ eb426add
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<scroll ref="scroll"> <scroll ref="scroll">
<list-item :item-height="80"> <list-item :item-height="80">
<div :key="index" :proportion="[5,1]" :show-arrow="true"> <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> --> <!-- <div class="con-num">合同编号: <span style="font-weight: 600">201821023721847</span></div> -->
<item <item
style="margin-top:10px" style="margin-top:10px"
...@@ -126,7 +127,6 @@ export default { ...@@ -126,7 +127,6 @@ export default {
vm.$post(url).then(function(res) { vm.$post(url).then(function(res) {
vm.hlsPopup.hideLoading(); vm.hlsPopup.hideLoading();
if (res.rows.length > 0) { if (res.rows.length > 0) {
console.log(res.rows);
var results = res.rows[0]; var results = res.rows[0];
vm.userInfo = results; vm.userInfo = results;
vm.getData(); vm.getData();
...@@ -139,9 +139,17 @@ export default { ...@@ -139,9 +139,17 @@ export default {
let params = { let params = {
// name: "北京骏马机械有限公司", // name: "北京骏马机械有限公司",
name: vm.userInfo.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: "" // ctino: ""
}; };
if (vm.userInfo.ctitype == 2 && vm.userInfo.managerAuthFlag == 'N') {
return;
}
vm.hlsPopup.showLoading("请稍等"); vm.hlsPopup.showLoading("请稍等");
vm.$post(url, params).then(function(res) { vm.$post(url, params).then(function(res) {
vm.hlsPopup.hideLoading(); vm.hlsPopup.hideLoading();
...@@ -149,7 +157,6 @@ export default { ...@@ -149,7 +157,6 @@ export default {
var dataInfo = JSON.parse(res.result.json); var dataInfo = JSON.parse(res.result.json);
vm.signData = dataInfo.sign_con_list; vm.signData = dataInfo.sign_con_list;
vm.count = dataInfo.sign_con_list.length; vm.count = dataInfo.sign_con_list.length;
console.log("skskkskssk", dataInfo.un_sign_con_list);
} }
}); });
}, },
...@@ -178,7 +185,7 @@ export default { ...@@ -178,7 +185,7 @@ export default {
hlsHttp.post(url, param).then(function(res) { hlsHttp.post(url, param).then(function(res) {
wx.config({ wx.config({
beta: true, beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识 appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳 timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串 nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
...@@ -213,8 +220,16 @@ export default { ...@@ -213,8 +220,16 @@ export default {
// name: "北京骏马机械有限公司", // name: "北京骏马机械有限公司",
name: vm.userInfo.name, name: vm.userInfo.name,
ctino: vm.userInfo.idNo, ctino: vm.userInfo.idNo,
agentIdNo: vm.userInfo.agentIdNo,
agentName: vm.userInfo.agentName,
isManagerFlag: vm.userInfo.isManagerFlag,
tenant_name: vm.searchCondition.input tenant_name: vm.searchCondition.input
}; };
if (vm.userInfo.ctitype == 2 && vm.userInfo.managerAuthFlag == 'N') {
return;
}
vm.hlsPopup.showLoading("请稍等"); vm.hlsPopup.showLoading("请稍等");
vm.$post(url, params).then(function(res) { vm.$post(url, params).then(function(res) {
vm.hlsPopup.hideLoading(); vm.hlsPopup.hideLoading();
......
src/pages/applications/contractDownload/contractDownloadList.vue
View file @ eb426add
...@@ -43,7 +43,6 @@ export default { ...@@ -43,7 +43,6 @@ export default {
} }
// console.log(JSON.parse(window.localStorage.unSignData)); // console.log(JSON.parse(window.localStorage.unSignData));
this.data = JSON.parse(window.localStorage.SignDownloadData); this.data = JSON.parse(window.localStorage.SignDownloadData);
console.log("22222222222", this.data);
this.offsize = 1; this.offsize = 1;
this.pagesize = 10; this.pagesize = 10;
this.index = [1, 0, 0]; this.index = [1, 0, 0];
...@@ -59,7 +58,7 @@ export default { ...@@ -59,7 +58,7 @@ export default {
); );
} }
// console.log(JSON.parse(window.localStorage.unSignData)); // console.log(JSON.parse(window.localStorage.unSignData));
this.data = JSON.parse(window.localStorage.SignDownloadData); this.data = JSON.parse(window.localStorage.SignDownloadData);
}, },
methods: { methods: {
// createSign() { // createSign() {
...@@ -109,7 +108,7 @@ export default { ...@@ -109,7 +108,7 @@ export default {
hlsHttp.post(url, param).then(function(res) { hlsHttp.post(url, param).then(function(res) {
wx.config({ wx.config({
beta: true, beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识 appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳 timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串 nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/pages/applications/electronicContract/electronicContract.vue
View file @ eb426add
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
src="../../../assets/electronicContract/contract-icon.png" src="../../../assets/electronicContract/contract-icon.png"
class="left-icon" 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 <div
class="cont-type" class="cont-type"
style="color: #5a5959;font-size: 14px" style="color: #5a5959;font-size: 14px;font-weight:bold"
>承租人：{{item.customername}}</div> >承租人：{{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.dealername}}</div>
<div class="cont-type" style="color: #5a5959;font-size: 14px">产品名称：{{item.modelname}}</div> <div class="cont-type" style="color: #5a5959;font-size: 14px">产品名称：{{item.modelname}}</div>
...@@ -61,17 +61,17 @@ ...@@ -61,17 +61,17 @@
<!-- 已签约 --> <!-- 已签约 -->
<list-item :item-height="80" v-if="myIndex == 1"> <list-item :item-height="80" v-if="myIndex == 1">
<!-- <div :key="index" :proportion="[5,1]" :show-arrow="true"> --> <!-- <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"> <item style="margin-top:10px" v-for="(item,index) in signData" :key="index">
<!-- <img <!-- <img
slot="left-icon" slot="left-icon"
src="../../../assets/electronicContract/contract-icon.png" src="../../../assets/electronicContract/contract-icon.png"
class="left-icon" 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 <div
class="cont-type" class="cont-type"
style="color: #5a5959;font-size: 14px" style="color: #5a5959;font-size: 14px;font-weight:bold"
>承租人：{{item.customername}}</div> >承租人：{{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.dealername}}</div>
<div class="cont-type" style="color: #5a5959;font-size: 14px">产品名称：{{item.modelname}}</div> <div class="cont-type" style="color: #5a5959;font-size: 14px">产品名称：{{item.modelname}}</div>
...@@ -154,8 +154,15 @@ export default { ...@@ -154,8 +154,15 @@ export default {
let params = { let params = {
// name: "北京骏马机械有限公司", // name: "北京骏马机械有限公司",
name: vm.userInfo.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.hlsPopup.showLoading("请稍等");
vm.$post(url, params).then(function(res) { vm.$post(url, params).then(function(res) {
vm.hlsPopup.hideLoading(); vm.hlsPopup.hideLoading();
...@@ -163,7 +170,6 @@ export default { ...@@ -163,7 +170,6 @@ export default {
var dataInfo = JSON.parse(res.result.json); var dataInfo = JSON.parse(res.result.json);
vm.unSignData = dataInfo.un_sign_con_list; vm.unSignData = dataInfo.un_sign_con_list;
vm.signData = dataInfo.sign_con_list; vm.signData = dataInfo.sign_con_list;
console.log("skskkskssk", dataInfo.un_sign_con_list);
} }
}); });
}, },
...@@ -174,8 +180,14 @@ export default { ...@@ -174,8 +180,14 @@ export default {
// name: "北京骏马机械有限公司", // name: "北京骏马机械有限公司",
name: vm.userInfo.name, name: vm.userInfo.name,
ctino: vm.userInfo.idNo, ctino: vm.userInfo.idNo,
agentIdNo: vm.userInfo.agentIdNo,
agentName: vm.userInfo.agentName,
isManagerFlag: vm.userInfo.isManagerFlag,
tenant_name: vm.searchCondition.input tenant_name: vm.searchCondition.input
}; };
if (vm.userInfo.ctitype == 2 && vm.userInfo.managerAuthFlag == 'N') {
return;
}
vm.hlsPopup.showLoading("请稍等"); vm.hlsPopup.showLoading("请稍等");
vm.$post(url, params).then(function(res) { vm.$post(url, params).then(function(res) {
vm.hlsPopup.hideLoading(); vm.hlsPopup.hideLoading();
...@@ -231,7 +243,7 @@ export default { ...@@ -231,7 +243,7 @@ export default {
hlsHttp.post(url, param).then(function(res) { hlsHttp.post(url, param).then(function(res) {
wx.config({ wx.config({
beta: true, beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识 appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳 timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串 nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/pages/applications/electronicContract/electronicContractList.vue
View file @ eb426add
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div>{{item.file_sign_name}}</div> <div>{{item.file_sign_name}}</div>
<p style="color:red;margin-top:3px"></p> <p style="color:red;margin-top:3px"></p>
</div> </div>
</div> </div>
</div> </div>
<div class="footer" @click="createSign()">签约</div> <div class="footer" @click="createSign()">签约</div>
...@@ -60,13 +60,13 @@ export default { ...@@ -60,13 +60,13 @@ export default {
createSign() { createSign() {
let goUrl = this.data[0].sign_url let goUrl = this.data[0].sign_url
if (goUrl) { if (goUrl) {
// //
// this.hlsPopup.showLoading("请稍等"); // this.hlsPopup.showLoading("请稍等");
window.open(goUrl, "_self"); window.open(goUrl, "_self");
// let url = window.open('http://www.baidu.com','_self'); // let url = window.open('http://www.baidu.com','_self');
// if(url == null){ // if(url == null){
// } // }
} }
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
hlsHttp.post(url, param).then(function(res) { hlsHttp.post(url, param).then(function(res) {
wx.config({ wx.config({
beta: true, beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识 appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳 timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串 nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/pages/applications/userRegisters/authorizedAgent.vue 0 → 100644
View file @ eb426add
This diff is collapsed.
src/pages/applications/userRegisters/companyRegister.vue
View file @ eb426add
...@@ -229,8 +229,7 @@ ...@@ -229,8 +229,7 @@
position: relative; position: relative;
left: 50%;" left: 50%;"
@click="next_step()" @click="next_step()"
>下一步 >下一步</button>
</button>
<p/> <p/>
<button v-if="showStatus== 1" <button v-if="showStatus== 1"
@click="go_forword()" @click="go_forword()"
...@@ -434,8 +433,7 @@ ...@@ -434,8 +433,7 @@
@click="go_forword()" @click="go_forword()"
class="next-step" class="next-step"
style="margin-top:20px" style="margin-top:20px"
>退出 >退出</button>
</button>
</div> </div>
</list-item> </list-item>
</h-content> </h-content>
...@@ -585,8 +583,18 @@ ...@@ -585,8 +583,18 @@
class="next_step" 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%;" style="width:120px;height:30px;border-radius:15px;background-color:#09bb07;color:#FFFFFF;margin:100px 0 0 -60px;position:relative;left:50%;"
@click="logout()" @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>
<!-- 组织其他员工 --> <!-- 组织其他员工 -->
<div v-if="staffType ==='组织其他员工'"> <div v-if="staffType ==='组织其他员工'">
...@@ -721,8 +729,7 @@ ...@@ -721,8 +729,7 @@
class="next_step" 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%;" style="width:120px;height:30px;border-radius:15px;background-color:#09bb07;color:#FFFFFF;margin:100px 0 0 -60px;position:relative;left:50%;"
@click="logout()" @click="logout()"
>注销 >注销</button>
</button>
</div> </div>
</list-item> </list-item>
</h-content> </h-content>
...@@ -835,7 +842,7 @@ ...@@ -835,7 +842,7 @@
hlsHttp.post(url, param).then(function (res) { hlsHttp.post(url, param).then(function (res) {
wx.config({ wx.config({
beta: true, beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识 appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳 timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串 nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
...@@ -931,7 +938,7 @@ ...@@ -931,7 +938,7 @@
}, },
// 上传到业务系统并且进行ocr识别 // 上传到业务系统并且进行ocr识别
uploadCardToserver(serverId) { uploadCardToserver(serverId) {
console.log("mediaId", serverId); // console.log("mediaId", serverId);
let vm = this; let vm = this;
let url = process.env.rootPath + "/auth/upload/image/hls/from/wx"; let url = process.env.rootPath + "/auth/upload/image/hls/from/wx";
let param = { let param = {
...@@ -1086,7 +1093,7 @@ ...@@ -1086,7 +1093,7 @@
agentType: "1", agentType: "1",
// dealerFlag: vm.agentType, // dealerFlag: vm.agentType,
redirectUrl: redirectUrl:
"http://sign.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=1" "http://lease.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=1"
}; };
vm.hlsPopup.showLoading("请稍等"); vm.hlsPopup.showLoading("请稍等");
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
...@@ -1150,7 +1157,7 @@ ...@@ -1150,7 +1157,7 @@
legalIdNo: vm.legalRepresentativeCardNumber1, legalIdNo: vm.legalRepresentativeCardNumber1,
agentType: "2", agentType: "2",
redirectUrl: redirectUrl:
"http://sign.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=2" "http://lease.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=2"
}; };
vm.hlsPopup.showLoading("请稍等"); vm.hlsPopup.showLoading("请稍等");
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
...@@ -1199,7 +1206,7 @@ ...@@ -1199,7 +1206,7 @@
if (res.code == 0) { if (res.code == 0) {
vm.$vux.toast.text(res.message, "middle"); vm.$vux.toast.text(res.message, "middle");
window.open( window.open(
"http://sign.hitachics.com/www/#/UserRegister", "http://lease.hitachics.com/www/#/UserRegister",
"_self" "_self"
); );
} else { } else {
...@@ -1224,7 +1231,7 @@ ...@@ -1224,7 +1231,7 @@
if (res.code == 0) { if (res.code == 0) {
vm.$vux.toast.text(res.message, "middle"); vm.$vux.toast.text(res.message, "middle");
window.open( window.open(
"http://sign.hitachics.com/www/#/UserRegister", "http://lease.hitachics.com/www/#/UserRegister",
"_self" "_self"
); );
} else { } else {
...@@ -1235,7 +1242,7 @@ ...@@ -1235,7 +1242,7 @@
// 认证结果返回给接口 // 认证结果返回给接口
authResult(id, code, suc) { authResult(id, code, suc) {
let vm = this; 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 = { let param = {
contextId: id, contextId: id,
verifycode: code, verifycode: code,
...@@ -1251,10 +1258,19 @@ ...@@ -1251,10 +1258,19 @@
setTimeout(function () { setTimeout(function () {
var scrollHeight = var scrollHeight =
document.documentElement.scrollTop || document.body.scrollTop || 0; document.documentElement.scrollTop || document.body.scrollTop || 0;
console.log(scrollHeight); // console.log(scrollHeight);
window.scrollTo(0, Math.max(scrollHeight, 0)); window.scrollTo(0, Math.max(scrollHeight, 0));
}, 100); }, 100);
}, },
// 进入授权管理
// goAutohrized(){
// this.$router.push({
// name: 'AuthorizedAgent',
// params: {
// id: vm.socialCode
// },
// })
// },
// 查询用户信息 // 查询用户信息
getUserInfo() { getUserInfo() {
var Request = new this.UrlSearch(); //实例化 var Request = new this.UrlSearch(); //实例化
...@@ -1262,7 +1278,6 @@ ...@@ -1262,7 +1278,6 @@
var contextId = Request.contextId; var contextId = Request.contextId;
var verifycode = Request.verifycode; var verifycode = Request.verifycode;
var success = Request.passed; var success = Request.passed;
// console.log('wwwwww',status)
let vm = this; let vm = this;
let url = let url =
process.env.rootPath + process.env.rootPath +
...@@ -1440,6 +1455,25 @@ ...@@ -1440,6 +1455,25 @@
// float: left; // 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 { .uppic {
height: 100%; height: 100%;
width: 100%; width: 100%;
......
src/pages/applications/userRegisters/personalRegister.vue
View file @ eb426add
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
hlsHttp.post(url, param).then(function (res) { hlsHttp.post(url, param).then(function (res) {
wx.config({ wx.config({
beta: true, beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识 appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳 timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串 nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
...@@ -275,7 +275,6 @@ ...@@ -275,7 +275,6 @@
}); });
}, },
addCardImage: function () { addCardImage: function () {
console.log("11111111");
let self = this; let self = this;
// if(!self.cardUp){ // if(!self.cardUp){
wx.chooseImage({ wx.chooseImage({
...@@ -314,7 +313,6 @@ ...@@ -314,7 +313,6 @@
}); });
}, },
uploadToserver(serverId) { uploadToserver(serverId) {
console.log("mediaId", serverId);
let vm = this; let vm = this;
let url = process.env.rootPath + "/auth/upload/image/hls/from/wx"; let url = process.env.rootPath + "/auth/upload/image/hls/from/wx";
let param = { let param = {
......
src/pages/applications/userRegisters/readonlyCompanyReg.vue
View file @ eb426add
...@@ -123,11 +123,25 @@ ...@@ -123,11 +123,25 @@
</div> </div>
</div> </div>
<p style="margin-top:10px;text-align:center;">正面</p> <p style="margin-top:10px;text-align:center;">正面</p>
<button <!-- <button
class="next_step" 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%;" style="width:120px;height:30px;border-radius:15px;background-color:#09bb07;color:#FFFFFF;margin:100px 0 0 -60px;position:relative;left:50%;"
@click="logout()" @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>
<!-- 组织其他员工 --> <!-- 组织其他员工 -->
...@@ -258,11 +272,21 @@ ...@@ -258,11 +272,21 @@
<input type="text" class="edit" v-model="legalRepresentativeCardNumber1" readonly /> <input type="text" class="edit" v-model="legalRepresentativeCardNumber1" readonly />
</div> </div>
</div> </div>
<button <!--<button-->
class="next_step" <!--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%;" <!--style="width:120px;height:30px;border-radius:15px;background-color:#09bb07;color:#FFFFFF;margin:100px 0 0 -60px;position:relative;left:50%;"-->
@click="logout()" <!--@click="logout()"-->
>注销</button> <!--&gt;注销</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>
</list-item> </list-item>
</h-content> </h-content>
...@@ -296,7 +320,10 @@ export default { ...@@ -296,7 +320,10 @@ export default {
attachmentId: "", attachmentId: "",
orgAttachmentId: "", orgAttachmentId: "",
attachmentId1: "", attachmentId1: "",
orgAttachmentId1: "" orgAttachmentId1: "",
isManagerFlag:"",
managerAuthFlag:"",
// agentType: "" // agentType: ""
}; };
}, },
...@@ -366,10 +393,23 @@ export default { ...@@ -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() { wxConfig() {
let clientUrl = ""; let clientUrl = "";
...@@ -395,7 +435,7 @@ export default { ...@@ -395,7 +435,7 @@ export default {
hlsHttp.post(url, param).then(function(res) { hlsHttp.post(url, param).then(function(res) {
wx.config({ wx.config({
beta: true, beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识 appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳 timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串 nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
...@@ -419,9 +459,9 @@ export default { ...@@ -419,9 +459,9 @@ export default {
this.wxConfig(); this.wxConfig();
var data = this.$route.params.userInfo; var data = this.$route.params.userInfo;
var agentType = data.agentType; var agentType = data.agentType;
console.log(data); // console.log(data);
if (agentType == 1) { if (agentType == 1) {
// this.agentType = data.dealerFlag; this.agentType = agentType;
this.organizationName = data.name; this.organizationName = data.name;
this.socialCode = data.idNo; this.socialCode = data.idNo;
this.legalRepresentativeName = data.legalName; this.legalRepresentativeName = data.legalName;
...@@ -429,6 +469,12 @@ export default { ...@@ -429,6 +469,12 @@ export default {
this.legalPhoneNumber = data.mobile; this.legalPhoneNumber = data.mobile;
this.attachmentId = data.attachmentId; this.attachmentId = data.attachmentId;
this.orgAttachmentId = data.orgAttachmentId; 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 = this.cardUp =
process.env.rootPath + process.env.rootPath +
"/app/fileViewSvc?attachment_id=" + "/app/fileViewSvc?attachment_id=" +
...@@ -442,7 +488,7 @@ export default { ...@@ -442,7 +488,7 @@ export default {
"&apiName=download&sysName=HCL_UPLOAD_FILE&access_token=" + "&apiName=download&sysName=HCL_UPLOAD_FILE&access_token=" +
window.localStorage.access_token_rl; window.localStorage.access_token_rl;
} else if (agentType == 2) { } else if (agentType == 2) {
// this.agentType = data.dealerFlag; this.agentType = agentType;
this.staffType = "组织其他员工"; this.staffType = "组织其他员工";
this.jbName = data.agentName; this.jbName = data.agentName;
this.jbPhoneNumber = data.mobile; this.jbPhoneNumber = data.mobile;
...@@ -453,6 +499,10 @@ export default { ...@@ -453,6 +499,10 @@ export default {
this.legalRepresentativeCardNumber1 = data.legalIdNo; this.legalRepresentativeCardNumber1 = data.legalIdNo;
this.attachmentId1 = data.attachmentId; this.attachmentId1 = data.attachmentId;
this.orgAttachmentId1 = data.orgAttachmentId; 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 = this.cardUp1 =
process.env.rootPath + process.env.rootPath +
"/app/fileViewSvc?attachment_id=" + "/app/fileViewSvc?attachment_id=" +
...@@ -528,6 +578,25 @@ export default { ...@@ -528,6 +578,25 @@ export default {
// float: left; // 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 { .uppic {
height: 100%; height: 100%;
width: 100%; width: 100%;
......
src/pages/applications/userRegisters/readonlyPersonalReg.vue
View file @ eb426add
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
hlsHttp.post(url, param).then(function(res) { hlsHttp.post(url, param).then(function(res) {
wx.config({ wx.config({
beta: true, beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识 appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳 timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串 nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/pages/applications/userRegisters/uploadImg.vue
View file @ eb426add
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
wxConfig() { wxConfig() {
let clientUrl = ''; let clientUrl = '';
// let ua = navigator.userAgent.toLowerCase(); // let ua = navigator.userAgent.toLowerCase();
let u = navigator.userAgent; let u = navigator.userAgent;
let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //g let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //g
...@@ -61,7 +61,6 @@ export default { ...@@ -61,7 +61,6 @@ export default {
}); });
}, },
addVipImage: function() { addVipImage: function() {
console.log("11111111");
let self = this; let self = this;
wx.chooseImage({ wx.chooseImage({
count: 1, //张数， 默认9 count: 1, //张数， 默认9
...@@ -98,7 +97,7 @@ export default { ...@@ -98,7 +97,7 @@ export default {
//res.serverId 返回图片的微信服务器端ID //res.serverId 返回图片的微信服务器端ID
console.log('上传图片后返回的信息',res) console.log('上传图片后返回的信息',res)
self.serverId = res.serverId; self.serverId = res.serverId;
} }
}); });
} }
...@@ -109,4 +108,4 @@ export default { ...@@ -109,4 +108,4 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
</style> </style>
\ No newline at end of file
src/pages/applications/userRegisters/userRegister.vue
View file @ eb426add
...@@ -180,9 +180,9 @@ ...@@ -180,9 +180,9 @@
vm.hlsPopup.hideLoading(); vm.hlsPopup.hideLoading();
if (res.rows) { if (res.rows) {
if (res.rows.length > 0) { if (res.rows.length > 0) {
console.log(res.rows); // console.log(res.rows);
var results = res.rows[0]; var results = res.rows[0];
var historyFlag = data.historyFlag; var historyFlag = results.historyFlag;
if (historyFlag == 'N') { if (historyFlag == 'N') {
vm.ctitype = results.ctitype; vm.ctitype = results.ctitype;
if (results.ctitype == 1) { if (results.ctitype == 1) {
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
hlsHttp.post(url, param).then(function (res) { hlsHttp.post(url, param).then(function (res) {
wx.config({ wx.config({
beta: true, beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识 appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳 timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串 nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/pages/home.vue
View file @ eb426add
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
hlsHttp.post(url, param).then(function (res) { hlsHttp.post(url, param).then(function (res) {
wx.config({ wx.config({
beta: true, beta: true,
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.result.appId, // 必填，公众号的唯一标识 appId: res.result.appId, // 必填，公众号的唯一标识
timestamp: res.result.timestamp, // 必填，生成签名的时间戳 timestamp: res.result.timestamp, // 必填，生成签名的时间戳
nonceStr: res.result.nonceStr, // 必填，生成签名的随机串 nonceStr: res.result.nonceStr, // 必填，生成签名的随机串
......
src/router/index.js
View file @ eb426add
...@@ -26,6 +26,8 @@ import UserRegister from '@/pages/applications/userRegisters/userRegister' ...@@ -26,6 +26,8 @@ import UserRegister from '@/pages/applications/userRegisters/userRegister'
// 企业注册 // 企业注册
import CompanyRegister from '@/pages/applications/userRegisters/companyRegister' import CompanyRegister from '@/pages/applications/userRegisters/companyRegister'
import ReadonlyCompanyReg from '@/pages/applications/userRegisters/readonlyCompanyReg' import ReadonlyCompanyReg from '@/pages/applications/userRegisters/readonlyCompanyReg'
//授权经办人
import AuthorizedAgent from '@/pages/applications/userRegisters/authorizedAgent'
// 个人注册 // 个人注册
import PersonalRegister from '@/pages/applications/userRegisters/personalRegister' import PersonalRegister from '@/pages/applications/userRegisters/personalRegister'
...@@ -193,6 +195,15 @@ export default new Router({ ...@@ -193,6 +195,15 @@ export default new Router({
keepAlive: false 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 => { ...@@ -24,9 +24,9 @@ axios.interceptors.request.use(config => {
axios.interceptors.response.use(response => { axios.interceptors.response.use(response => {
if ($config.debug) { if ($config.debug) {
let postName = 'post' let postName = 'post'
console.log(postName + ' success') // console.log(postName + ' success')
console.log(postName + ' response ' + JSON.stringify(response.data, '', 2)) // console.log(postName + ' response ' + JSON.stringify(response.data, '', 2))
console.log(postName + ' End!') // console.log(postName + ' End!')
} }
if (response.data.result === 'E' || response.data.code === 'E') { if (response.data.result === 'E' || response.data.code === 'E') {
hlsPopup.hideLoading() hlsPopup.hideLoading()
...@@ -163,4 +163,4 @@ export function post(url, param) { ...@@ -163,4 +163,4 @@ export function post(url, param) {
reject(err) reject(err)
}) })
}) })
} }
\ No newline at end of file
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