·

.env.development

@@ -1,3 +1,3 @@
 NODE_ENV = 'development'
-VUE_APP_URL = 'http://121.41.26.2251:8002/admin'
+VUE_APP_URL = 'http://121.41.26.225:8002/admin'
-VUE_APP_STATIC = 'http://121.41.26.2251:8002/admin'
+VUE_APP_STATIC = 'https://saas.kaidalai.cn/resource/admin'

.env.production

@@ -1,3 +1,3 @@
 NODE_ENV  = 'production'
 VUE_APP_URL = 'https://saas.kaidalai.cn/api/admin'
-VUE_APP_STATIC = 'https://saas.kaidalai.cn/api/admin'
+VUE_APP_STATIC = 'https://saas.kaidalai.cn/resource'

src/api/basic/community/index.js

@@ -1,9 +1,9 @@
 import httpService from "@/request"
 
-// 获取预报列表
+// 小区
 export function functionName(params) {
 	return httpService({
-		url: `url`,
+		url: `/user/community/getCommunityInfoByCompanyId`,
 		method: 'post',
 		data: params,
 	})

src/api/basic/console/index.js

@@ -0,0 +1,18 @@
+import httpService from "@/request"
+
+// 获取控制台信息
+export function consoleShow(params) {
+	return httpService({
+		url: `/user/console/show`,
+		method: 'get',
+		params: params,
+	})
+}
+// 入驻申请
+export function settledInsert(params) {
+	return httpService({
+		url: `/user/settledApplication/insert`,
+		method: 'post',
+		data: params,
+	})
+}

src/api/public/login/index.js

@@ -3,7 +3,7 @@ import httpService from "@/request"
 // 注册
 export function register(params) {
 	return httpService({
-		url: `/register`,
+		url: `register`,
 		method: 'post',
 		data: params,
 	})
@@ -24,7 +24,7 @@ export function loginTelCode(params) {
 		data: params,
 	})
 }
