Skip to content

Z
zhichan
Commit 192b2cff by huangjing
Options

tj

parent 35473eec
Showing with 1165 additions and 62 deletions
igirl-web/.vscode/settings.json
{ {
"editor.fontSize": 16 "editor.fontSize": 16,
"editor.tabSize": 2
} }
\ No newline at end of file
igirl-web/app/base/db/metadata/apps/platform.js
...@@ -819,11 +819,21 @@ module.exports = { ...@@ -819,11 +819,21 @@ module.exports = {
"bizConfig": null, "bizConfig": null,
"path": "", "path": "",
}, },
{
"code": "policycondition",
"icon": "fa fa-home",
"isMenu": false,
"label": "填写条件",
"bizCode": "policycondition",
"bizConfig": null,
"path": "",
},
], ],
}, },
"bizs": { "bizs": {
"policycondition": {"title": "填写条件", "config": null, "path":"/policycondition", "comname": "policycondition"},
"policyorder": {"title": "我的订单", "config": null, "path":"/policyorder", "comname": "policyorder"},
"myinfo": {"title": "个人信息", "config": null, "path":"/myinfo", "comname": "myinfo"},
"recommen": {"title": "政策推荐", "config": null, "path":"/recommen", "comname": "recommen"}, "recommen": {"title": "政策推荐", "config": null, "path":"/recommen", "comname": "recommen"},
"nowbuy": {"title": "政策推荐", "config": null, "path":"/nowbuy", "comname": "nowbuy"}, "nowbuy": {"title": "政策推荐", "config": null, "path":"/nowbuy", "comname": "nowbuy"},
"pay": {"title": "支付订阅", "config": null, "path":"/pay", "comname": "pay"}, "pay": {"title": "支付订阅", "config": null, "path":"/pay", "comname": "pay"},
......
igirl-web/app/base/db/metadata/subsys/policycenter.js
...@@ -6,26 +6,25 @@ module.exports= { ...@@ -6,26 +6,25 @@ module.exports= {
"isSubmenu": true, "isSubmenu": true,
"children": [ "children": [
{ {
"code": "bizmag", "isGroup": true, "icon": "fa fa-outdent", "label": "政策工具", "children": [ "code": "myinfo",
{ "label": "个人信息",
"code": "tool1", "isMenu": true,
"label": "工具1", "bizCode": "myinfo",
"isMenu": true, "bizConfig": null,
"bizCode": "tool1", "path": "",
"bizConfig": null, "icon": "fa fa-map-o",
"path": "" "children": [],
}, },
{ {
"code": "tool2", "code": "policyorder",
"label": "工具2", "label": "我的订单",
"isMenu": true, "isMenu": true,
"bizCode": "tool2", "bizCode": "policyorder",
"bizConfig": null, "bizConfig": null,
"path": "" "path": "",
}, "icon": "fa fa-map-o",
] "children": [],
} },
//------------------------------------------------企业中心左边菜单配置-------------------------------结束 //------------------------------------------------企业中心左边菜单配置-------------------------------结束
], ],
}; };
\ No newline at end of file
igirl-web/app/base/service/impl/utilstlbankSve.js
...@@ -399,7 +399,11 @@ class utilsTlBankSve { ...@@ -399,7 +399,11 @@ class utilsTlBankSve {
throw new Error(e.stack); throw new Error(e.stack);
} }
} }
async opOtherCompanyNotify(sveItemCode,orderNo){
if(["zcdy3gy","zcdy6gy","zcdy1n"].indexOf(sveItemCode)>=0) {
//TODO:操作别的公司回调
}
}
async opOtherCompanyNotify(notifyUrl, getParams, opDesc) {//操作别的公司回调信息 async opOtherCompanyNotify(notifyUrl, getParams, opDesc) {//操作别的公司回调信息
try { try {
//日志记录 //日志记录
...@@ -464,7 +468,7 @@ class utilsTlBankSve { ...@@ -464,7 +468,7 @@ class utilsTlBankSve {
var sqlWheres = { code: obj.out_trade_no }; var sqlWheres = { code: obj.out_trade_no };
var orderItem = await this.orderDao.model.findOne({ var orderItem = await this.orderDao.model.findOne({
where: sqlWheres, where: sqlWheres,
attributes: ["id", "code", "name", "busPayOrderCode", "totalSum", "orderStatus", "orderPayStatus", "company_id", "createuser_id", "sveItemCode", "sveItemName", "subType"], attributes: ["id", "code", "name","sveItemCode", "busPayOrderCode", "totalSum", "orderStatus", "orderPayStatus", "company_id", "createuser_id", "sveItemCode", "sveItemName", "subType"],
include: [ include: [
{ model: this.orderDao.db.models.customerinfo, attributes: ["businessLicensePic", "customerType", "identityCardNo", "identityCardPic"] } { model: this.orderDao.db.models.customerinfo, attributes: ["businessLicensePic", "customerType", "identityCardNo", "identityCardPic"] }
] ]
...@@ -474,6 +478,8 @@ class utilsTlBankSve { ...@@ -474,6 +478,8 @@ class utilsTlBankSve {
notifyResult.msg = "对应的业务支付订单号暂无"; notifyResult.msg = "对应的业务支付订单号暂无";
return notifyResult; return notifyResult;
} }
//操作别的回调信息
this.opOtherCompanyNotify(orderItem.sveItemCode,obj.out_trade_no);
if (Number(orderItem.totalSum * 100) != Number(obj.trxamt)) { if (Number(orderItem.totalSum * 100) != Number(obj.trxamt)) {
notifyResult.code = -450; notifyResult.code = -450;
notifyResult.msg = "对应的订单支付金额不符"; notifyResult.msg = "对应的订单支付金额不符";
......
igirl-web/app/front/entry/public/css/pagecom.css
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-web/app/front/vues/pages/myinfo/myinfo.css 0 → 100644
.policy_all
{
width: 95%;
height:810px;
background:rgba(255,255,255,1);
border-radius:2px;
border:1px solid rgba(225,225,225,1);
margin-left: 20px;
margin-top: 20px;
}
.my_info
{
width:100%;
height:50%;
font-size:24px;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(72,72,72,1);
line-height:33px;
margin-left: 8px;
padding-top: 16px;
}
.info
{
widows: 100%;
height:50%;
background:rgba(255,255,255,1);
border-radius:2px;
}
.info_tag
{
width:100px;
height:33px;
font-size:20px;
font-family: PingFangSC-Medium,PingFang SC;
font-weight:500;color:rgba(72,72,72,1);
line-height:33px;
margin-left:1%;
margin-top: 1%;
}
\ No newline at end of file
igirl-web/app/front/vues/pages/myinfo/myinfo.html 0 → 100644
<div class="policy_all">
<div>
<div class="my_info">
<span class="info_tag">个人信息</span>
<hr style="width:98%;height:1px;color:#FF128EE9;align=center;float:top;">
</div>
<div class="info" style="overflow: hidden;">
<img src="/imgs/policy/head1.png" alt="waiting" style="width:120px;height:120px;padding-left: 2%;padding-top: 2%;float: left;">
<div style="padding-left:2%;padding-top:2%;float:left;">
<div style="padding-bottom: 20px;">
<label>手&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;机&nbsp;:</label>
<span style="margin-left: 15px">{{mobile}}</span><br>
</div>
<div style="padding-bottom: 20px;">
<label>登录帐号&nbsp;:</label>
<span style="margin-left: 15px">{{userName}}</span><br>
</div>
<div style="padding-bottom: 20px;">
<label>注册时间&nbsp;:</label>
<span style="margin-left: 15px">{{created_at}}</span><br>
</div>
<div>
<label>公司名称&nbsp;:</label>
<span style="margin-left: 15px">{{companyName}}</span>
</div>
</div>
</div>
<div class="info_tag">我的权益</div>
<hr style="width:98%;height:1px;color:#FF128EE9;align=center">
<div class="demo-image__placeholder">
<div class="block" style="display: flex;margin-left: 5px">
<div style="margin-left: 10px;">
<img src="/imgs/policy/service1.png" alt="">
</div>
<div style="margin-left: 30px;" @click="payClick()">
<img src="/imgs/policy/service2.png" alt="">
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
igirl-web/app/front/vues/pages/myinfo/myinfo.js 0 → 100644
{
template: '${tmpl}',
data: function () {
return {
companyName: "",
userName: null,
created_at: null,
mobile: null,
}
},
created: function () {
console.log(this.$store.state.currentUser);
console.log(this.$store.state.currentCompany);
},
methods: {
payClick() {
console.log(1231231231232);
this.$root.pushx({
title: "支付订阅",
name: "/pay"
});
},
Date_new(str) {
let date = new Date(str),
year = date.getFullYear(),
month = date.getMonth() + 1,
day = date.getDate(),
hours = date.getHours(),
minutes = date.getMinutes();
return `${year}-${month}-${day} ${hours}:${minutes}`
}
},
mounted: function () {
console.log(this.$store.state.currentUser, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxuser");
if (this.$store.state.currentUser) {
this.userName = this.$store.state.currentUser.userName;
this.mobile = this.$store.state.currentUser.mobile;
this.created_at =this.Date_new(this.$store.state.currentUser.created_at);
console.log(this.$store.state.currentUser.created_at, "=================creatae_at")
}
if (this.$store.state.currentCompany) {
this.companyName = this.$store.state.currentCompany.name;
}
console.log(this.$store.state.currentCompany, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
},
vname: "gsb-policymyinfo"
}
\ No newline at end of file
igirl-web/app/front/vues/pages/pay/pay.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="main"> <div class="main">
<h1>政企通订阅</h1> <h1>政企通订阅</h1>
<div class="zhiMain"> <div class="zhiMain">
<div :class="index==ind? \'indItem\ \zhiItem\' : \'zhiItem\'" v-for="(item,ind) in timeList" @click="timeClick(ind)"> <div :class="index==ind? \'indItem\ \zhiItem\' : \'zhiItem\'" v-for="(item,ind) in timeList" @click="timeClick(item,ind)">
<p>{{item.year}}</p> <p>{{item.year}}</p>
<p><span>￥{{item.oldMoney}}</span><span>￥{{item.newMoney}}</span></p> <p><span>￥{{item.oldMoney}}</span><span>￥{{item.newMoney}}</span></p>
</div> </div>
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
<el-input v-model="email" placeholder="请输入内容" type="email"></el-input> <el-input v-model="email" placeholder="请输入内容" type="email"></el-input>
</div> </div>
<h3>实付金额：<span>{{money}}元</span></h3> <h3>实付金额：<span>{{money}}元</span></h3>
<el-button type="primary" @click="btnClick()">去支付</el-button> <el-button type="primary" @click="btnClick();Subscribe()">去支付</el-button>
</div> </div>
</div> </div>
\ No newline at end of file
igirl-web/app/front/vues/pages/pay/pay.js
{ {
template: '${tmpl}', template: '${tmpl}',
data: function() { data: function () {
return { return {
timeList: [{ timeList: [{
year: "3个月", year: "3个月",
oldMoney: 180, oldMoney: 180,
newMoney: 90, newMoney: 90,
code: "zcdy3gy" code: "zcdy3gy"
}, { }, {
year: "6个月", year: "6个月",
oldMoney: 365, oldMoney: 365,
newMoney: 180, newMoney: 180,
code: "zcdy6gy" code: "zcdy6gy"
}, { }, {
year: "1年", year: "1年",
oldMoney: 730, oldMoney: 730,
newMoney: 365, newMoney: 365,
code: "zcdy1n" code: "zcdy1n"
}], }],
email: "", email: "",
money: 90, money: 90,
index: 0, index: 0,
itemCode: "zcdy3gy" itemCode: "zcdy3gy",
}; userId: "",
}, poliyLevel: "",
created: function() { city: "",
Deparment: "",
industry: "",
BeginTime: "",
currentCompany: "",
userName: "",
period: "3个月",
};
},
created: function () {
}, },
mounted: function () {
this.poliyLevel = this.$router.history.current.query.poliyLevel;
this.cities = this.$router.history.current.query.cities;
this.Department = this.$router.history.current.query.Department;
this.industry = this.$router.history.current.query.industry;
if (this.$store.state.currentUser) {
this.userName = this.$store.state.currentUser.userName;
this.userId = this.$store.state.currentUser.id;
console.log(this.userName, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxuser");
}
if (this.$store.state.currentCompany) {
this.currentCompany = this.$store.state.currentCompany.name;
}
console.log(this.$store.state.currentCompany, "BeginTimexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxcurrentCompany");
},
methods: { methods: {
timeClick(ind) { timeClick(item, ind) {
this.period = item.year;
this.index = ind; this.index = ind;
this.itemCode = this.timeList[this.index].code; this.itemCode = this.timeList[this.index].code;
this.money = this.timeList[this.index].newMoney; this.money = this.timeList[this.index].newMoney;
...@@ -71,15 +97,50 @@ ...@@ -71,15 +97,50 @@
this.$root.pushx({ this.$root.pushx({
title: "订单支付", title: "订单支付",
name: "/orderpay", name: "/orderpay",
params: { orderNum: d.data.code } params: {
orderNum: d.data.code
}
}); });
} else { } else {
this.$message.warning(d.msg); this.$message.warning(d.msg);
} }
}) })
} },
}, Subscribe() {
mounted: function() { axios.post('http://106.13.228.212:8010/gsb/Subscribe', {
/*axios.post('http://192.168.18.108:8009/gsb/Subscribe', {*/
"userId": this.userId,
"poliyLevel": this.poliyLevel,
"city": this.cities,
"Departments": this.Department,
"industry": this.industry,
"BeginTime": this.Date_new(new Date()),
/*"BeginTime": new Date(),*/
"Email": this.email,
"comanyname": this.currentCompany,
"username": this.userName,
"period": this.period,
"money": this.money,
}).then(d => {
console.log(d, "mysql----------------------");
console.log(money, "money----------------------");
console.log(String(this.cities), "string----------------------");
console.log(JSON.stringify(this.cities), "cities----------------------");
})
},
Date_new(str) {
/*let date = str || new Date(),*/
let date = new Date(),
year = date.getFullYear(),
month = date.getMonth() + 1,
day = date.getDate(),
hours = date.getHours(),
minutes = date.getMinutes();
second = date.getSeconds();
let a = `${year}-${month}-${day} ${hours}:${minutes}:${second}`;
return a
},
}, },
vname: "gsb-pay" vname: "gsb-pay"
} }
\ No newline at end of file
igirl-web/app/front/vues/pages/policycondition/policycondition.css 0 → 100644
.title {
text-align: center;
margin: 50px 0;
align-items: stretch;
}
.backimg1 {
background-image: url('/imgs/policy/填写条件.png');
background-repeat: no-repeat;
box-shadow: 0px 2px 30px 0px rgba(227, 229, 237, 1);
background-color: rgba(249, 249, 249, 1);
width: 1157px;
border-radius: 10px;
margin: auto;
}
.backimg2 {
width: 1157px;
height: 376px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 2px 30px 0px rgba(227, 229, 237, 1);
background-image: url('/imgs/policy/填写条件(2).png');
background-repeat: no-repeat;
border-radius: 10px;
margin: auto;
}
.backimg3 {
background-image: url('/imgs/policy/填写条件(3).png');
width: 1157px;
height: 573px;
box-shadow: 0px 2px 30px 0px rgba(227, 229, 237, 1);
border-radius: 10px;
background-repeat: no-repeat;
margin: auto;
background-size: 100% 100%;
}
.confirm {
cursor: pointer;
display: inline-block;
width: 160px;
height: 48px;
margin: auto;
padding: 10px;
margin: 7px 6px;
}
.lable {
width: 98px;
margin-right: 40px;
margin-top: 3px;
height: 28px;
font-size: 14px;
background: rgba(18, 142, 233, 1);
text-align: center;
line-height: 28px;
color: rgba(255, 255, 255, 1);
}
.labled {
margin-right: 40px;
width: 98px;
margin-top: 3px;
font-size: 14px;
height: 28px;
background: rgba(237, 237, 237, 1);
text-align: center;
line-height: 28px;
color: rgba(119, 119, 119, 1);
}
.lable1 {
height: 28px;
margin-top: 3px;
font-size: 14px;
cursor: pointer;
background:rgba(237,237,237,1);
padding: 3px 22px;
margin: 8px 17px;
color: rgba(119, 119, 119, 1);
}
.labled1 {
height: 28px;
margin-top: 3px;
font-size: 14px;
cursor: pointer;
background: rgba(18, 142, 233, 1);
padding: 3px 22px;
margin: 8px 17px;
color: rgba(255, 255, 255, 1);
}
.tag {
margin-top: 43px;
display: inline-block;
margin-left: 50%;
width: 319px;
height: 75px;
margin-left: -48px;
background-image: url("/imgs/policy/填写条件(1).png");
}
.title1 {
width: 76px;
height: 25px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
line-height: 25px;
font-weight: 500;
color: rgba(255, 255, 255, 1);
margin-left: 76px;
margin-top: 11px;
}
.title2 {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(255, 255, 255, 1);
margin-left: 52px;
margin-top: -20px;
}
.title3 {
width: 60px;
height: 20px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(34, 34, 34, 1);
line-height: 20px;
margin-left: 20%;
padding-top: 4%;
}
#showlist {
display: none;
}
.bigbao {
width: 90%;
margin: 0 auto;
padding-left: 6%;
}
.l-checkbox-group {
width: 100%;
display: flex;
flex-wrap: wrap;
}
.showCity{display: flex;flex-direction: row;background: red;}
igirl-web/app/front/vues/pages/policycondition/policycondition.html 0 → 100644
<div class="policyconditionall" style="width:1920px;background:rgba(249,249,249,1);">
<div class="title">
<p>填写条件</p> <img src="/imgs/zhiTitle.png" alt="">
</div>
<div class="backimg1" style="margin-top: 20px;">
<div class="tag">
<div class="title1">政策级别</div><br>
<div class="title2">选择发布政策的级别，可多选</div>
</div>
<div style="display: flex;margin-top: 20px;margin-left: 30px;">
<div :class="activeClass == index ? \'lable\' : \'labled\'" v-for="(level,index) in levels"
@click="getlevel(index,level);" :key="index">
<div style="font-size: 14px;cursor: pointer;">
{{level}}
</div>
</div>
</div>
<div>
<div
style="width:3px;height:13px;background:rgba(18,142,233,1);border-radius:3px;margin-top: 33px;margin-left: 32px;display: inline-block;">
</div>
<span
style="width:76px;height:25px;font-size:18px;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:rgba(34,34,34,1);line-height:25px;">
政策级别</span>
<div
style="margin-bottom: 9px;width:223px;height:20px;font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:rgba(34,34,34,1);line-height:20px;margin-left: 40px;">
选择您关注的城市，最多可选三个</div>
</div>
<div style="display: flex;flex-direction: row ;flex-wrap:wrap;width: 96%;margin-left: 4%;padding-bottom: 2%;">
<div :class="item.flag == true ? \'lable\' : \'labled\'" v-for="(item,index) in this.proNames"
style="margin-top: 1%;cursor: pointer;font-size: 14px" @click="selPro(index);">
{{item.name}}
</div>
</div>
<div v-for="(item,index) in address" style="display: flex;flex-direction: row ;">
<div style="width: 5%;margin-top: 2%;margin-left: 3%;font-size: 14px">{{item.proName}}:</div>
<div style="width:95%;display: flex;flex-direction: row;flex-wrap: wrap;">
<div v-for="(cityItem,cityIndex) in item.citys"
:class="cityItem.flag == true ? \'labled1\' : \'lable1\'" @click="sleCity(index,cityIndex)">
<div style="margin-top: 3px;">
{{cityItem.name}}</div>
</div>
</div>
</div>
</div>
<div class="backimg2" style="margin-top: 20px;">
<div class="tag">
<div class="title1">发布部门</div><br>
<div class="title2">选择发布政策的部门，可多选</div>
</div>
<div class="bigbao" id="baowei">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange"
style="margin-top:20px;height:30px;">全选
</el-checkbox>
<div style="margin: 15px 0;"></div>
<el-checkbox-group v-model="checkedfabus" @change="handleCheckedfabusChange">
<el-checkbox v-for="fabu in fabus" :label="fabu" :key="fabu" style="height:40px;width:22%;">{{fabu}}
</el-checkbox>
</el-checkbox-group>
</div>
</div>
<div class="backimg3" style="margin-top: 20px;">
<div class="tag">
<div class="title1">行业类别</div><br>
<div class="title2">选择您关注的行业类别，可多选</div>
</div>
<div class="bigbao" id="baoguoed">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll2" @change="handleCheckAllChange2"
style="margin-top:20px;height:30px">全选
</el-checkbox>
<div style="margin: 15px 0;"></div>
<el-checkbox-group v-model="checkedhangyes" @change="handleCheckedhangyesChange">
<el-checkbox v-for="hangye in hangyes" :label="hangye" :key="hangye" style="height:40px;width: 30%;">
{{hangye}}</el-checkbox>
</el-checkbox-group>
</div>
</div>
<div style="margin-left: 40%">
<button class="confirm" style="background:rgba(18,142,233,1);margin-top: 69px;color: white"
@click="payMoney()">下一步</button>
<button class="confirm" style="background:rgba(231,231,231,1);margin-left: 5%;" @click="back()">返回</button>
</div>
</div>
\ No newline at end of file
igirl-web/app/front/vues/pages/policycondition/policycondition.js 0 → 100644
{
template: '${tmpl}',
data: function () {
return {
address: '',
level: '部委通知',
checkAll: false,
checkAll2: false,
checkedfabus: [],
checkedhangyes: [],
isIndeterminate: false,
levels: [
'部委通知',
'省级通知',
'市级通知',
'区级通知'
],
proNames: [{
name: "北京",
flag: false
},
{
name: "天津",
flag: false
},
{
name: "上海",
flag: false
},
{
name: "重庆",
flag: false
},
{
name: "河北",
flag: false
},
{
name: "河南",
flag: false
},
{
name: "云南",
flag: false
},
{
name: "辽宁",
flag: false
},
{
name: "黑龙江",
flag: false
},
{
name: "湖南",
flag: false
},
{
name: "安徽",
flag: false
},
{
name: "山东",
flag: false
},
{
name: "江苏",
flag: false
},
{
name: "浙江",
flag: false
},
{
name: "江西",
flag: false
},
{
name: "湖北",
flag: false
},
{
name: "新疆",
flag: false
},
{
name: "广西",
flag: false
},
{
name: "甘肃",
flag: false
},
{
name: "山西",
flag: false
},
{
name: "陕西",
flag: false
},
{
name: "内蒙古",
flag: false
},
{
name: "吉林",
flag: false
},
{
name: "福建",
flag: false
},
{
name: "贵州",
flag: false
},
{
name: "广东",
flag: false
},
{
name: "青海",
flag: false
},
{
name: "西藏",
flag: false
},
{
name: "宁夏",
flag: false
},
{
name: "四川",
flag: false
}
],
fabus: ['发改部门', '教育部门', '科学技术部门', '工业和信息化部门', '人社部门', '生态环境部门', '交通运输部门', '农业农村部门', '商务部门', '文化和旅游部门', '知识产权部门', '财政部门', '税务部门', '国防科技部门', '开发区/高新区/自贸区', '市场监督部门'],
hangyes: ['工业', '建筑业', '金融业', '农、林、牧、渔业', '软件、信息传输和信息技术服务业', '住宿和餐饮业', '批发和零售业', '现代服务业', '租赁和商业服务业', '交通运输、仓储和邮政业', '教育和卫生业', '文化、体育和娱乐业', '房地产和物业管理业', '水利、环境和公共设施管理业', '公共管理、社会保障、社会和国际组织', '电力、热力、燃气及水生产和供应业', '其他'],
flag: false,
activeClass: 0,
checkBoxSeleArr: [],
activeClass2Arr: [],
Deparment: '',
industry: '',
Email: '',
address: [],
dataNew: {}
}
},
created: function () {
},
mounted: function () {
this.selPro(0);
},
methods: {
selPro(index) {
console.log(this.address, "hhhhhhhhhhhhhhhhhhhhhhhhhh");
if (this.proNames[index].flag) {
this.proNames[index].flag = false;
for (let i = 0; i < this.address.length; i++) {
if (this.address[i] && this.address[i].proName == this.proNames[index].name) {
console.log(index, "aaaaaaaaaaaaaaaaaaaaaaa");
this.address.splice(i, 1);
}
}
} else {
if (this.address.length >= 3) {
return this.$message({
showClose: true,
message: "最多选择3个",
type: "warning",
})
}
this.proNames[index].flag = true;
let dataNew = {};
this.address.push(dataNew);
console.log(this.address, "jjjjjjjjjjjjjj");
axios.post('http://106.13.228.212:8009/gsb/zc/citylist', {
"address": this.proNames[index].name,
}).then(d => {
for (let i = 0; i < d.data.length; i++) {
console.log("kkklll");
for (let key in d.data[i]) {
dataNew.proName = key;
dataNew.citys = [];
if (i == 0) {
dataNew.flag = true;
} else {
dataNew.flag = false;
}
let _cityArray = d.data[i][key];
for (let j = 0; j < _cityArray.length; j++) {
let _temp = {};
_temp.name = _cityArray[j];
if (j == 0) {
_temp.flag = true;
} else {
_temp.flag = false;
}
dataNew.citys.push(_temp);
console.log(dataNew, "kkkkkkkkkkk");
}
}
}
this.$forceUpdate();
})
}
console.log(this.address.length, "===========length");
},
sleCity(index, cityIndex) {
this.address[index].citys[cityIndex].flag = !this.address[index].citys[cityIndex].flag;
this.$forceUpdate();
console.log(this.address[index].citys[cityIndex].flag, "0000000000000000000000");
},
format(_arryCitys) {
for (let i = 0; i < _arryCitys.length; i++) {
let temp = [];
for (let element of _arryCitys[i].citys) {
if (element.flag) {
temp.push(element);
}
}
_arryCitys[i].citys = temp;
}
return _arryCitys;
},
getlevel(index, level) {
console.log(level, '4444444');
this.activeClass = index;
this.level = level;
},
handleCheckAllChange(val) {
this.checkedfabus = val ? this.fabus : [];
this.isIndeterminate = false;
},
handleCheckAllChange2(val) {
this.checkedhangyes = val ? this.hangyes : [];
this.isIndeterminate = false;
},
handleCheckedfabusChange(value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.fabus.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.fabus.length;
},
handleCheckedhangyesChange(value) {
let checkedCount = value.length;
this.checkAll2 = checkedCount === this.hangyes.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.hangyes.length;
},
payMoney() {
console.log("黄静" + JSON.stringify(this.address));
let _arryCitys = this.format(this.address);
console.log(JSON.stringify(_arryCitys) + "黄静");
this.$root.pushx({
title: "支付订阅",
name: "/pay",
params: {
"poliyLevel": this.level,
"cities": _arryCitys,
"Department": this.checkedfabus,
"industry": this.checkedhangyes,
},
})
},
back() {
this.$root.pushx({
title: "政策推送",
name: "/subscription",
})
},
},
computed: {
},
vname: "gsb_policycondition"
}
\ No newline at end of file
igirl-web/app/front/vues/pages/policyorder/policyorder.css 0 → 100644
.policyorder {
width: 95%;
height: 810px;
border-radius: 2px;
border: 1px solid rgba(225, 225, 225, 1);
margin-left: 20px;
margin-top: 20px;
background: #fff;
}
.link{
display: inline-block
}
.el-tab-pane {
background: #fff !important;
}
.el-tabs__item {
font-size: 16px;
}
.policycontent {
width: 95%;
background: rgba(255, 255, 255, 1);
height: 258px;
border: 1px solid rgba(225, 225, 225, 1);
margin-top: 20px;
margin-left: 10px;
}
.el-tabs__nav-scroll {
padding-top: 17px;
padding-left: 0px;
}
.orderlable {
background: rgba(234, 248, 255, 1);
height: 60px;
}
.orderdate {
float: left;
margin-left: 30px;
margin-top: 17px;
letter-spacing: 1px;
}
.ordernu {
float: left;
margin-left: 45px;
margin-top: 17px;
letter-spacing: 1px;
}
.server_status {
padding-top: 17px;
padding-left: 1445px;
vertical-align: middle;
}
.push {
margin-top: 35px;
margin-left: 23px
}
.push_img {
display: inline-block;
vertical-align: middle;
}
.Subscribe {
width: 65px;
display: inline-block;
margin-left: 22px;
font-family: PingFangSC-Regular, PingFang SC;
}
.period {
font-family: PingFangSC-Regular, PingFang SC;
color: rgba(153, 153, 153, 1);
display: inline-block;
margin-left: 22px;
}
.year {
width: 38px;
height: 22px;
border-radius: 3px;
height: 20px;
margin-left: 15px;
display: inline-block;
border: 1px solid rgba(18, 142, 233, 1);
text-align: center;
}
.money{
display: inline-block;
color: red;
margin-left: 25%;
}
.remaining{
display: inline-block;
color: rgba(72,72,72,1);
font-family:PingFangSC-Regular;
margin-left: 29%;
}
\ No newline at end of file
igirl-web/app/front/vues/pages/policyorder/policyorder.html 0 → 100644
<div class="policyorder">
<el-tabs v-model="activeName" @tab-click="handleClick(activeName)">
<el-tab-pane label="全部" name="first">
<div class= "Line" style="width: 96%;border-top: 2px solid #eee;"></div>
<div class= "Line" style="border-top: 2px solid rgba(18, 142, 233, 1);margin-left: 0.5%;width: 3%;"></div>
<div class="policycontent">
<div class="orderlable">
<div class="orderdate"><b>{{BeginTime}}</b></div>
<div class="ordernu">订单号:&nbsp;&nbsp;{{pid}}</div>
<div class="server_status">
<img src="/imgs/policy/服务.png" alt="">&nbsp;
<b>{{label}}</b>
</div>
<div class="push">
<div class="push_img">
<img src="/imgs/policy/推送@2x.png">
</div>
<div class="Subscribe">政策订阅</div>
<div class="period">周期:</div>
<div class="year">{{period}}</div>
<div class="money">￥<b>{{money}}</b></div>
<div class="remaining">剩余<b
style="color: rgba(18,142,233,1);font-family: PingFang SC;font-size: 20px;">{{Remain}}</b>天
</div>
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="待支付" name="second">
<div style="width: 96%;border-top: 2px solid #eee;"></div>
<div class= "Line" style="width: 6%;border-top: 2px solid rgba(18, 142, 233, 1);margin-left: 4.8%;width: 3%;"></div>
<!-- <div class="policycontent" v-for="(item,key) in recommendationsArr"> -->
<div class="policycontent">
<div class="orderlable">
<div class="orderdate"><b>{{BeginTime}}</b></div>
<div class="ordernu">订单号:&nbsp;&nbsp;{{pid}}</div>
<div class="server_status">
<img src="/imgs/policy/服务.png" alt="">&nbsp;
<b>待支付</b>
</div>
<div class="push">
<div class="push_img">
<img src="/imgs/policy/推送@2x.png">
</div>
<div class="Subscribe">政策订阅</div>
<div class="period">周期:</div>
<div class="year">{{period}}</div>
<div class="money">￥<b>{{money}}</b></div>
<div class="remaining">剩余<b
style="color: rgba(18,142,233,1);font-family: PingFang SC;font-size: 20px;">{{Remain}}</b>天
</div>
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="服务中" name="third">
<div style="width: 96%;border-top: 2px solid #eee;"></div>
<div class= "Line" style="border-top: 2px solid rgba(18, 142, 233, 1);margin-left:9.7%;width: 3%;"></div>
<!-- <div class="policycontent" v-for="(item,key) in recommendationsArr"> -->
<div class="policycontent">
<div class="orderlable">
<div class="orderdate"><b>{{BeginTime}}</b></div>
<div class="ordernu">订单号:&nbsp;&nbsp;{{pid}}</div>
<div class="server_status">
<img src="/imgs/policy/服务.png" alt="">&nbsp;
<b>服务中</b>
</div>
<div class="push">
<div class="push_img">
<img src="/imgs/policy/推送@2x.png">
</div>
<div class="Subscribe">政策订阅</div>
<div class="period">周期:</div>
<div class="year">{{period}}</div>
<div class="money">￥<b>{{money}}</b></div>
<div class="remaining">剩余<b
style="color: rgba(18,142,233,1);font-family: PingFang SC;font-size: 20px;">{{Remain}}</b>天
</div>
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="已服务" name="fourth">
<div style="width: 96%;border-top: 2px solid #eee;"></div>
<div class= "Line" style="border-top: 2px solid rgba(18, 142, 233, 1);margin-left: 14.6%;width: 3%;"></div>
<!-- <div class="policycontent" v-for="(item,key) in recommendationsArr"> -->
<div class="policycontent">
<div class="orderlable">
<div class="orderdate"><b>{{BeginTime}}</b></div>
<div class="ordernu">订单号:&nbsp;&nbsp;{{pid}}</div>
<div class="server_status">
<img src="/imgs/policy/服务.png" alt="">&nbsp;
<b>已服务</b>
</div>
<div class="push">
<div class="push_img">
<img src="/imgs/policy/推送@2x.png">
</div>
<div class="Subscribe">政策订阅</div>
<div class="period">周期:</div>
<div class="year">{{period}}</div>
<div class="money">￥<b>{{money}}</b></div>
<div class="remaining">剩余<b
style="color: rgba(18,142,233,1);font-family: PingFang SC;font-size: 20px;">{{Remain}}</b>天
</div>
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="已失效" name="fifth">
<div style="width: 96%;border-top: 2px solid #eee;"></div>
<div class= "Line" style="border-top: 2px solid rgba(18, 142, 233, 1);margin-left: 19.6%;width: 3%;"></div>
<!-- <div class="policycontent" v-for="(item,key) in recommendationsArr"> -->
<div class="policycontent">
<div class="orderlable">
<div class="orderdate"><b>{{BeginTime}}</b></div>
<div class="ordernu">订单号:&nbsp;&nbsp;{{pid}}</div>
<div class="server_status">
<img src="/imgs/policy/服务.png" alt="">&nbsp;
<b>已失效</b>
</div>
<div class="push">
<div class="push_img">
<img src="/imgs/policy/推送@2x.png">
</div>
<div class="Subscribe">政策订阅</div>
<div class="period">周期:</div>
<div class="year">{{period}}</div>
<div class="money">￥<b>{{money}}</b></div>
<div class="remaining">剩余<b
style="color: rgba(18,142,233,1);font-family: PingFang SC;font-size: 20px;">{{Remain}}</b>天
</div>
</div>
</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
\ No newline at end of file
igirl-web/app/front/vues/pages/policyorder/policyorder.js 0 → 100644
{
template: '${tmpl}',
data: function () {
return {
activeName: 'first',
label:"",
BeginTime,"",
pid:"",
period:"",
money:"",
Remain:"",
userId:"",
}
},
mounted: function () {
if (this.$store.state.currentUser) {
this.userId = this.$store.state.currentUser.id;
console.log(this.userName, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxuser");
}
},
created: function () {
},
methods: {
handleClick(activeName) {
console.log(activeName, "pppppppp");
},
Select() {
axios.post('http://106.13.228.212:8009/gsb/zc/citylist', {
"label": this.label,
"userId":this.userId,
}).then(d => {
this.label=d.data.lable;
this.BeginTime = d.data.BeginTime;
this.pid = d.data.pid;
this.period = d.data.period;
this.money = d.data.money;
this.Remain = d.data.Remain;
})
},
},
computed: {
labelNew: function(){
if (this.activeName =='first'){
this.label = "全部"
}if (this.activeName =='second') {
this.label = "待支付"
} if (this.activeName =='third') {
this.label = "服务中"
}if (this.activeName =='fourth') {
this.label = "已服务"
} else {
this.label = "已失效"
}
console.log(this.activeName,"this.activeName");
console.log(this.label,"this.label");
}
},
vname: "policyorder"
}
\ No newline at end of file
igirl-web/app/front/vues/pages/policyquery/policyquery.js
...@@ -240,6 +240,7 @@ ...@@ -240,6 +240,7 @@
var color = this.colorList[Math.floor(Math.random()*this.colorList.length)]; var color = this.colorList[Math.floor(Math.random()*this.colorList.length)];
return `color:${color.fontColor};background-color:${color.bgColor}`; return `color:${color.fontColor};background-color:${color.bgColor}`;
}, },
inputDel(input) { inputDel(input) {
console.log(input); console.log(input);
this[input] = ''; this[input] = '';
......
igirl-web/app/front/vues/pages/subscription/subscription.js
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
payClick(){ payClick(){
console.log(1231231231232); console.log(1231231231232);
this.$root.pushx({ this.$root.pushx({
title: "支付订阅", title: "填写条件",
name: "/pay" name: "/policycondition"
}); });
} }
}, },
......
igirl-web/package-lock.json
...@@ -670,6 +670,22 @@ ...@@ -670,6 +670,22 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz",
"integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==" "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="
}, },
"axios": {
"version": "0.19.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
"integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
"requires": {
"follow-redirects": "1.5.10",
"is-buffer": "^2.0.2"
},
"dependencies": {
"is-buffer": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
"integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
}
}
},
"babel-helper-vue-jsx-merge-props": { "babel-helper-vue-jsx-merge-props": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz", "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
...@@ -3868,6 +3884,29 @@ ...@@ -3868,6 +3884,29 @@
"readable-stream": "^2.3.6" "readable-stream": "^2.3.6"
} }
}, },
"follow-redirects": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
"requires": {
"debug": "=3.1.0"
},
"dependencies": {
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"requires": {
"ms": "2.0.0"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
}
}
},
"for-in": { "for-in": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
......
igirl-web/package.json
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"dependencies": { "dependencies": {
"after": "^0.8.2", "after": "^0.8.2",
"ali-oss": "^4.12.2", "ali-oss": "^4.12.2",
"axios": "^0.19.0",
"base64id": "^1.0.0", "base64id": "^1.0.0",
"bluebird": "^3.5.1", "bluebird": "^3.5.1",
"body-parser": "^1.18.2", "body-parser": "^1.18.2",
...@@ -25,7 +26,7 @@ ...@@ -25,7 +26,7 @@
"dev": "^0.1.3", "dev": "^0.1.3",
"easyimage": "^3.1.0", "easyimage": "^3.1.0",
"ejs": "^2.5.8", "ejs": "^2.5.8",
"element-ui": "^2.4.0", "element-ui": "^2.13.0",
"engine.io-parser": "^2.1.2", "engine.io-parser": "^2.1.2",
"errorhandler": "^1.5.0", "errorhandler": "^1.5.0",
"exceljs": "^1.6.3", "exceljs": "^1.6.3",
......
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