From 410c97f07053cf355b0895cd708fcce17ad82e38 Mon Sep 17 00:00:00 2001 From: "DESKTOP-00SUCB6\\Administrator" Date: Wed, 9 Feb 2022 10:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E8=8A=82=E7=82=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=98=E6=9B=B4=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/api/api.js | 15 + src/api/enterpriseManagement.js | 96 ++- src/api/productManagement.js | 9 + src/api/register.js | 10 +- src/components/Header/Header.vue | 2 +- src/components/Header/onlyHeader.vue | 58 ++ src/router/index.js | 39 +- src/styles/index.scss | 7 +- src/views/agreement/privacyStatement.vue | 213 +++++ src/views/agreement/userAgreement.vue | 223 +++++ .../enterpriseCertification/Index copy.vue | 688 +++++++++++++++ .../enterpriseCertification/Index.vue | 681 ++------------- .../components/show.vue | 323 ++++++++ .../components/step1.vue | 780 ++++++++++++++++++ .../components/step2.vue | 561 +++++++++++++ .../components/step3.vue | 410 +++++++++ .../productCategoryManagement/Index.vue | 31 +- .../sendCodeListByProduct/Index.vue | 204 +++++ src/views/login/login.vue | 2 +- src/views/register/register.vue | 37 +- 21 files changed, 3734 insertions(+), 659 deletions(-) create mode 100644 src/components/Header/onlyHeader.vue create mode 100644 src/views/agreement/privacyStatement.vue create mode 100644 src/views/agreement/userAgreement.vue create mode 100644 src/views/fids/enterpriseManagement/enterpriseCertification/Index copy.vue create mode 100644 src/views/fids/enterpriseManagement/enterpriseCertification/components/show.vue create mode 100644 src/views/fids/enterpriseManagement/enterpriseCertification/components/step1.vue create mode 100644 src/views/fids/enterpriseManagement/enterpriseCertification/components/step2.vue create mode 100644 src/views/fids/enterpriseManagement/enterpriseCertification/components/step3.vue create mode 100644 src/views/fids/productManagement/sendCodeListByProduct/Index.vue diff --git a/.env.development b/.env.development index e733ae8..fefb345 100644 --- a/.env.development +++ b/.env.development @@ -4,9 +4,9 @@ ENV = 'development' VUE_APP_PROJECT_NAME = 'fids-ui' # SpringCloud项目使用这个 开发环境请求域名前缀, 该变量仅仅开发环境需要设置 -VUE_APP_DEV_REQUEST_DOMAIN_PREFIX = 'http://172.119.50.111:8900' +VUE_APP_DEV_REQUEST_DOMAIN_PREFIX = 'http://124.70.30.20:8900' # SpringBoot 项目使用这个 -#VUE_APP_DEV_REQUEST_DOMAIN_PREFIX = 'http://124.70.30.20:8900' +#VUE_APP_DEV_REQUEST_DOMAIN_PREFIX = 'http://172.119.50.111:8900' # 请求域名前缀， 该变量仅仅生产环境需要设置 VUE_APP_PROD_REQUEST_DOMAIN_PREFIX = '' diff --git a/src/api/api.js b/src/api/api.js index 5e51fcc..0c3e873 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -7,6 +7,7 @@ export const ROUTER = `/oauth/menu/router`; //获取路由 export const RESOURCE = `/oauth/resource/visible`; //查询用户可用的所有资源 //注册模块 register.js export const REGISTER = `/tenant/tenant/register`; //注册 +export const REGISTERNEW = `/tenant/tenantNew/register`; //注册--新 export const GETEMAILCAPTCHA = `/msgs/mailverification/sendRegisterEmail`; //获取验证码 export const VERIFYAUTHCODEREGISTEREMAIL = `/msgs/mailverification/verifyAuthCodeRegisterEmail`; //校验电子邮件验证码 export const VERIFY_EMAIL_EXIST = `/tenant/tenant/verifyEmail/`; //校验邮箱是否已被注册 @@ -15,9 +16,22 @@ export const VERIFY_EMAIL_EXIST = `/tenant/tenant/verifyEmail/`; //校验邮箱 export const LINKAGE = `/tenant/commonArea/linkage`; //省市区 export const ENTERPRISEAUTH = `/tenant/tenant/examine`; //企业认证 export const TENANTGETCODE = '/tenant/tenant/getcode' //通过code获取企业信息 +export const TENANTGETCODENEW = '/tenant/tenant/view1' //通过code获取企业信息--新step1 +export const TENANTGETCODENEWSTEP2 = '/tenant/tenant/view2' //通过code获取企业信息--新step2 +export const TENANTGETCODENEWSTEP3 = '/tenant/tenant/view3' //通过code获取企业信息--新step3 +export const TENANTGETCODEALL = '/tenant/tenant/viewAll' //通过code获取企业信息--新 all + export const INFORMATIONMODIFY = `/tenant/tenant/updateTenant`; //信息维护修改 export const SELECTTYPE = `/tenant/commonIndustry/allTree`; //行业类型 +export const SELECTTYPENEW = `/tenant/commonIndustry/linkage`; //行业类型--新 +export const SELECTOTHERTYPENEW = `/tenant/commonIndustry/dic`; //除行业类型外其他类型--新 export const INDUSTRYTYPE = `/tenant/commonIndustry/linkageEnumeration`; //行业小类 +export const ENTERPRISEAUTHSTEP1 = `/tenant/tenant/save1`; //企业认证--新step1 +export const ENTERPRISEAUTHSTEP2 = `/tenant/tenant/save2`; //企业认证--新step2 +export const ENTERPRISEAUTHSTEP3 = `/tenant/tenant/save3`; //企业认证-保存-新step3 +export const ENTERPRISEAUTHSUBMITSTEP3 = `/tenant/tenant/commit`; //企业认证-提交-新step3 + +export const INDUSTRYTYPESTEP3 = `/tenant/commonIndustry/treeQuery`; //服务行业四级联动--新step3 export const TENANTGET_TENANT_NAME = '/tenant/tenant/getTenantName' //登录获取企业名称 //产品管理模块 productManagement.js @@ -29,6 +43,7 @@ export const DELETECOMMODITY = `/product/commodityInfo/deleteCommodity`; //动 export const SENDINGCODEPREVIEW = `/sending/codeSendingInfo/previewCodeSending`; //发码预览 export const SENDINGCODESUBMIT = `/sending/codeSendingInfo/saveCodeSending`; //发码提交 export const PRODUCTSENDCODELIST = `/sending/codeSendingInfo/pageCodeSending`; //发码历史 +export const SENDCODELISTBYPRODUCT = `/sending/codeSendingInfo/pageCodeSendingByCommodityId`; //发码历史by产品 export const MARKMANAGEMENTLIST = `/tagManagement/encoding/queryCommoditySending`; //产品标识管理列表 export const UNIFORMSTYLE = `/tag/tagType/queryTagTypeUNIFY`; //统一标签样式查询 diff --git a/src/api/enterpriseManagement.js b/src/api/enterpriseManagement.js index 8aa428e..407f690 100644 --- a/src/api/enterpriseManagement.js +++ b/src/api/enterpriseManagement.js @@ -1,12 +1,22 @@ import axiosApi from "./AxiosApi"; import myAxios from "@/api/myAxios"; -import { ENTERPRISEAUTH, INFORMATIONMODIFY, LINKAGE, SELECTTYPE, INDUSTRYTYPE, TENANTGETCODE, TENANTGET_TENANT_NAME } from "./api"; +import { ENTERPRISEAUTH, INFORMATIONMODIFY, LINKAGE, SELECTTYPE,SELECTTYPENEW,ENTERPRISEAUTHSTEP1, + ENTERPRISEAUTHSTEP2,ENTERPRISEAUTHSTEP3,ENTERPRISEAUTHSUBMITSTEP3, + INDUSTRYTYPE,INDUSTRYTYPESTEP3,SELECTOTHERTYPENEW, TENANTGETCODE,TENANTGETCODEALL, + TENANTGETCODENEW,TENANTGETCODENEWSTEP2,TENANTGETCODENEWSTEP3, TENANTGET_TENANT_NAME } from "./api"; +//获取所有企业信息--新 +export function enterpriseInfoAll(code) { + return myAxios({ + method: 'GET', + url: `${TENANTGETCODEALL}/${code}` + }) +} //省市区 export function registerArea(parentId) { return axiosApi({ method: 'GET', url: LINKAGE, - data: { parentId } + // data: { parentId } }) } //行业类型 @@ -17,6 +27,29 @@ export function selectType(parentId) { data: { parentId } }) } +//行业类型--新 +export function selectTypeNew(parentId) { + return axiosApi({ + method: 'GET', + url: SELECTTYPENEW, + data: { parentId } + }) +} +//服务行业四级联动--新step3 +export function industryTypeStep3() { + return axiosApi({ + method: 'GET', + url: INDUSTRYTYPESTEP3 + }) +} + +//除行业类型外其他类型--新 +export function selectOtherTypeNew() { + return axiosApi({ + method: 'GET', + url: SELECTOTHERTYPENEW + }) +} export function industryType(enumeration) { return axiosApi({ method: 'GET', @@ -32,7 +65,42 @@ export function enterpriseAuth(data) { data }) } - +//企业认证--新step1 +export function enterpriseAuthNew(data) { + return myAxios({ + method: 'POST', + url: ENTERPRISEAUTHSTEP1, + data, + fromData: true + }) +} +//企业认证--新step2 +export function enterpriseAuthNew2(data) { + return myAxios({ + method: 'POST', + url: ENTERPRISEAUTHSTEP2, + data, + fromData: true + }) +} +//企业认证-保存-新step3 +export function enterpriseAuthNew3(data) { + return myAxios({ + method: 'POST', + url: ENTERPRISEAUTHSTEP3, + data, + fromData: true + }) +} +//企业认证-提交-新step3 +export function enterpriseAuthNewSubmit3(data) { + return myAxios({ + method: 'POST', + url: ENTERPRISEAUTHSUBMITSTEP3, + data, + fromData: true + }) +} //信息维护根据code获取企业信息 export function enterpriseInfo(code) { return myAxios({ @@ -40,7 +108,27 @@ export function enterpriseInfo(code) { url: `${TENANTGETCODE}/${code}` }) } - +//信息维护根据code获取企业信息 -- 新step1 +export function enterpriseInfoNew(code) { + return myAxios({ + method: 'GET', + url: `${TENANTGETCODENEW}/${code}` + }) +} +//信息维护根据code获取企业信息 -- 新step2 +export function enterpriseInfoNewStep2(code) { + return myAxios({ + method: 'GET', + url: `${TENANTGETCODENEWSTEP2}/${code}` + }) +} +//信息维护根据code获取企业信息 -- 新step3 +export function enterpriseInfoNewStep3(code) { + return myAxios({ + method: 'GET', + url: `${TENANTGETCODENEWSTEP3}/${code}` + }) +} //信息维护提交修改 export function informationModify(data) { return myAxios({ diff --git a/src/api/productManagement.js b/src/api/productManagement.js index 06c523d..1b80bd9 100644 --- a/src/api/productManagement.js +++ b/src/api/productManagement.js @@ -7,6 +7,7 @@ import { SENDINGCODEPREVIEW, SENDINGCODESUBMIT, PRODUCTSENDCODELIST, + SENDCODELISTBYPRODUCT, MARKMANAGEMENTLIST, BINDLABEL, BINDLABELHISTORY, @@ -85,6 +86,14 @@ export function productSendCodeList(data) { data, }) } +//发码历史by产品 +export function sendCodeListByProduct(data) { + return axiosApi({ + method: 'POST', + url: SENDCODELISTBYPRODUCT, + data, + }) +} //产品标识管理列表 export function markManagementList(data) { return axiosApi({ diff --git a/src/api/register.js b/src/api/register.js index 49919e5..4c32b15 100644 --- a/src/api/register.js +++ b/src/api/register.js @@ -1,5 +1,5 @@ import axiosApi from "@/api/AxiosApi"; -import { GETEMAILCAPTCHA, REGISTER, VERIFYAUTHCODEREGISTEREMAIL, VERIFY_EMAIL_EXIST } from "@/api/api"; +import { GETEMAILCAPTCHA, REGISTER,REGISTERNEW, VERIFYAUTHCODEREGISTEREMAIL, VERIFY_EMAIL_EXIST } from "@/api/api"; //注册 export function register(data) { return axiosApi({ @@ -8,6 +8,14 @@ export function register(data) { data }) } +//注册--新 +export function registerNew(data) { + return axiosApi({ + method: 'POST', + url: REGISTERNEW, + data + }) +} //检测企业名称是否存在 export function checkEnterpriseName(name) { return axiosApi({ diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue index 36801d2..59adbbe 100644 --- a/src/components/Header/Header.vue +++ b/src/components/Header/Header.vue @@ -56,7 +56,7 @@ export default { diff --git a/src/router/index.js b/src/router/index.js index 017d750..8e4ad57 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -14,15 +14,16 @@ Router.prototype.push = function push(location, onResolve, onReject) { return originalPush.call(this, location).catch(err => err) } //基础路由 -const baseRouter = [{ - path: '/redirect', - component: Layout, - hidden: true, - children: [{ - path: '/redirect/:path*', - component: resolve => require(['@/views/redirect/index'], resolve) - }] -}, +const baseRouter = [ + { + path: '/redirect', + component: Layout, + hidden: true, + children: [{ + path: '/redirect/:path*', + component: resolve => require(['@/views/redirect/index'], resolve) + }] + }, { path: '/', redirect: '/home', @@ -149,6 +150,22 @@ const baseRouter = [{ meta: {title: 'page404', noCache: true} }] }, + { + path: "/userAgreement", + name: "userAgreement", + component: () => + import ('@/views/agreement/userAgreement'), + hidden: false, + alwaysShow: false + }, + { + path: "/privacyStatement", + name: "privacyStatement", + component: () => + import ('@/views/agreement/privacyStatement'), + hidden: false, + alwaysShow: false + }, { path: "*", name: "404", @@ -156,7 +173,7 @@ const baseRouter = [{ import ('@/views/error-page/404'), hidden: false, alwaysShow: false - } + }, ] const router = new Router({ @@ -216,7 +233,7 @@ function go(to, next, routerSource) { asyncRouter = filterAsyncRouter(routerSource) store.commit('account/setRoutes', asyncRouter) router.addRoutes(asyncRouter) - next(to.path) + next(to.fullPath) } //生成标准格式的路由对象 diff --git a/src/styles/index.scss b/src/styles/index.scss index 5341353..792a593 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -152,7 +152,9 @@ aside { .text-center { text-align: center } - +.text-right { + text-align: right +} .sub-navbar { height: 50px; line-height: 50px; @@ -280,3 +282,6 @@ aside { } } } +.text-bold { + font-weight: 700; +} \ No newline at end of file diff --git a/src/views/agreement/privacyStatement.vue b/src/views/agreement/privacyStatement.vue new file mode 100644 index 0000000..6fe3b9e --- /dev/null +++ b/src/views/agreement/privacyStatement.vue @@ -0,0 +1,213 @@ + + + + diff --git a/src/views/agreement/userAgreement.vue b/src/views/agreement/userAgreement.vue new file mode 100644 index 0000000..462a847 --- /dev/null +++ b/src/views/agreement/userAgreement.vue @@ -0,0 +1,223 @@ + + + + diff --git a/src/views/fids/enterpriseManagement/enterpriseCertification/Index copy.vue b/src/views/fids/enterpriseManagement/enterpriseCertification/Index copy.vue new file mode 100644 index 0000000..655be14 --- /dev/null +++ b/src/views/fids/enterpriseManagement/enterpriseCertification/Index copy.vue @@ -0,0 +1,688 @@ + + + + diff --git a/src/views/fids/enterpriseManagement/enterpriseCertification/Index.vue b/src/views/fids/enterpriseManagement/enterpriseCertification/Index.vue index 655be14..5b5736b 100644 --- a/src/views/fids/enterpriseManagement/enterpriseCertification/Index.vue +++ b/src/views/fids/enterpriseManagement/enterpriseCertification/Index.vue @@ -1,637 +1,83 @@ - + \ No newline at end of file diff --git a/src/views/fids/enterpriseManagement/enterpriseCertification/components/step1.vue b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step1.vue new file mode 100644 index 0000000..2307364 --- /dev/null +++ b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step1.vue @@ -0,0 +1,780 @@ + + + + + \ No newline at end of file diff --git a/src/views/fids/enterpriseManagement/enterpriseCertification/components/step2.vue b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step2.vue new file mode 100644 index 0000000..3e849b8 --- /dev/null +++ b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step2.vue @@ -0,0 +1,561 @@ + + + + + \ No newline at end of file diff --git a/src/views/fids/enterpriseManagement/enterpriseCertification/components/step3.vue b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step3.vue new file mode 100644 index 0000000..14b4275 --- /dev/null +++ b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step3.vue @@ -0,0 +1,410 @@ + + + + + \ No newline at end of file diff --git a/src/views/fids/productManagement/productCategoryManagement/Index.vue b/src/views/fids/productManagement/productCategoryManagement/Index.vue index 54cd590..125ac98 100644 --- a/src/views/fids/productManagement/productCategoryManagement/Index.vue +++ b/src/views/fids/productManagement/productCategoryManagement/Index.vue @@ -39,13 +39,15 @@ - + @@ -89,25 +91,9 @@ export default { }) }; }, - beforeCreate() { - }, - create() { - }, - beforeMount() { - }, mounted() { this.search() }, - beforeUpdate() { - }, - updated() { - }, - beforeDestroy() { - }, - destroyed() { - }, - computed: {}, - watch: {}, methods: { //增加新产品 跳转增加产品页 turnAddProduct() { @@ -150,6 +136,15 @@ export default { path: `/productManagement/productDetails` }) }, + //查看 发码详情页 + showSendCodeDetail(id) { + window.sessionStorage.setItem('id', id); + window.sessionStorage.setItem('from', this.$route.path); + this.$router.push({ + path: `/productManagement/sendCodeListByProduct`,query:{companyId:id} + }) + }, + //修改 跳转产品修改页 modifyRow(id) { window.sessionStorage.setItem('id', id); diff --git a/src/views/fids/productManagement/sendCodeListByProduct/Index.vue b/src/views/fids/productManagement/sendCodeListByProduct/Index.vue new file mode 100644 index 0000000..50eaa9f --- /dev/null +++ b/src/views/fids/productManagement/sendCodeListByProduct/Index.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 22c15ad..1ba5e47 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -127,7 +127,7 @@ export default { saveLogin: true, isCaptcha: process.env.VUE_APP_IS_CAPTCHA === "true" ? true : false, loginForm: { - tenantView: "", //显示用的企业ID + tenantView: "j2ufjynd", //显示用的企业ID tenant: "", //传递给后端的经过Base64编码后的 account: "",//用户名 password: "",//密码 diff --git a/src/views/register/register.vue b/src/views/register/register.vue index 05e272f..5df07fb 100644 --- a/src/views/register/register.vue +++ b/src/views/register/register.vue @@ -55,7 +55,7 @@ v-model="registerForm.again" /> --> - + + + + + @@ -130,12 +140,13 @@ import Header from "@/components/Header/Header"; import Footer from "@/components/Footer/Footer"; import db from "@/utils/localstorage"; -import {register, getEmailCaptcha, verifyAuthCodeRegisterEmail, checkEnterpriseName,checkEmailExits} from "@/api/register"; +import {register,getEmailCaptcha, verifyAuthCodeRegisterEmail, checkEnterpriseName,checkEmailExits} from "@/api/register"; import { /*validatAlphabetAndNum, validatAlphabets, validatePasswordStrong,*/ validateEmail, + validMobile } from "@/utils/my-validate"; export default { @@ -168,6 +179,7 @@ export default { callback(); } };*/ + const checkName = (rule, value, callback) => { if (value) { checkEnterpriseName(value).then(response => { @@ -187,6 +199,13 @@ export default { callback(); } }; + const checkPhone = (rule, value, callback) => { + if (!validMobile(value)) { + return callback(new Error("请输入正确的电话号码")); + } else { + callback(); + } + }; const checked = (rule, value, callback) => { if (!value) { return callback(new Error("请勾选阅读并同意！")); @@ -201,8 +220,9 @@ export default { labelPosition: "top", disabled: false, registerForm: { - name: "", + orgName: "", email: "", + mobile:"", code: "", check: false, }, @@ -221,7 +241,7 @@ export default { {required: true, message: "请再次输入新密码", trigger: "blur"}, {validator: checkAgainPassword, trigger: "blur"}, ],*/ - name: [ + orgName: [ {required: true, message: "不能为空", trigger: "blur"}, {validator: checkName, trigger: "blur"}, ], @@ -232,6 +252,11 @@ export default { code: [ {required: true, message: "请输入验证码", trigger: "blur"} ], + mobile: [ + {required: true, message: "请输入电话号码", trigger: "blur"}, + {validator: checkPhone, trigger: "blur"}, + + ], check: [ {validator: checked, trigger: "change"}, ], @@ -301,7 +326,7 @@ export default { //获取验证码 getEmailCode() { let index = 0; - this.$refs.registerForm.validateField(['name', 'email'], (valid) => { + this.$refs.registerForm.validateField(['orgName', 'email'], (valid) => { if (!valid) { index++; }