-// 验证码
+// 获取登录验证码
 export function sendTelCode(params) {
 	return httpService({
 		url: `/sendTelCode`,
@@ -32,3 +32,19 @@ export function sendTelCode(params) {
 		data: params,
 	})
 }
+// 注册验证码
+export function sendRegisterCode(params) {
+	return httpService({
+		url: `/sendTelRegisterCode`,
+		method: 'post',
+		data: params,
+	})
+}
+// 用户信息
+export function userInfo(params) {
+	return httpService({
+		url: `/user/getUserInfo`,
+		method: 'get',
+		params: params,
+	})
+}

src/request/index.js

@@ -25,7 +25,7 @@ function filterRequestData(obj) {
 }
 //创建axios的实例
 const httpService = axios.create({
-	baseURL: process.env.VUE_APP_URL,// TODO:具体的配置可以根据项目情况而来
+	baseURL: process.env.VUE_APP_URL ,// TODO:具体的配置可以根据项目情况而来
 	timeout: 5000
 })
 

src/utils/util.js

@@ -6,7 +6,7 @@ export default {
 		Vue.prototype.$axios = axios
 		Vue.prototype.qs = qs
 		// 上传
-		Vue.prototype.$upload = process.env.VUE_APP_URL + 'admin/user/upload/uploadImg'
+		Vue.prototype.$upload = process.env.VUE_APP_URL + '/user/upload/uploadImg'
 		// 静态地址
 		Vue.prototype.$ImgUrl = (src) => {
 			return process.env.VUE_APP_STATIC + '/' + src

src/views/Basic/home/index.vue

@@ -1,11 +1,3 @@
-<!--
- * @Author: your name
- * @Date: 2021-11-22 15:56:04
- * @LastEditTime: 2021-11-22 17:00:21
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: /ansu-business/src/views/Console/index.vue
--->
 <template>
   <div>
     <div class="tips">
@@ -31,15 +23,15 @@
                     <div class="card-a">
                         <div class="cardTitle">小区后台</div>
                         <div class="card-a-content">
-                            <div v-if="estateList.length">
+                            <div v-if="estateList!==null">
-                                 <div style="color:#D53131" v-show="!estateList.length">当前尚未添加小区信息</div>
+                                 <div style="color:#D53131" v-show="estateList===null">当前尚未添加小区信息</div>
                                  <div class="cardBox">
                                     <a-card hoverable style="width: 30%;margin:10px;" v-for="(item,index) in estateList" :key="index">
                                         <template slot="actions" class="ant-card-actions">
                                             <span>绑定</span>
                                             <span>详情</span>
                                         </template>
-                                        <a-card-meta :title="item.name" :description="'小区地址：'+item.address">
+                                        <a-card-meta :title="item.name" :description="'小区地址：'+item.addressDetails">
                                         </a-card-meta>
                                     </a-card>
                                     <a-card class="card-add">
@@ -55,7 +47,7 @@
                 <a-col :span='6'>
                     <div class="card-b">
                         <div class="cardTitle">订单列表</div>
-                        <div class="cardBox" v-if="orderList.length">
+                        <div class="cardBox" v-if="orderList!==null">
                             <a-card hoverable v-for="item,index in orderList" :key="index" :title="item.code" style="width: 80%;margin:auto;margin-top:20px">
                                 <span slot="extra" href="#">{{item.status}}</span>
                                 <span style="color:#00000073;font-size:14px;display:flex;justify-content:space-between;"><span>购买功能</span> <span style="color:#D53131;">{{'￥'+item.amount}}</span></span>
@@ -98,9 +90,8 @@
                 ref="ruleForm"
                 :model="form"
                 :rules="rules"
-                :label-col="inline"
+                label-col="inline"
                 layout="vertical"
-                :wrapper-col="wrapperCol"
             >
             <a-form-model-item label="小区全称">
                 <a-input style="60%"></a-input>
@@ -123,10 +114,13 @@
 </template>
 
 <script>
+import { consoleShow } from "@/api/basic/console";
 export default {
 	name: "Console",
 	data(){
 		return{
+			form:{},
+			rules:{},
 			orderList:[
 				{
 					code:'N20212121212',
@@ -149,7 +143,7 @@ export default {
 			estateList:[
 				{
 					name:'万科·滨江花园',
-					address:'江苏省盐城市建湖县沿河镇 11 单元 250 室',
+					addressDetails:'江苏省盐城市建湖县沿河镇 11 单元 250 室',
 					status:'生效中'
 				},{
 					name:'万科·滨江花园',
@@ -182,7 +176,16 @@ export default {
 			confirmLoading: false,
 		}
 	},
+	mounted(){
+		// this.getData()
+	},
 	methods:{
+		async getData(){
+			let res = await consoleShow()
+			// consoleCompanyVo
+			this.estateList = res.data.consoleCommunityVoList
+			this.orderList = res.data.consoleOrderVoList
+		},
 		settled(){
 			this.$router.push({name:'settled'})
 		},

src/views/Basic/home/newOrder.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="content">
-   
+    <span class="back-btn" @click='back'><a-icon type="left" style='margin-right:10px' />返回</span>
     <a-form-model
       ref="ruleForm"
       :model="form"

src/views/Basic/home/settled.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="content">
-   
+    <span class="back-btn" @click='back'><a-icon type="left" style='margin-right:10px' />返回</span>
+    <a-divider></a-divider>
     <a-form-model
       ref="ruleForm"
       :model="form"
@@ -14,18 +15,18 @@
         <a-input
           v-model="form.tel"
           style="width:60%"
+          placeholder="请输入手机号"
           @blur="
             () => {
               $refs.tel.onFieldBlur();
             }
           "
         />
-        <a-row style="margin-top:10px">
+      </a-form-model-item>
+      <a-form-model-item prop='code'>
+         <a-row>
           <a-col :span='8' style="margin-right:10px">
-             <a-input
+             <a-input placeholder="请输入验证码" v-model="form.code"/>
-                v-model="form.verificationCode"
-                placeholder="请输入验证码"
-              />
           </a-col>
           <a-col :span='6'>
               <a-button type="primary" @click="getCode">获取验证码</a-button>
@@ -35,16 +36,16 @@
       <a-form-model-item><div class="cardTitle">基础信息</div></a-form-model-item>
       <a-row>
         <a-col :span='12'>
-          <a-form-model-item label="企业名称" prop="">
+          <a-form-model-item label="企业名称" prop="companyName">
-            <a-input v-model="form.verificationCode"
+            <a-input v-model="form.companyName"
                 placeholder="请输入企业名称"
                 style="width:130%"
             />
           </a-form-model-item>
         </a-col>
         <a-col :span='12'>
-          <a-form-model-item label="社会信用代码" prop="">
+          <a-form-model-item label="社会信用代码" prop="socialCreditCode">
-            <a-input v-model="form.verificationCode"
+            <a-input v-model="form.socialCreditCode"
                 placeholder="请输入社会信用代码"
                 style="width:130%"
             />
@@ -53,16 +54,16 @@
       </a-row>
       <a-row>
         <a-col :span='12'>
-          <a-form-model-item label="企业地址" prop="">
+          <a-form-model-item label="企业地址" prop="companyAddress">
-            <a-input v-model="form.verificationCode"
+            <a-cascader v-model="form.companyAddress"
                 placeholder="请选择企业地址"
                 style="width:100%"
             />
           </a-form-model-item>
         </a-col>
         <a-col :span='12'>
-          <a-form-model-item label="详细地址" prop="">
+          <a-form-model-item label="详细地址" prop="companyAddressDetail">
-            <a-input v-model="form.address"
+            <a-input v-model="form.companyAddressDetail"
                 placeholder="请输入详细地址"
                 style="width:130%"
             />
@@ -71,22 +72,23 @@
       </a-row>
       <a-row>
         <a-col :span='12'>
-          <a-form-model-item label="法人姓名" prop="">
+          <a-form-model-item label="法人姓名" prop="legalPersonName">
-            <a-input v-model="form.verificationCode"
+            <a-input v-model="form.legalPersonName"
                 placeholder="请输入法人姓名"
                 style="width:130%"
             />
           </a-form-model-item>
         </a-col>
         <a-col :span='12'>
-          <a-form-model-item label="法人身份证号" prop="">
+          <a-form-model-item label="法人身份证号" prop="legalPersonIdCard">
-            <a-input v-model="form.address"
+            <a-input v-model="form.legalPersonIdCard"
                 placeholder="请输入法人身份证号"
                 style="width:130%"
             />
           </a-form-model-item>
         </a-col>
       </a-row>
+      <!-- licenseTimeStart  licenseTimeEnd -->
       <a-form-model-item label="营业执照有效期限">
         <a-range-picker @change="onChange" />
       </a-form-model-item>
@@ -95,15 +97,18 @@
         <a-row>
           <a-col :span='12'>
             头像面
+            <!-- idCardFrontImgUrls -->
             <div class="uploadImg">+</div>
           </a-col>
           <a-col :span='12'>
             国徽面
+            <!-- idCardBackImgUrls -->
             <div class="uploadImg">+</div>
           </a-col>
         </a-row>
       </a-form-model-item>
       <a-form-model-item label="营业执照">
+        <!-- businessLicenseImgUrls -->
         <span><span style="color:#1F519B">请上传公司营业执照，</span>文件大小不超过5mb，支持jpg、png格式</span>
         <a-row>
           <a-col :span='12'>
@@ -112,6 +117,7 @@
           </a-col>
         </a-row>
       </a-form-model-item>
+      <!-- othersImgUrls -->
       <a-form-model-item label="其他附件">
         <span><span style="color:#1F519B">如从事某些特定行业，需要上传对应的资质证书，</span>文件大小不超过5mb，支持jpg、png格式</span>
         <a-row>
@@ -120,29 +126,33 @@
           </a-col>
         </a-row>
       </a-form-model-item>
-      <a-form-model-item label="联系人姓名">
+      <a-form-model-item label="联系人姓名" prop='contactsName'>
-        <a-input style="width:60%"></a-input>
+        <a-input style="width:60%" v-model="form.contactsName"></a-input>
       </a-form-model-item>
-       <a-form-model-item label="联系人邮箱">
+       <a-form-model-item label="联系人邮箱" prop='contactsTel'>
-        <a-input style="width:60%"></a-input>
+        <a-input style="width:60%" v-model="form.contactsTel"></a-input>
       </a-form-model-item>
-       <a-form-model-item label="联系人电话">
+       <a-form-model-item label="联系人电话" prop='contactsEmail'>
-        <a-input style="width:60%"></a-input>
+        <a-input style="width:60%" v-model="form.contactsEmail"></a-input>
       </a-form-model-item>
-       <a-form-model-item label="联系人地址">
+      <a-form-model-item label="联系人地址" prop='contactsAddress'>
-        <a-input style="width:60%"></a-input>
+        <a-cascader style="width:60%" v-model="form.contactsAddress"></a-cascader>
       </a-form-model-item>
-      <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }">
+       <a-form-model-item label="联系人详细地址" prop='contactsAddressDetail'>
+        <a-input style="width:60%" v-model="form.contactsAddressDetail"></a-input>
+      </a-form-model-item>
+    </a-form-model>
+    <div style="text-align:center">
       <a-button type="primary" @click="onSubmit"> 提交 </a-button>
         <a-button style="margin-left: 10px" @click="resetForm">
           重置
         </a-button>
-      </a-form-model-item>
+    </div>
-    </a-form-model>
   </div>
 </template>
 
 <script>
+import { settledInsert } from "@/api/basic/console"
 export default {
 	data() {
 		return {
@@ -152,6 +162,7 @@ export default {
 			other: "",
 			form: {
 				tel: "",
+				code:'',
 				name: "",
 				address:""
 			},
@@ -165,20 +176,7 @@ export default {
 					{
 						min: 11,
 						max: 11,
-						message: "姓名长度必须为 11 位",
+						message: "手机号长度必须为 11 位",
-						trigger: "blur",
-					},
-				],
-				name: [
-					{
-						required: true,
-						message: "请输入姓名",
-						trigger: "blur",
-					},
-					{
-						min: 3,
-						max: 5,
-						message: "姓名长度必须为 3 至 5位",
 						trigger: "blur",
 					},
 				],
@@ -189,12 +187,14 @@ export default {
 		// 获取验证码
 		getCode(){},
 		onSubmit() {
-			this.$refs.ruleForm.validate((valid) => {
+			this.$refs.ruleForm.validate(async (valid) => {
 				if (valid) {
-					alert("submit!");
+				 let res = await settledInsert(this.form)
-				} else {
+					if(res.code===200){
-					console.log("error submit!!");
+						this.$message.success(res.msg)
-					return false;
+					}else{
+						this.$message.error(res.msg)
+					}
 				}
 			});
 		},

src/views/Login/depend/config.js

@@ -0,0 +1,48 @@
+export const form =  {
+	username: "",
+	password: "",
+	tel: "",
+	code:""
+}
+export const registerForm =  {
+	tel: "",
+	code: "",
+	password: '',
+	confirmPsw:''
+}
+export const registerRules =  {
+	tel: [
+		{
+			required: true,
+			message: "请输入手机号",
+			trigger: "blur",
+		},
+		{
+			min: 11,
+			max: 11,
+			message: "手机号长度必须为 11 位",
+			trigger: "blur",
+		},
+	],
+	code: [
+		{
+			required: true,
+			message: "请输入验证码",
+			trigger: "blur",
+		},
+	],
+	password: [
+		{
+			required: true,
+			message: "请输入密码",
+			trigger: "blur",
+		},
+	],
+	confirmPsw: [
+		{
+			required: true,
+			message: "请确认密码",
+			trigger: "blur",
+		},
+	]
+}