Compare commits

..

No commits in common. '212b43a974a681871cda694449616bccf2a62b84' and 'ea19bd16eda711ba5106b8876251a3292eec054d' have entirely different histories.

Binary file not shown.

@ -12,7 +12,6 @@
"core-js": "^3.6.5", "core-js": "^3.6.5",
"less": "^4.1.2", "less": "^4.1.2",
"less-loader": "5.0.0", "less-loader": "5.0.0",
"moment": "^2.29.2",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-router": "^3.5.3", "vue-router": "^3.5.3",

Binary file not shown.

@ -14,8 +14,6 @@ export const form = {
contactsAddressDetail: '', contactsAddressDetail: '',
idCardFrontImgUrls:[], idCardFrontImgUrls:[],
idCardBackImgUrls:[], idCardBackImgUrls:[],
licenseTimeStart: '',
licenseTimeEnd: '',
businessLicenseImgUrls:[], businessLicenseImgUrls:[],
othersImgUrls:[], othersImgUrls:[],
} }

@ -22,7 +22,7 @@
<div class="content"> <div class="content">
<div class="top" v-if="companyInfo == null"> <div class="top" v-if="companyInfo == null">
<span style="margin-left: 30px"> <span style="margin-left: 30px">
<div class="top-a">你好欢迎使用小蜜蜂</div> <div class="top-a">你好{{ username }}</div>
<div class="top-b">请尽快绑定企业信息进行下一步</div> <div class="top-b">请尽快绑定企业信息进行下一步</div>
</span> </span>
<span> <span>
@ -64,10 +64,11 @@
}}</a-col }}</a-col
> >
</a-col> </a-col>
<a-col :span="5" style="line-height:130px;margin-top:-20px"> <a-col :span="5" style="line-height:130px;margin-top:-20px"
<!-- <a-button shape="round" size="default" @click="editCompany()" ><a-button shape="round" size="default" @click="editCompany()"
>修改公司信息</a-button> --> >修改公司信息</a-button
</a-col> ></a-col
>
</a-row> </a-row>
</div> </div>
</div> </div>
@ -76,7 +77,7 @@
<a-col :span="18"> <a-col :span="18">
<div class="card-a"> <div class="card-a">
<div class="cardTitle">小区后台</div> <div class="cardTitle">小区后台</div>
<div class="card-a-content" v-if="companyInfo != null"> <div class="card-a-content">
<div v-if="estateList != null"> <div v-if="estateList != null">
<div style="color: #d53131" v-show="estateList == null"> <div style="color: #d53131" v-show="estateList == null">
当前尚未添加小区信息 当前尚未添加小区信息
@ -89,8 +90,8 @@
:key="index" :key="index"
> >
<template slot="actions" class="ant-card-actions"> <template slot="actions" class="ant-card-actions">
<span><a @click="handlerBound(item)"></a></span> <span @click="handlerBound(item)"></span>
<span><a @click="handlerDetail(item)"></a></span> <span @click="handlerDetail(item)"></span>
</template> </template>
<a-card-meta <a-card-meta
:title="item.name" :title="item.name"
@ -106,9 +107,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-a-content" v-else>
<span style="margin-left:24px">入住企业申请通过后才可添加小区/订单</span>
</div>
</div> </div>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
@ -149,7 +147,7 @@
}}<span style="color: #00000073; font-size: 14px">到期</span> }}<span style="color: #00000073; font-size: 14px">到期</span>
</div> </div>
<template slot="actions" class="ant-card-actions"> <template slot="actions" class="ant-card-actions">
<!-- <span><a>续费</a></span> --> <span><a>续费</a></span>
<span><a @click="unbound(item)"></a></span> <span><a @click="unbound(item)"></a></span>
<span><a @click="orderDetail(item)"></a></span> <span><a @click="orderDetail(item)"></a></span>
<!-- <span>支付</span> <!-- <span>支付</span>
@ -162,14 +160,11 @@
</div> </div>
</a-card> </a-card>
</div> </div>
<div class="card-b-content" v-else-if="companyInfo != null"> <div class="card-b-content" v-else>
<div>当前无订单</div> <div>当前无订单</div>
<div>请购买后台功能</div> <div>请购买后台功能</div>
<a @click="newOrder"> </a> <a @click="newOrder"> </a>
</div> </div>
<div class="card-b-content" v-else>
<!-- <span>入住企业申请通过后才可添加小区/订单</span> -->
</div>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
@ -234,25 +229,6 @@
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>
</a-drawer> </a-drawer>
<a-drawer title="小区详情" :visible="orderVisible" @close="orderClose" width="512">
<a-descriptions :column="1" layout="vertical">
<a-descriptions-item label="订单号">
{{orderInfoDetail.code}}
</a-descriptions-item>
<a-descriptions-item label="订单状态">
{{orderInfoDetail.status==1?'未绑定':2?'业务受理中':3?'生效中':'已失效'}}
</a-descriptions-item>
<a-descriptions-item label="购买功能">
<a-tag v-for="(item,index) in orderInfoDetail.includeFunctionModelList" :key="index">{{item}}</a-tag>
</a-descriptions-item>
<a-descriptions-item label="价格">
¥ <span style="color: red">{{(orderInfoDetail.price*1).toFixed(2)}}</span>
</a-descriptions-item>
<a-descriptions-item label="有效日期至">
{{(orderInfoDetail.expirationDate)}}
</a-descriptions-item>
</a-descriptions>
</a-drawer>
</div> </div>
</template> </template>
@ -292,10 +268,7 @@ export default {
boundForm: {communityId: undefined, adminFunctionOrderId: undefined}, boundForm: {communityId: undefined, adminFunctionOrderId: undefined},
// //
villageVisible: false, villageVisible: false,
villageData: {}, villageData: {}
//
orderInfoDetail: {},
orderVisible: false
}; };
}, },
mounted() { mounted() {
@ -366,8 +339,6 @@ export default {
}, },
// //
orderDetail(val) { orderDetail(val) {
this.orderInfoDetail = val;
this.orderVisible = true;
}, },
// //
handlerDetail(val) { handlerDetail(val) {
@ -380,9 +351,6 @@ export default {
villageClose() { villageClose() {
this.villageVisible = false this.villageVisible = false
}, },
orderClose() {
this.orderVisible = false
},
// //
unbound(val) { unbound(val) {
let obj = {adminFunctionOrderId : val.id} let obj = {adminFunctionOrderId : val.id}
@ -444,9 +412,9 @@ export default {
padding-top: 10px; padding-top: 10px;
min-height: 600px; min-height: 600px;
.card-a-content { .card-a-content {
color: #00000073; color: #00000073;
font-size: 14px; font-size: 14px;
padding: 13px; padding: 13px;
.cardBox { .cardBox {
display: flex; display: flex;
flex-direction: row; flex-direction: row;

@ -3,12 +3,10 @@
<div class="main-content"> <div class="main-content">
<div class="cardTitle">添加订单信息</div> <div class="cardTitle">添加订单信息</div>
<div class="content"> <div class="content">
<a-form-model ref="order" :model="form" :labelCol="{span: 2}" :wrapperCol="{span: 8}" :rules="rules"> <a-form-model :labelCol="{span: 2}" :wrapperCol="{span: 8}" :rules="rules">
<!-- <a-form-model-item label="订单号"> <!-- <a-form-model-item label="订单号">
<a-input v-model="form.code" ></a-input> <a-input v-model="form.code" ></a-input>
</a-form-model-item> --> </a-form-model-item> -->
<a-row>
<a-col :span="24">
<a-form-model-item label="支付类型" prop="payType"> <a-form-model-item label="支付类型" prop="payType">
<a-select v-model="form.payType"> <a-select v-model="form.payType">
<a-select-option :value="1">线下</a-select-option> <a-select-option :value="1">线下</a-select-option>
@ -16,8 +14,6 @@
<a-select-option :value="3">微信</a-select-option> <a-select-option :value="3">微信</a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="选择收费模版" prop="chargingTemplateId"> <a-form-model-item label="选择收费模版" prop="chargingTemplateId">
<a-select v-model="form.chargingTemplateId" @change="modelChange"> <a-select v-model="form.chargingTemplateId" @change="modelChange">
<a-select-option :value="item.id" v-for="(item, index) in modelData" :key="index"> <a-select-option :value="item.id" v-for="(item, index) in modelData" :key="index">
@ -25,13 +21,9 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="选择功能模块" prop="modelFunctionId"> <a-form-model-item label="选择功能模块" prop="modelFunctionId">
<a-checkbox-group v-model="form.modelFunctionId" :options="functionType" @change="functionChange" /> <a-checkbox-group v-model="form.modelFunctionId" :options="functionType" @change="functionChange" />
</a-form-model-item> </a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="选择有效时长" prop="timeTypeId"> <a-form-model-item label="选择有效时长" prop="timeTypeId">
<a-select v-model="form.timeTypeId" @change="timeChange"> <a-select v-model="form.timeTypeId" @change="timeChange">
<a-select-option :value="item.id" v-for="(item, index) in timeType" :key="index"> <a-select-option :value="item.id" v-for="(item, index) in timeType" :key="index">
@ -42,13 +34,9 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="购买金额"> <a-form-model-item label="购买金额">
<span style="color: red">¥ {{form.payPrice}}</span> <span style="color: red">¥ {{form.payPrice}}</span>
</a-form-model-item> </a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="绑定小区" prop="communityId"> <a-form-model-item label="绑定小区" prop="communityId">
<a-select v-model="form.communityId"> <a-select v-model="form.communityId">
<a-select-option :value="item.id" v-for="(item, index) in comData" :key="index"> <a-select-option :value="item.id" v-for="(item, index) in comData" :key="index">
@ -56,8 +44,6 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col>
</a-row>
</a-form-model> </a-form-model>
</div> </div>
<div class="cardTitle">高级配置</div> <div class="cardTitle">高级配置</div>
@ -116,11 +102,11 @@ export default {
customizedDemand: '' // customizedDemand: '' //
}, },
rules: { rules: {
payType: [{ required: true, message: "请选择类型", trigger: "change" }], payType: [{ required: true, message: "请选择类型", trigger: "blur" }],
chargingTemplateId: [{ required: true, message: "请选择模版", trigger: "change" }], chargingTemplateId: [{ required: true, message: "请选择模版", trigger: "blur" }],
modelFunctionId: [{ required: true, message: "请选择模块", trigger: "change" }], modelFunctionId: [{ required: true, message: "请选择模块", trigger: "blur" }],
timeTypeId: [{ required: true, message: "请选择时长", trigger: "change" }], timeTypeId: [{ required: true, message: "请选择时长", trigger: "blur" }],
communityId: [{ required: true, message: "请选择小区", trigger: "change" }], communityId: [{ required: true, message: "请选择小区", trigger: "blur" }],
}, },
comData: [], // comData: [], //
// //
@ -163,12 +149,10 @@ export default {
modelFunctionId: this.form.modelFunctionId, modelFunctionId: this.form.modelFunctionId,
timeTypeId: this.form.timeTypeId timeTypeId: this.form.timeTypeId
}; };
if(obj.modelFunctionId.length != 0) { calcAmount(obj).then(res => {
calcAmount(obj).then(res => { let data = res.data;
let data = res.data; this.form.payPrice = data * 1
this.form.payPrice = data * 1 });
});
}
} }
}, },
modelChange(val) { modelChange(val) {
@ -220,16 +204,12 @@ export default {
} }
}, },
addConfirm() { addConfirm() {
this.$refs.order.validate((valid) => { createOrder(this.form).then((res) => {
if(valid) { if (res.code === 200) {
createOrder(this.form).then((res) => { this.$message.success(res.msg);
if (res.code === 200) { this.$router.go(-1);
this.$message.success(res.msg); } else {
this.$router.go(-1); this.$message.error(res.msg);
} else {
this.$message.error(res.msg);
}
})
} }
}) })
}, },
@ -243,6 +223,5 @@ export default {
<style lang="less"> <style lang="less">
.main-content { .main-content {
margin-left: 125px; margin-left: 125px;
width: 1400px
} }
</style> </style>

@ -32,10 +32,7 @@
v-model="form.code" v-model="form.code"
style="width: 60%; margin-right: 10px" style="width: 60%; margin-right: 10px"
/> />
<!-- <a-button type="primary" @click="getCode"></a-button> --> <a-button type="primary" @click="getCode"></a-button>
<a-button type="primary" @click="getCode" :disabled="inCodeGap">
{{inCodeGap == false ? '获取验证码' : codeGap+'s后再次获取'}}
</a-button>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item
><div class="cardTitle">基础信息</div></a-form-model-item ><div class="cardTitle">基础信息</div></a-form-model-item
@ -102,13 +99,14 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- licenseTimeStart licenseTimeEnd -->
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item <a-form-model-item
label="营业执照有效期限开始时间" label="营业执照有效期限开始时间"
prop="licenseTimeStart" prop="licenseTimeStart"
> >
<a-date-picker v-model="form.licenseTimeStart" :disabledDate="disabledStartDate" value-format="YYYY-MM-DD HH:mm:ss"/> <a-date-picker v-model="form.licenseTimeStart" value-format="YYYY-MM-DD HH:mm:ss"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@ -116,23 +114,23 @@
label="营业执照有效期限结束时间(如长期可不选)" label="营业执照有效期限结束时间(如长期可不选)"
prop="licenseTimeEnd" prop="licenseTimeEnd"
> >
<a-date-picker v-model="form.licenseTimeEnd" :disabledDate="disabledEndDate" value-format="YYYY-MM-DD HH:mm:ss"/> <a-date-picker v-model="form.licenseTimeEnd" value-format="YYYY-MM-DD HH:mm:ss"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
<a-form-model-item label="法人身份证"> <a-form-model-item label="法人身份证">
<span> <span
<span style="color: #8c8c8c">请上传法人身份证正面照反面照</span> ><span style="color: #1f519b">请上传法人身份证正面照反面照</span
<span style="color: #8c8c8c">文件大小不超过5mb支持jpgpng格式</span> >文件大小不超过5mb支持jpgpng格式</span
</span> >
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<span style="color: #8c8c8c">头像面</span> 头像面
<!-- idCardFrontImgUrls --> <!-- idCardFrontImgUrls -->
<commonUpload @handleChange='handleChange($event,1)'/> <commonUpload @handleChange='handleChange($event,1)'/>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<span style="color: #8c8c8c">国徽面</span> 国徽面
<!-- idCardBackImgUrls --> <!-- idCardBackImgUrls -->
<commonUpload @handleChange='handleChange($event,2)'/> <commonUpload @handleChange='handleChange($event,2)'/>
</a-col> </a-col>
@ -140,10 +138,10 @@
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="营业执照"> <a-form-model-item label="营业执照">
<!-- businessLicenseImgUrls --> <!-- businessLicenseImgUrls -->
<span> <span
<span style="color: #8c8c8c">请上传公司营业执照</span> ><span style="color: #1f519b">请上传公司营业执照</span
<span style="color: #8c8c8c">文件大小不超过5mb支持jpgpng格式</span> >文件大小不超过5mb支持jpgpng格式</span
</span> >
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
公司营业执照 公司营业执照
@ -154,11 +152,9 @@
<!-- othersImgUrls --> <!-- othersImgUrls -->
<a-form-model-item label="其他附件"> <a-form-model-item label="其他附件">
<span <span
><span style="color: #8c8c8c" ><span style="color: #1f519b"
>如从事某些特定行业需要上传对应的资质证书</span >如从事某些特定行业需要上传对应的资质证书</span
> >文件大小不超过5mb支持jpgpng格式</span
<span style="color: #8c8c8c">文件大小不超过5mb支持jpgpng格式</span>
</span
> >
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
@ -199,10 +195,8 @@
</template> </template>
<script> <script>
import moment from "moment";
import { settledInsert } from "@/api/basic/console"; import { settledInsert } from "@/api/basic/console";
import { allCity } from "@/api/public"; import { allCity } from "@/api/public";
import { sendTelCode } from "@/api/public/login";
import { form, rules, cascaderConfig } from "./depend/settledForm"; import { form, rules, cascaderConfig } from "./depend/settledForm";
export default { export default {
data() { data() {
@ -214,8 +208,6 @@ export default {
form, form,
rules, rules,
city: [], city: [],
inCodeGap: false,
codeGap: 60,
}; };
}, },
created() { created() {
@ -230,25 +222,7 @@ export default {
}) })
}, },
// //
getCode() { getCode() {},
let num = setInterval(() => {
this.inCodeGap = true;
this.codeGap -= 1;
if(this.codeGap < 1) {
clearInterval(num);
if(this.codeGap < 1) {
this.inCodeGap = false;
this.codeGap = 60;
}
}
},1000)
sendTelCode({ tel: this.form.tel }).then((res) => {
if (res) {
// this.$message.success("");
this.$message.success(res.msg);
}
});
},
companyChange(data) { companyChange(data) {
this.form.companyAddress = data[2]; this.form.companyAddress = data[2];
}, },
@ -294,21 +268,6 @@ export default {
resetForm() { resetForm() {
this.$refs.ruleForm.resetFields(); this.$refs.ruleForm.resetFields();
}, },
//
disabledStartDate(startValue) {
let endValue = moment(this.form.licenseTimeEnd);
if (!startValue || !endValue) {
return false;
}
return startValue > endValue;
},
disabledEndDate(endValue) {
let startValue = moment(this.form.licenseTimeStart);
if (!endValue || !startValue) {
return false;
}
return startValue >= endValue;
}
}, },
}; };
</script> </script>

@ -2,7 +2,7 @@
<div class="bg"> <div class="bg">
<div class="logo-box"> <div class="logo-box">
<img src="@/assets/images/logo.png" alt="" /> <img src="@/assets/images/logo.png" alt="" />
<span class="title">小蜜蜂系统控制台</span> <span class="title">智慧小区后台管理系统</span>
</div> </div>
<div class="login-box"> <div class="login-box">
<a-row> <a-row>

@ -4,9 +4,9 @@
<div class="search-box"> <div class="search-box">
<a-space size="large"> <a-space size="large">
<a-descriptions layout="vertical"> <a-descriptions layout="vertical">
<!-- <a-descriptions-item label="余额"> <a-descriptions-item label="余额">
¥ <span class="total-amount">5112</span> ¥ <span class="total-amount">5112</span>
</a-descriptions-item> --> </a-descriptions-item>
</a-descriptions> </a-descriptions>
</a-space> </a-space>
</div> </div>

Loading…
Cancel
Save