diff --git a/package-lock.json b/package-lock.json index 38e979b..4815907 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,14 @@ "dependencies": { "axios": "^1.5.1", "core-js": "^3.8.3", + "jsencrypt": "^3.3.2", + "lodash": "^4.17.21", + "moment": "^2.29.4", "normalize.css": "^8.0.1", "postcss-pxtorem": "^6.0.0", "vant": "^2.13.1", "vue": "^2.6.14", - "vue-router": "^3.5.1", + "vue-router": "^3.6.5", "vuex": "^3.6.2" }, "devDependencies": { @@ -6637,6 +6640,11 @@ "dev": true, "license": "MIT" }, + "node_modules/jsencrypt": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/jsencrypt/-/jsencrypt-3.3.2.tgz", + "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A==" + }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz", @@ -6808,10 +6816,8 @@ }, "node_modules/lodash": { "version": "4.17.21", - "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash.debounce": { "version": "4.0.8", @@ -7312,6 +7318,14 @@ "dev": true, "license": "MIT" }, + "node_modules/moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "engines": { + "node": "*" + } + }, "node_modules/mrmime": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz", @@ -10282,9 +10296,8 @@ }, "node_modules/vue-router": { "version": "3.6.5", - "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.6.5.tgz", - "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==", - "license": "MIT" + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz", + "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==" }, "node_modules/vue-style-loader": { "version": "4.1.3", diff --git a/package.json b/package.json index 106bc9d..b9fd6a9 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,14 @@ "dependencies": { "axios": "^1.5.1", "core-js": "^3.8.3", + "jsencrypt": "^3.3.2", + "lodash": "^4.17.21", + "moment": "^2.29.4", "normalize.css": "^8.0.1", "postcss-pxtorem": "^6.0.0", "vant": "^2.13.1", "vue": "^2.6.14", - "vue-router": "^3.5.1", + "vue-router": "^3.6.5", "vuex": "^3.6.2" }, "devDependencies": { diff --git a/src/App.vue b/src/App.vue index 9c9b592..80cafe5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,8 +4,6 @@ - - \ No newline at end of file diff --git a/src/components/MyTop.vue b/src/components/MyTop.vue new file mode 100644 index 0000000..d2573f6 --- /dev/null +++ b/src/components/MyTop.vue @@ -0,0 +1,38 @@ + + + + + \ No newline at end of file diff --git a/src/components/New.vue b/src/components/New.vue new file mode 100644 index 0000000..9871eb2 --- /dev/null +++ b/src/components/New.vue @@ -0,0 +1,174 @@ + + + + + \ No newline at end of file diff --git a/src/http/index.js b/src/http/index.js index 3b20096..d210c8c 100644 --- a/src/http/index.js +++ b/src/http/index.js @@ -1,24 +1,39 @@ import axios from "axios"; +import { Toast } from "vant"; const http = axios.create({ - baseURL: 'https://some-domain.com/api/', - timeout: 1000, - headers: {'X-Custom-Header': 'foobar'} - }); - // 添加请求拦截器 + // baseURL: 'https://some-domain.com/api/', + // timeout: 1000, + // headers: {'X-Custom-Header': 'foobar'} +}); +// 添加请求拦截器 +http.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'; +// http.defaults.headers.post['Content-Type'] = 'application/json' +http.defaults.headers.put['Content-Type'] = 'application/x-www-form-urlencoded'; http.interceptors.request.use(function (config) { - // 在发送请求之前做些什么 - return config; - }, function (error) { - // 对请求错误做些什么 - return Promise.reject(error); - }); + // 在发送请求之前做些什么 + if (config.url.includes('/health/user') && !config.url.includes('/login') && !config.url.includes('/register')) { + config.headers["userId"] = localStorage.getItem('userId') + config.headers["sessionId"] = localStorage.getItem('sessionId') + } + Toast.loading({ + message: '加载中...', + forbidClick: true, + loadingType: 'spinner' + }) + // config.headers.Authorization = sessionStorage.getItem('token') + return config; +}, function (error) { + // 对请求错误做些什么 + return Promise.reject(error); +}); // 添加响应拦截器 http.interceptors.response.use(function (response) { - // 对响应数据做点什么 - return response; - }, function (error) { - // 对响应错误做点什么 - return Promise.reject(error); - }); - export default http \ No newline at end of file + // 对响应数据做点什么 + Toast.clear() + return response; +}, function (error) { + // 对响应错误做点什么 + return Promise.reject(error); +}); +export default http \ No newline at end of file diff --git a/src/img/10.jpg b/src/img/10.jpg new file mode 100644 index 0000000..88227f8 Binary files /dev/null and b/src/img/10.jpg differ diff --git a/src/img/11.jpg b/src/img/11.jpg new file mode 100644 index 0000000..04463af Binary files /dev/null and b/src/img/11.jpg differ diff --git a/src/img/12.jpg b/src/img/12.jpg new file mode 100644 index 0000000..c5fea4d Binary files /dev/null and b/src/img/12.jpg differ diff --git a/src/img/13.jpg b/src/img/13.jpg new file mode 100644 index 0000000..82d4d60 Binary files /dev/null and b/src/img/13.jpg differ diff --git a/src/img/14.jpg b/src/img/14.jpg new file mode 100644 index 0000000..82c074d Binary files /dev/null and b/src/img/14.jpg differ diff --git a/src/img/15.jpg b/src/img/15.jpg new file mode 100644 index 0000000..31b563f Binary files /dev/null and b/src/img/15.jpg differ diff --git a/src/img/16.jpg b/src/img/16.jpg new file mode 100644 index 0000000..adc52b8 Binary files /dev/null and b/src/img/16.jpg differ diff --git a/src/img/17.jpg b/src/img/17.jpg new file mode 100644 index 0000000..3c7af5b Binary files /dev/null and b/src/img/17.jpg differ diff --git a/src/img/18.jpg b/src/img/18.jpg new file mode 100644 index 0000000..2cca792 Binary files /dev/null and b/src/img/18.jpg differ diff --git a/src/main.js b/src/main.js index eefe6fd..2f16620 100644 --- a/src/main.js +++ b/src/main.js @@ -5,12 +5,15 @@ import store from './store' import Vant from 'vant'; import 'vant/lib/index.css'; import "normalize.css/normalize.css" -import instance from "./http/index" +import VueRouter from 'vue-router'; +// import http from "./http/index" +// Vue.prototype.$http=http +// 注册全局过滤器 +import "./assets/timeformart" -Vue.prototype.$http=instance Vue.use(Vant); +Vue.use(VueRouter) Vue.config.productionTip = false - new Vue({ router, store, diff --git a/src/router/index.js b/src/router/index.js index ee7485b..09f5109 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,7 +6,7 @@ Vue.use(VueRouter) const routes = [ { path: '/', - redirect: '/home' + redirect: '/my/myLogin' }, // -------------------------首页-------------------------- // 一级home页面 @@ -15,7 +15,7 @@ const routes = [ name: 'home', component: () => import('../views/home/home.vue'), children: [{ - path: 'information', + path: 'information/:id', name: 'information', component: () => import('../views/home/information/information.vue'), children: [{ @@ -41,6 +41,11 @@ const routes = [ name: 'search', component: () => import('../views/home/search/search.vue') }, + { + path: 'new/:id/:code', + name: 'new', + component: () => import('../views/home/new/new.vue') + }, ] @@ -71,8 +76,8 @@ const routes = [ component: () => import('../views/consultation/consultationServer/doctorList/doctorList.vue') }, { - path: 'consultationCDetail', - name: 'consultationCDetail', + path: 'consultationDetail/:id', + name: 'consultationDetail', component: () => import('../views/consultation/consultationServer/detail/detail.vue') }, @@ -83,10 +88,15 @@ const routes = [ name: 'myConsultation', component: () => import('../views/consultation/myConsultation/myConsultation.vue'), children: [{ - path: 'MyConsultationComment', + path: 'MyConsultationComment/:commentNum/:doctorId', name: 'MyConsultationComment', component: () => import('../views/consultation/myConsultation/comment/comment.vue') }, + { + path: 'comment/:recordId/:doctorId', + name: 'comment', + component: () => import('../views/consultation/myConsultation/comment1/comment1.vue') + }, { path: 'MyConsultationCurrent', name: 'MyConsultationCurrent', @@ -103,7 +113,7 @@ const routes = [ component: () => import('../views/consultation/myConsultation/queryComment/queryComment.vue') }, { - path: 'MyConsultationResult', + path: 'MyConsultationResult/:recordId', name: 'MyConsultationResult', component: () => import('../views/consultation/myConsultation/result/result.vue') }] @@ -119,11 +129,11 @@ const routes = [ name: 'wallet', component: () => import('../views/wallet/wallet.vue'), children: [{ - path: 'myWallet', + path: 'myWallet/:money1', name: 'myWallet', component: () => import('../views/wallet/myWallet/myWallet.vue') }, { - path: 'recharge', + path: 'recharge/:money', name: 'recharge', component: () => import('../views/wallet/recharge/recharge.vue') }, { @@ -131,7 +141,7 @@ const routes = [ name: 'withdrawal', component: () => import('../views/wallet/withdrawal/withdrawal.vue') }, { - path: 'rechargeSuccess', + path: 'rechargeSuccess/:money', name: 'rechargeSuccess', component: () => import('../views/wallet/rechargeSuccess/rechargeSuccess.vue') }, { @@ -153,7 +163,7 @@ const routes = [ name: 'patientCircle', component: () => import('../views/patientCircle/patientCircle.vue'), children: [{ - path: 'patientDetail', + path: 'patientDetail/:id', name: 'patientDetail', component: () => import('../views/patientCircle/detail/detail.vue') }, { @@ -161,7 +171,7 @@ const routes = [ name: 'patientSearch', component: () => import('../views/patientCircle/search/search.vue'), children: [{ - path: 'patientResult', + path: 'patientResult/:keyword', name: 'patientResult', component: () => import('../views/patientCircle/search/result/result.vue'), }] @@ -169,13 +179,17 @@ const routes = [ path: 'patientWrite', name: 'patientWrite', component: () => import('../views/patientCircle/write/write.vue') + }, { + path: 'patientUserInfo', + name: 'patientUserInfo', + component: () => import('../views/patientCircle/userInfo/userInfo.vue') } ] }, // -------------------------视频------------------------- { - path: 'vedio', + path: '/vedio', name: 'vedio', component: () => import('../views/vedio/vedio.vue') }, @@ -184,6 +198,7 @@ const routes = [ { path: '/my', name: 'my', + component:()=>import('../views/my/my.vue'), children: [{ path: 'myAdoptIdea', name: 'myAdoptIdea', @@ -258,10 +273,15 @@ const routes = [ { path: 'myProFile', name: 'myProFile', + component:()=>import('../views/my/proFile/proFile.vue'), children: [{ path: 'myProFileAddModifyProfile', name: 'myProFileAddModifyProfile', component: () => import('../views/my/proFile/addModifyProfile/addModifyProfile.vue') + },{ + path: 'editProFile/:arr', + name: 'editProFile', + component: () => import('../views/my/proFile/editProFile/editProFile.vue') }, { path: 'myProFileIndex', @@ -347,13 +367,13 @@ const router = new VueRouter({ routes }) // 路由守卫 -// router.beforeEach((to, from, next) => { -// if (to.path === '/login') { -// return next() -// } +router.beforeEach((to, from, next) => { + if (to.path === '/my/myLogin') { + return next() + } // if (!localStorage.getItem('token')) { // return next('/login') // } -// next() -// }) + next() +}) export default router diff --git a/src/store/index.js b/src/store/index.js index ceffa8e..82ecae5 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,6 +1,6 @@ import Vue from 'vue' import Vuex from 'vuex' - +import search from "./search/index" Vue.use(Vuex) export default new Vuex.Store({ @@ -13,5 +13,6 @@ export default new Vuex.Store({ actions: { }, modules: { + search } }) diff --git a/src/store/search/index.js b/src/store/search/index.js new file mode 100644 index 0000000..e3fea30 --- /dev/null +++ b/src/store/search/index.js @@ -0,0 +1,28 @@ +import Vue from 'vue' +import Vuex from 'vuex' + +Vue.use(Vuex) + +export default ({ + namespaced: true, + state: { + hisList: JSON.parse(localStorage.getItem("dhis")) || [] + }, + getters: { + }, + mutations: { + ss(state,payload) { + let index = state.hisList.lastIndexOf(payload); + if (index > -1) { + state.hisList.splice(index, 1); + } + state.hisList.unshift(payload); + localStorage.setItem("dhis", JSON.stringify(state.hisList)); + } + }, + actions: { + + }, + modules: { + } +}) diff --git a/src/utils/common-mixins.css b/src/utils/common-mixins.css new file mode 100644 index 0000000..bf43c33 --- /dev/null +++ b/src/utils/common-mixins.css @@ -0,0 +1 @@ +@min; diff --git a/src/utils/common-mixins.min.css b/src/utils/common-mixins.min.css new file mode 100644 index 0000000..d5394e6 --- /dev/null +++ b/src/utils/common-mixins.min.css @@ -0,0 +1 @@ +@min diff --git a/src/utils/common-mixins.scss b/src/utils/common-mixins.scss new file mode 100644 index 0000000..7ae8eef --- /dev/null +++ b/src/utils/common-mixins.scss @@ -0,0 +1,5 @@ +@mixin center-content { + display: flex; + align-items: center; + flex-direction: column; +} \ No newline at end of file diff --git a/src/utils/common.css b/src/utils/common.css new file mode 100644 index 0000000..4e20b96 --- /dev/null +++ b/src/utils/common.css @@ -0,0 +1,5 @@ +.minxin { + display: flex; + align-items: center; + flex-direction: column; +} diff --git a/src/utils/common.min.css b/src/utils/common.min.css new file mode 100644 index 0000000..f2affb1 --- /dev/null +++ b/src/utils/common.min.css @@ -0,0 +1 @@ +.minxin{display:flex;align-items:center;flex-direction:column} diff --git a/src/utils/common.scss b/src/utils/common.scss new file mode 100644 index 0000000..55c17f2 --- /dev/null +++ b/src/utils/common.scss @@ -0,0 +1,5 @@ +.minxin{ + display: flex; + align-items: center; + flex-direction: column; +} \ No newline at end of file diff --git a/src/views/consultation/consultation.vue b/src/views/consultation/consultation.vue index 7796caa..104c88e 100644 --- a/src/views/consultation/consultation.vue +++ b/src/views/consultation/consultation.vue @@ -1,6 +1,6 @@ diff --git a/src/views/consultation/consultationServer/consultationServer.vue b/src/views/consultation/consultationServer/consultationServer.vue index f25a8b9..59108db 100644 --- a/src/views/consultation/consultationServer/consultationServer.vue +++ b/src/views/consultation/consultationServer/consultationServer.vue @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/src/views/consultation/consultationServer/doctorList/doctorList.vue b/src/views/consultation/consultationServer/doctorList/doctorList.vue index 157b988..0fa2f9a 100644 --- a/src/views/consultation/consultationServer/doctorList/doctorList.vue +++ b/src/views/consultation/consultationServer/doctorList/doctorList.vue @@ -1,15 +1,495 @@ - \ No newline at end of file diff --git a/src/views/consultation/myConsultation/comment/comment.vue b/src/views/consultation/myConsultation/comment/comment.vue index 5fd51e5..82561b4 100644 --- a/src/views/consultation/myConsultation/comment/comment.vue +++ b/src/views/consultation/myConsultation/comment/comment.vue @@ -1,13 +1,130 @@ - \ No newline at end of file diff --git a/src/views/consultation/myConsultation/comment1/comment1.vue b/src/views/consultation/myConsultation/comment1/comment1.vue new file mode 100644 index 0000000..87aba76 --- /dev/null +++ b/src/views/consultation/myConsultation/comment1/comment1.vue @@ -0,0 +1,144 @@ + + + + + \ No newline at end of file diff --git a/src/views/consultation/myConsultation/current/current.vue b/src/views/consultation/myConsultation/current/current.vue index 2d70453..52d437f 100644 --- a/src/views/consultation/myConsultation/current/current.vue +++ b/src/views/consultation/myConsultation/current/current.vue @@ -1,15 +1,175 @@ - \ No newline at end of file diff --git a/src/views/consultation/myConsultation/history/history.vue b/src/views/consultation/myConsultation/history/history.vue index 417bb98..9023429 100644 --- a/src/views/consultation/myConsultation/history/history.vue +++ b/src/views/consultation/myConsultation/history/history.vue @@ -1,13 +1,148 @@ - \ No newline at end of file diff --git a/src/views/consultation/myConsultation/myConsultation.vue b/src/views/consultation/myConsultation/myConsultation.vue index ba24570..104c88e 100644 --- a/src/views/consultation/myConsultation/myConsultation.vue +++ b/src/views/consultation/myConsultation/myConsultation.vue @@ -1,6 +1,6 @@ diff --git a/src/views/consultation/myConsultation/result/result.vue b/src/views/consultation/myConsultation/result/result.vue index 23448b5..17a5813 100644 --- a/src/views/consultation/myConsultation/result/result.vue +++ b/src/views/consultation/myConsultation/result/result.vue @@ -1,15 +1,178 @@ - \ No newline at end of file diff --git a/src/views/home/home.vue b/src/views/home/home.vue index ee8e3f9..64ac82a 100644 --- a/src/views/home/home.vue +++ b/src/views/home/home.vue @@ -1,15 +1,634 @@ - \ No newline at end of file diff --git a/src/views/home/information/detail/detail.vue b/src/views/home/information/detail/detail.vue index 410da7d..c60b778 100644 --- a/src/views/home/information/detail/detail.vue +++ b/src/views/home/information/detail/detail.vue @@ -4,10 +4,16 @@ - \ No newline at end of file diff --git a/src/views/home/information/information.vue b/src/views/home/information/information.vue index 7e6cf14..8b16673 100644 --- a/src/views/home/information/information.vue +++ b/src/views/home/information/information.vue @@ -1,13 +1,55 @@ +
+
+ + + +
+ + \ No newline at end of file + .lianjie{ + position: fixed; + right: 0; + bottom: 100px; + z-index: 100; + } + \ No newline at end of file diff --git a/src/views/home/knowledgeBase/detail/detail.vue b/src/views/home/knowledgeBase/detail/detail.vue index 35f504c..5f8eec4 100644 --- a/src/views/home/knowledgeBase/detail/detail.vue +++ b/src/views/home/knowledgeBase/detail/detail.vue @@ -1,5 +1,27 @@ - \ No newline at end of file diff --git a/src/views/home/knowledgeBase/knowledgeBase.vue b/src/views/home/knowledgeBase/knowledgeBase.vue index eda7279..51605bd 100644 --- a/src/views/home/knowledgeBase/knowledgeBase.vue +++ b/src/views/home/knowledgeBase/knowledgeBase.vue @@ -1,13 +1,270 @@ +
+
+ + +
+ + +
+
+ + +
+ + + +
+
  • + {{ v.name }} +
  • +
    +
    + +
    + + + + +
    +
    + + \ No newline at end of file + .input { + flex: 1; + margin: 0 10px; + height: 38px; + border-radius: 20px; + border: 1px solid #ccc; + } +} +.middle { + height: 50px; + background-color: #fff; + margin-top: 2px; + display: flex; + align-items: center; + justify-content: space-around; + width: 100%; + li.active { + color: blue; + } +} +.bot { + display: flex; + align-items: center; + height: 600px; + width: 100vw; + background-color: #eee; + margin-top: 2px; + .left { + width: 100px; + + height: 100%; + } + .yao { + width: 100px; + // display: flex; + // flex-direction: column; + // background-color: pink; + + // height: 100%; + // background-color: green; + height: 100%; + } + .rightZheng { + width: 300px; + background-color: #fff; + height: 100%; + overflow-y: scroll; + display: flex; + align-items: center; + flex-wrap: wrap; + padding: 10px; + + .zheng { + width: 120px; + height: 35px; + // background-color: #ccc; + margin: 5px; + // line-height: 35px; + text-align: center; + } + } + .right { + width: 300px; + background-color: #fff; + height: 100%; + overflow-y: scroll; + padding: 10px; + // background-color: green; + + li { + margin: 10px; + color: blue; + } + } +} + \ No newline at end of file diff --git a/src/views/home/new/new.vue b/src/views/home/new/new.vue new file mode 100644 index 0000000..dea969f --- /dev/null +++ b/src/views/home/new/new.vue @@ -0,0 +1,31 @@ + + + + + + \ No newline at end of file diff --git a/src/views/home/search/search.vue b/src/views/home/search/search.vue index ce38409..3e62e5f 100644 --- a/src/views/home/search/search.vue +++ b/src/views/home/search/search.vue @@ -1,13 +1,228 @@ + + + \ No newline at end of file + .con1, + .con2 { + width: 100%; + margin-top: 3px; + background-color: #fff; + display: flex; + // align-items: center; + flex-direction: column; + justify-content: start; + text-align: left; + p { + color: #3087ea; + margin: 10px; + } + ul { + display: flex; + align-items: center; + margin: 5px; + flex-wrap: wrap; + li { + padding: 5px; + margin: 5px; + background-color: #eee; + border-radius: 10px; + } + } + .historyList { + display: flex; + // background-color: green; + li { + width: 100vw; + display: flex; + justify-content: space-between; + padding: 0 5px; + height: 30px; + line-height: 30px; + span { + margin: 0 10px; + text-align: center; + } + } + } + } +} + \ No newline at end of file diff --git a/src/views/my/collection/collection.vue b/src/views/my/collection/collection.vue index a00b192..f5b8f20 100644 --- a/src/views/my/collection/collection.vue +++ b/src/views/my/collection/collection.vue @@ -1,15 +1,92 @@ - \ No newline at end of file diff --git a/src/views/my/login/login.vue b/src/views/my/login/login.vue index 1047839..fc7e739 100644 --- a/src/views/my/login/login.vue +++ b/src/views/my/login/login.vue @@ -1,15 +1,152 @@ - \ No newline at end of file diff --git a/src/views/my/my.vue b/src/views/my/my.vue new file mode 100644 index 0000000..b9771da --- /dev/null +++ b/src/views/my/my.vue @@ -0,0 +1,316 @@ + + + + + \ No newline at end of file diff --git a/src/views/my/proFile/addModifyProfile/addModifyProfile.vue b/src/views/my/proFile/addModifyProfile/addModifyProfile.vue index 7589613..a034652 100644 --- a/src/views/my/proFile/addModifyProfile/addModifyProfile.vue +++ b/src/views/my/proFile/addModifyProfile/addModifyProfile.vue @@ -1,15 +1,405 @@ - \ No newline at end of file diff --git a/src/views/my/proFile/editProFile/editProFile.vue b/src/views/my/proFile/editProFile/editProFile.vue new file mode 100644 index 0000000..ba44c76 --- /dev/null +++ b/src/views/my/proFile/editProFile/editProFile.vue @@ -0,0 +1,422 @@ + + + + + + \ No newline at end of file diff --git a/src/views/my/proFile/index/index.vue b/src/views/my/proFile/index/index.vue index 7014780..7b61b59 100644 --- a/src/views/my/proFile/index/index.vue +++ b/src/views/my/proFile/index/index.vue @@ -1,15 +1,232 @@ - \ No newline at end of file diff --git a/src/views/my/proFile/proFile.vue b/src/views/my/proFile/proFile.vue new file mode 100644 index 0000000..104c88e --- /dev/null +++ b/src/views/my/proFile/proFile.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/src/views/my/register/register.vue b/src/views/my/register/register.vue index 597145b..5ec0d55 100644 --- a/src/views/my/register/register.vue +++ b/src/views/my/register/register.vue @@ -1,15 +1,205 @@ + + + + - \ No newline at end of file diff --git a/src/views/patientCircle/detail/detail.vue b/src/views/patientCircle/detail/detail.vue index 08c9d61..873906f 100644 --- a/src/views/patientCircle/detail/detail.vue +++ b/src/views/patientCircle/detail/detail.vue @@ -1,15 +1,649 @@ - \ No newline at end of file diff --git a/src/views/patientCircle/patientCircle.vue b/src/views/patientCircle/patientCircle.vue index f465a65..0d7dd8f 100644 --- a/src/views/patientCircle/patientCircle.vue +++ b/src/views/patientCircle/patientCircle.vue @@ -1,15 +1,238 @@ - \ No newline at end of file diff --git a/src/views/patientCircle/search/result/result.vue b/src/views/patientCircle/search/result/result.vue index e3eec65..cb7c9ab 100644 --- a/src/views/patientCircle/search/result/result.vue +++ b/src/views/patientCircle/search/result/result.vue @@ -1,15 +1,104 @@ - \ No newline at end of file diff --git a/src/views/patientCircle/search/search.vue b/src/views/patientCircle/search/search.vue index a0f024f..2bc6277 100644 --- a/src/views/patientCircle/search/search.vue +++ b/src/views/patientCircle/search/search.vue @@ -1,15 +1,125 @@ - \ No newline at end of file diff --git a/src/views/patientCircle/userInfo/userInfo.vue b/src/views/patientCircle/userInfo/userInfo.vue index 48e05c2..8693d48 100644 --- a/src/views/patientCircle/userInfo/userInfo.vue +++ b/src/views/patientCircle/userInfo/userInfo.vue @@ -1,15 +1,195 @@ - \ No newline at end of file diff --git a/src/views/patientCircle/write/write.vue b/src/views/patientCircle/write/write.vue index 7abe969..4a7f041 100644 --- a/src/views/patientCircle/write/write.vue +++ b/src/views/patientCircle/write/write.vue @@ -1,15 +1,643 @@ - \ No newline at end of file diff --git a/src/views/set/index/index.vue b/src/views/set/index/index.vue index 7014780..fc0d7cb 100644 --- a/src/views/set/index/index.vue +++ b/src/views/set/index/index.vue @@ -1,15 +1,75 @@ - \ No newline at end of file diff --git a/src/views/set/personInfomation/personInfomation.vue b/src/views/set/personInfomation/personInfomation.vue index 4fbb61e..e00a21f 100644 --- a/src/views/set/personInfomation/personInfomation.vue +++ b/src/views/set/personInfomation/personInfomation.vue @@ -1,15 +1,101 @@ - \ No newline at end of file diff --git a/src/views/vedio/vedio.vue b/src/views/vedio/vedio.vue index 81f14db..6028041 100644 --- a/src/views/vedio/vedio.vue +++ b/src/views/vedio/vedio.vue @@ -1,15 +1,57 @@ - \ No newline at end of file diff --git a/src/views/wallet/myWallet/myWallet.vue b/src/views/wallet/myWallet/myWallet.vue index e0bbdfb..f65dcf2 100644 --- a/src/views/wallet/myWallet/myWallet.vue +++ b/src/views/wallet/myWallet/myWallet.vue @@ -1,13 +1,266 @@ - \ No newline at end of file diff --git a/src/views/wallet/recharge/recharge.vue b/src/views/wallet/recharge/recharge.vue index e016aa4..907901d 100644 --- a/src/views/wallet/recharge/recharge.vue +++ b/src/views/wallet/recharge/recharge.vue @@ -1,15 +1,203 @@ - - \ No newline at end of file diff --git a/src/views/wallet/rechargeSuccess/rechargeSuccess.vue b/src/views/wallet/rechargeSuccess/rechargeSuccess.vue index 5bab15c..333b702 100644 --- a/src/views/wallet/rechargeSuccess/rechargeSuccess.vue +++ b/src/views/wallet/rechargeSuccess/rechargeSuccess.vue @@ -1,15 +1,205 @@ - \ No newline at end of file diff --git a/src/views/wallet/wallet.vue b/src/views/wallet/wallet.vue index b0185c7..104c88e 100644 --- a/src/views/wallet/wallet.vue +++ b/src/views/wallet/wallet.vue @@ -1,6 +1,6 @@ diff --git a/src/views/wallet/withdrawal/withdrawal.vue b/src/views/wallet/withdrawal/withdrawal.vue index d357f14..3a15595 100644 --- a/src/views/wallet/withdrawal/withdrawal.vue +++ b/src/views/wallet/withdrawal/withdrawal.vue @@ -1,15 +1,206 @@ - \ No newline at end of file diff --git a/src/views/wallet/withdrawalRecords/withdrawalRecords.vue b/src/views/wallet/withdrawalRecords/withdrawalRecords.vue index 84d51ab..46e7e1f 100644 --- a/src/views/wallet/withdrawalRecords/withdrawalRecords.vue +++ b/src/views/wallet/withdrawalRecords/withdrawalRecords.vue @@ -1,15 +1,162 @@ - \ No newline at end of file diff --git a/src/views/wallet/withdrawaling/withdrawaling.vue b/src/views/wallet/withdrawaling/withdrawaling.vue index 0350dd0..091e83c 100644 --- a/src/views/wallet/withdrawaling/withdrawaling.vue +++ b/src/views/wallet/withdrawaling/withdrawaling.vue @@ -1,15 +1,176 @@ - \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index a84c850..303e038 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,7 +1,21 @@ + const { defineConfig } = require('@vue/cli-service') module.exports = defineConfig({ transpileDependencies: true, -lintOnSave:false - - + lintOnSave: false, + devServer: { + // host: '0.0.0.0', //可以忽略不写 + // port: 8080, //它是用来修改你打开后的端口号的 + open: true, //值为 true的话,项目启动时自动打开到浏览器里边, false不会打开 + proxy: { + '/api': { + target: 'http://172.27.6.139/api', //跨域请求的公共地址 + ws: false, //也可以忽略不写,不写不会影响跨域 + changeOrigin: true, //是否开启跨域,值为 true 就是开启, false 不开启 + pathRewrite: { + '^/api': '' //注册全局路径, 但是在你请求的时候前面需要加上 /api + } + } + } + } }) diff --git a/yarn.lock b/yarn.lock index 1676da5..f4eeac2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3531,6 +3531,11 @@ js-tokens@^4.0.0: resolved "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== +jsencrypt@^3.3.2: + version "3.3.2" + resolved "https://registry.npmjs.org/jsencrypt/-/jsencrypt-3.3.2.tgz" + integrity sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A== + jsesc@^2.5.1: version "2.5.2" resolved "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz" @@ -3704,7 +3709,7 @@ lodash.uniqby@^4.7.0: lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" - resolved "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== log-symbols@^4.1.0: @@ -3882,6 +3887,11 @@ module-alias@^2.2.2: resolved "https://registry.npmmirror.com/module-alias/-/module-alias-2.2.3.tgz" integrity sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q== +moment@^2.29.4: + version "2.29.4" + resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== + mrmime@^1.0.0: version "1.0.1" resolved "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz" @@ -5465,9 +5475,9 @@ vue-loader@^17.0.0: hash-sum "^2.0.0" watchpack "^2.4.0" -vue-router@^3.5.1: +vue-router@^3.6.5: version "3.6.5" - resolved "https://registry.npmmirror.com/vue-router/-/vue-router-3.6.5.tgz" + resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz" integrity sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ== vue-style-loader@^4.1.0, vue-style-loader@^4.1.3: