提交 cc840089 编写于 作者: lyf's avatar lyf

修改默认样式

上级 162b89ff
流水线 #37850 已取消 于阶段
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
"qiniu-js": "^3.1.2", "qiniu-js": "^3.1.2",
"socket.io-client": "2.2.0", "socket.io-client": "2.2.0",
"storejs": "^1.1.0", "storejs": "^1.1.0",
"vant": "^2.8.4",
"vconsole": "^3.3.4", "vconsole": "^3.3.4",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-fragment": "^1.5.1", "vue-fragment": "^1.5.1",
......
...@@ -92,7 +92,6 @@ ...@@ -92,7 +92,6 @@
<script src="<%= VUE_APP_OSS_URL %>static/js/vue-2.6.11.js"></script> <script src="<%= VUE_APP_OSS_URL %>static/js/vue-2.6.11.js"></script>
<script src="<%= VUE_APP_OSS_URL %>static/js/vuex-3.4.0.js"></script> <script src="<%= VUE_APP_OSS_URL %>static/js/vuex-3.4.0.js"></script>
<script src="<%= VUE_APP_OSS_URL %>static/js/vue-router-3.3.2.js"></script> <script src="<%= VUE_APP_OSS_URL %>static/js/vue-router-3.3.2.js"></script>
<script src="<%= VUE_APP_OSS_URL %>static/js/vant.min-2.12.26.js"></script>
<script src="<%= VUE_APP_OSS_URL %>static/js/axios-0.19.0.js"></script> <script src="<%= VUE_APP_OSS_URL %>static/js/axios-0.19.0.js"></script>
<script src="<%= VUE_APP_OSS_URL %>static/js/jsencrypt.min-3.0.0.js"></script> <script src="<%= VUE_APP_OSS_URL %>static/js/jsencrypt.min-3.0.0.js"></script>
<script src="<%= VUE_APP_OSS_URL %>static/js/crypto.min-4.0.0.js"></script> <script src="<%= VUE_APP_OSS_URL %>static/js/crypto.min-4.0.0.js"></script>
......
...@@ -832,7 +832,7 @@ ...@@ -832,7 +832,7 @@
content = {}; content = {};
signature = ''; signature = '';
msgIndex = -1; msgIndex = -1;
const newMsgList = [];
if (item.type.toLowerCase() == 'custom') { if (item.type.toLowerCase() == 'custom') {
content = JSON.parse(item.content); content = JSON.parse(item.content);
if (content.bizType == -1 || content.bizType == 27) { if (content.bizType == -1 || content.bizType == 27) {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<p> <p>
<span class="text-name">{{ item.name }}</span> <span class="text-name">{{ item.name }}</span>
<span class="text-dep">{{ <span class="text-dep">{{
item.role == 1 ? "助诊医生" : "接诊医生" item.role == 1 ? '助诊医生' : '接诊医生'
}}</span> }}</span>
</p> </p>
<p class="text-num"> <p class="text-num">
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
> >
</p> </p>
<p class="man-txt"> <p class="man-txt">
{{ isMuted ? "已静音" : "已接入" }} {{ isMuted ? '已静音' : '已接入' }}
</p> </p>
</div> </div>
</div> </div>
...@@ -111,9 +111,9 @@ ...@@ -111,9 +111,9 @@
lastm, lastm,
} from '@/utils/live'; } from '@/utils/live';
import RtcClient from '../../utils/RtcClient.js'; import RtcClient from '../../utils/RtcClient.js';
import { openLoading, closeLoading } from '@/utils/utils'; import { closeLoading } from '@/utils/utils';
import alert from '@/components/common/alert.vue'; import alert from '@/components/common/alert.vue';
import timeLeft from '@/components/timeLeft';
import { mapState } from 'vuex'; import { mapState } from 'vuex';
import { import {
teamDetailV2, teamDetailV2,
...@@ -127,11 +127,10 @@ ...@@ -127,11 +127,10 @@
export default { export default {
components: { components: {
alert, alert,
timeLeft,
}, },
props: { props: {
doctorImg: { doctorImg: {
type: String | Number, type: [String, Number],
default: '', default: '',
}, },
}, },
...@@ -176,17 +175,6 @@ ...@@ -176,17 +175,6 @@
doctorTrtcEntryStatus: 2, doctorTrtcEntryStatus: 2,
}; };
}, },
watch: {
currentChat(newVal, oldVal) {
if (newVal !== oldVal && newVal.imTeamId) {
const { imTeamId, diagnoseLogId } = this.currentChat;
this.tid = imTeamId;
this.diagnoseLogId = diagnoseLogId;
this.init();
}
},
},
created() {},
computed: { computed: {
...mapState({ ...mapState({
currentChat: 'currentChat', currentChat: 'currentChat',
...@@ -204,6 +192,18 @@ ...@@ -204,6 +192,18 @@
} }
}, },
}, },
watch: {
currentChat(newVal, oldVal) {
if (newVal !== oldVal && newVal.imTeamId) {
const { imTeamId, diagnoseLogId } = this.currentChat;
this.tid = imTeamId;
this.diagnoseLogId = diagnoseLogId;
this.init();
}
},
},
created() {},
beforeDestroy() { beforeDestroy() {
this.clearTime(); this.clearTime();
}, },
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
this.getErr(); this.getErr();
} }
}) })
.catch((err) => { .catch(() => {
this.getErr(); this.getErr();
}); });
}, },
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
return false; return false;
} }
}) })
.catch((err) => { .catch(() => {
this.getErr(); this.getErr();
}); });
}, },
...@@ -370,7 +370,7 @@ ...@@ -370,7 +370,7 @@
title: '为了更好的体验,请保证您输出设备的正常使用', title: '为了更好的体验,请保证您输出设备的正常使用',
}) })
.then(() => { .then(() => {
Promise.all([this.rtc.join()]).then((res) => { Promise.all([this.rtc.join()]).then(() => {
this.ispending(); this.ispending();
const t = setTimeout(() => { const t = setTimeout(() => {
closeLoading(this); closeLoading(this);
...@@ -379,8 +379,8 @@ ...@@ -379,8 +379,8 @@
}, 1000); }, 1000);
}); });
}) })
.catch((err) => { .catch(() => {
Promise.all([this.rtc.join()]).then((res) => { Promise.all([this.rtc.join()]).then(() => {
this.ispending(); this.ispending();
const t = setTimeout(() => { const t = setTimeout(() => {
closeLoading(this); closeLoading(this);
...@@ -404,7 +404,7 @@ ...@@ -404,7 +404,7 @@
} }
} }
}) })
.catch((err) => { .catch(() => {
console.log('获取视频参数数据失败'); console.log('获取视频参数数据失败');
}); });
}, },
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
title: `距离会诊结束还剩不足${timeObj.leftm}分钟`, title: `距离会诊结束还剩不足${timeObj.leftm}分钟`,
}) })
.then(() => {}) .then(() => {})
.catch((err) => {}); .catch(() => {});
}); });
} }
}, 1000); }, 1000);
...@@ -562,7 +562,7 @@ ...@@ -562,7 +562,7 @@
.then(() => { .then(() => {
this.out(); this.out();
}) })
.catch((err) => {}); .catch(() => {});
}, },
out() { out() {
diagnoseEndCall({ diagnoseEndCall({
...@@ -578,7 +578,7 @@ ...@@ -578,7 +578,7 @@
title: '操作失败,请稍后重试', title: '操作失败,请稍后重试',
}) })
.then(() => {}) .then(() => {})
.catch((err) => {}); .catch(() => {});
} }
}) })
.catch(() => { .catch(() => {
...@@ -588,27 +588,14 @@ ...@@ -588,27 +588,14 @@
title: '操作失败,请稍后重试', title: '操作失败,请稍后重试',
}) })
.then(() => {}) .then(() => {})
.catch((err) => {}); .catch(() => {});
}); });
}, },
// 获取信息失败 // 获取信息失败
getErr() { getErr() {
closeLoading(this); closeLoading(this);
// this.$nextTick(() => {
// this.$refs.alert
// .init({
// confirmTxt: "我知道了",
// title: `获取信息失败,请稍后重试`,
// })
// .then(() => {
// // this.$router.go(-1);
// })
// .catch((err) => {
// // this.$router.go(-1);
// });
// });
}, },
reloadfn(msg) { reloadfn() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.alert this.$refs.alert
.init({ .init({
...@@ -618,7 +605,7 @@ ...@@ -618,7 +605,7 @@
.then(() => { .then(() => {
// location.reload(); // location.reload();
}) })
.catch((err) => { .catch(() => {
// location.reload(); // location.reload();
}); });
}); });
......
...@@ -76,26 +76,7 @@ ...@@ -76,26 +76,7 @@
); );
}, },
fileUpload(file) { fileUpload(file) {
// const isJPG = file.type === "image/jpeg" || file.type === "image/img";
// if (!isJPG) {
// this.$message.error("请上传只能是 JPG或PNG 格式!");
// return;
// }
// const formData = new FormData();
// formData.append('file', file);
// fetch({
// url: getBaseUrl("/diagnose/illness/file"),
// method: "post",
// data: formData,
// fileHeader: true,
// withCredentials: true,
// })
// .then((res) => {
// this.imgArr.push({
// url: `${res.data}`,
// });
// })
// .catch(() => {});
}, },
sucess(response, file, fileList) { sucess(response, file, fileList) {
this.imgArr = fileList; this.imgArr = fileList;
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
</template> </template>
<script> <script>
import fetch from '@/utils/fetch';
import { getBaseUrl } from '@/utils/index'; import { getBaseUrl } from '@/utils/index';
import refundDetailVue from '../../views/IM/diagnosis-admin/refund-detail.vue'; import refundDetailVue from '../../views/IM/diagnosis-admin/refund-detail.vue';
export default { export default {
...@@ -111,27 +110,7 @@ ...@@ -111,27 +110,7 @@
}, },
// 上传mp3 // 上传mp3
beforeMusicUpload(file) { beforeMusicUpload(file) {
// this.loading = true
// if (file.type !== 'audio/mp3' && file.type !== 'audio/mpeg') {
// vm.$message.error("请上传MP3格式文件");
// this.loading = false
// return;
// }
// const formData = new FormData()
// formData.append('file', file)
// fetch({
// url: getBaseUrl("/diagnose/illness/audio/upload"),
// method: "post",
// data: formData,
// fileHeader: true,
// withCredentials: true,
// })
// .then((res) => {
// this.imgArr.push({
// url: `${res.data}`,
// });
// })
// .catch(() => {});
}, },
setNewArr() { setNewArr() {
const newArr = []; const newArr = [];
......
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import common from './modules/common'; import common from './modules/common';
import socket from './modules/socket'; import commonsocket from './modules/socket';
import getters from './getters'; import getters from './getters';
import state from './state'; import state from './state';
import mutations from './mutations/index'; import mutations from './mutations/index';
...@@ -9,7 +9,7 @@ import actions from './actions/index'; ...@@ -9,7 +9,7 @@ import actions from './actions/index';
Vue.use(Vuex); Vue.use(Vuex);
console.log('state---', state, common); console.log('state---', state, common);
console.log('socket----', socket); console.log('socket----', commonsocket);
const store = new Vuex.Store({ const store = new Vuex.Store({
state, state,
getters, getters,
...@@ -17,7 +17,7 @@ const store = new Vuex.Store({ ...@@ -17,7 +17,7 @@ const store = new Vuex.Store({
actions, actions,
modules: { modules: {
common, common,
socket // socket
}, },
}); });
......
@charset "utf-8";
*{
margin: 0;
padding: 0;
}
body{
background-color: $colorBackground;
// color: $color4;
}
a, a:hover, a:active, a:focus{
text-decoration: none;
color: $color4;
}
input{
border: 0;
outline: none;
}
img{
display: block;
border: 0;
width: 100%;
height: 100%;
}
.clear:before,
.clear:after{
content: '';
display: block;
clear: both;
height: 0;
}
input::-webkit-input-placeholder{
color: $color10 !important;
}
input::-moz-placeholder{
color: $color10 !important;
}
input::-ms-input-placeholder{
color: $color10 !important;
}
input[type=search]::-webkit-search-cancel-button{
-webkit-appearance: none;
}
.van-picker__toolbar {
height:45px;
background:rgba(255,255,255,1);
box-shadow:0px -4px 15px 0px rgba(0,0,0,0.05);
}
.van-picker__columns {
background:rgba(255,255,255,1);
box-shadow:0px -4px 15px 0px rgba(0,0,0,0.05);
}
.van-picker__confirm {
color: #15A4AC;
}
.van-picker__title {
font-size:13px;
font-weight:400;
color:rgba(131,139,152,1);
}
.fixed-bottom-20 {
position: fixed;
bottom: 20px;
}
.van-toast__icon {
font-size: 25px;
}
.page-right-content {
position: absolute;
left: -40px;
}
.flex-column {
display: flex;
flex-direction: column;
}
.flex-row {
display: flex;
flex-direction: row;
}
.flex-between {
justify-content: space-between;
}
.flex-around {
justify-content: space-around;
}
.flex-center {
align-items: center;
justify-content: center;
}
.flex-expanded {
flex: 1;
}
.van-action-sheet__item {
&:not(:first-child) {
border-top: 1px solid rgba(216, 216, 216, 0.8);
}
}
.van-cell__left-icon, .van-cell__right-icon {
line-height: 24px !important;
}
#app {
.__vuescroll .__refresh svg.start .active-path, .__vuescroll .__load svg.start .active-path {
stroke: #c8c9cc;
}
.__vuescroll .__refresh svg path, .__vuescroll .__refresh svg rect, .__vuescroll .__load svg path, .__vuescroll .__load svg rect {
fill: #c8c9cc;
}
.__vuescroll .__refresh, .__vuescroll .__load {
display: flex;
justify-content: center;
align-items: center;
font-size: 14px;
color: rgba(0,0,0, 0.5);
}
.__vuescroll .__refresh svg, .__vuescroll .__load svg {
height: 16px;
width: 16px;
}
}
.symbol-icon {
width: 1em;
height: 1em;
vertical-align: -0.15em;
fill: currentColor;
overflow: hidden;
}
.echarts-tip {
&-warp {
position: relative;
}
&-background {
background: #FBBD52;
padding: 1px 7px;
border-radius: 2px;
font-size: 13px;
}
&-triangle-down {
width: 0;
height: 0;
position: relative;
left: calc(50% - 4px);
top: 0;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 3px solid #FBBD52;
}
}
html {
color: #000;
background: #fff;
overflow-y: scroll;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%
}
html * {
outline: 0;
-webkit-text-size-adjust: none;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
}
html,body {
font-family: PingFangSC-Regular, -apple-system-font, Source Han Sans, Helvetica Neue, sans-serif;
}
body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, textarea, p, blockquote, th, td, hr, button, article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
margin: 0;
padding: 0;
}
/*
input, select, textarea {
font-size: 100%;
}
*/
table {
border-collapse: collapse;
border-spacing: 0;
}
fieldset, img {
border: 0;
}
abbr, acronym {
border: 0;
font-variant: normal;
}
del {
text-decoration: line-through;
}
address, caption, cite, code, dfn, em, th, var {
font-style: normal;
font-weight: 500;
}
ol, ul {
list-style: none;
}
caption, th {
text-align: left;
}
/*
h1, h2, h3, h4, h5, h6 {
font-size: 100%;
font-weight: 500;
}
*/
q:before, q:after {
content: '';
}
sub, sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sup {
top: -.5em;
}
sub {
bottom: -.25em;
}
a:hover {
text-decoration: underline;
}
ins, a {
text-decoration: none;
}
...@@ -200,7 +200,7 @@ html,body{ ...@@ -200,7 +200,7 @@ html,body{
} }
.el-button--primary { .el-button--primary {
line-height: 40px;
background: #0D9078 !important; background: #0D9078 !important;
border: 1px solid #0D9078 !important; border: 1px solid #0D9078 !important;
} }
......
import {isEmptyUtils, isNotEmptyUtils, subString} from './utils'; import {isEmptyUtils, isNotEmptyUtils, subString} from './utils';
import fetchQiniu from './fetch-qiniu.js'; import fetchQiniu from './fetch-qiniu.js';
import { getQiniuToken1, uploadVideo, uploadImg } from './index'; import { getQiniuToken1, uploadVideo, uploadImg } from './index';
import fetch from './fetch';
const qiniu = require('qiniu-js'); const qiniu = require('qiniu-js');
const fileApiUrl = getQiniuToken1(); const fileApiUrl = getQiniuToken1();
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
init() { init() {
getMatchList().then((res) => { getMatchList().then((res) => {
if (res.code == '000000') { if (res.code == '000000') {
this.operatorslist = data; this.operatorslist = res.data;
} }
}); });
}, },
......
该目录下放置需要路由的页面
> 如开启自动创建路由配置,则会自动把该目录的vue文件自动配置到routers。
#### 以__(两个下划线,例如__foo __.vue)开头和结尾的目录和文件将被忽略。
例如:
```
views/
├── __partial__.vue
├── index.vue
├── users.vue
└── users/
└── _id.vue
```
自动生成路由:
```js
export default [
{
name: 'index',
path: '/',
component: () => import('@/views/index.vue')
},
{
name: 'users',
path: '/users',
component: () => import('@/views/users.vue'),
children: [
{
name: 'users-id',
path: ':id?',
component: () => import('@/views/users/_id.vue')
}
]
}
]
```
如果路由页面采用分文件方式:template 为.vue文件,scss为样式等:
```
views/
└── users/
└── index.vue
```
自动生成路由:
```js
export default [
{
name: 'users',
path: '/users',
component: () => import('@/views/users/index.vue')
}
]
```
如果要使路由参数为必须,则创建一个该参数的目录,然后在该目录中添加`index.vue`。 在上面的示例中,如果将`users/_id.vue`替换为`users/_id/index.vue`,则需要:`id`参数。
### <route> 自定义标签块
如果页面组件有<route>自定义标签块,则该标签内的内容json将与route config合并。
例如,如果index.vue具有以下<route>块:
```vue
<route>
{
"name": "home",
"meta": {
"requiresAuth": true
}
}
</route>
<template>
<h1>Hello</h1>
</template>
```
生成的路由配置如下:
```js
module.exports = [
{
name: 'home',
path: '/',
component: () => import('@/views/index.vue'),
meta: {
requiresAuth: true
}
}
]
```
...@@ -97,7 +97,6 @@ ...@@ -97,7 +97,6 @@
getToken() { getToken() {
const href = window.location.href; const href = window.location.href;
const offset = href.indexOf('?'); const offset = href.indexOf('?');
// localStorage.setItem('token','475DB3D057AD489D81FE4E4DAB747B08')
if (offset !== -1) { if (offset !== -1) {
const paramStr = href.substring(offset + 1, href.length); const paramStr = href.substring(offset + 1, href.length);
const pars = base64decode(paramStr); const pars = base64decode(paramStr);
...@@ -155,7 +154,6 @@ ...@@ -155,7 +154,6 @@
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
@import '@/styles/common.scss';
@import "@/styles/global.scss"; @import "@/styles/global.scss";
@import "@/styles/mixin.scss"; @import "@/styles/mixin.scss";
.router-fade-enter-active, .router-fade-enter-active,
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
vuex: 'Vuex', vuex: 'Vuex',
'vue-router': 'VueRouter', 'vue-router': 'VueRouter',
axios: 'axios', axios: 'axios',
vant: 'vant',
'crypto-js/crypto-js': 'CryptoJS', 'crypto-js/crypto-js': 'CryptoJS',
'jsencrypt/bin/jsencrypt': 'JSEncrypt' 'jsencrypt/bin/jsencrypt': 'JSEncrypt'
}); });
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册