Commit dbad5244 authored by salitedfish's avatar salitedfish

代码优化及bug修复

parent 6f75b0b4
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"test": "vue-cli-service serve --mode test", "test": "vue-cli-service serve --mode test",
"deploy:test": "vue-cli-service build --mode test && bash ./test_deploy.sh", "deploy:test": "vue-cli-service build --mode test && bash ./test_deploy.sh",
"build": "vue-cli-service build" "build": "vue-cli-service build --mode test"
}, },
"dependencies": { "dependencies": {
"@tailwindcss/line-clamp": "^0.2.1", "@tailwindcss/line-clamp": "^0.2.1",
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<script src="/iconfont.js"></script> <script src="/iconfont.js"></script>
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" /> <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
<!-- <title><%= htmlWebpackPlugin.options.title %></title> --> <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
<title>inmvo</title> <title>一幕影链</title>
</head> </head>
<body> <body>
<noscript> <noscript>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<!-- <app-icon name="icon-xingzhuang" size="24px"></app-icon> --> <!-- <app-icon name="icon-xingzhuang" size="24px"></app-icon> -->
</div> </div>
<div @click="info"> <div @click="info">
<van-badge :content="0" > <van-badge :content="null" >
<app-icon name="icon-xiaoxi" size="24px" @click.native='$router.push({name:"Deving"})'></app-icon> <app-icon name="icon-xiaoxi" size="24px" @click.native='$router.push({name:"Deving"})'></app-icon>
</van-badge> </van-badge>
</div> </div>
......
...@@ -454,6 +454,11 @@ export default Vue.extend({ ...@@ -454,6 +454,11 @@ export default Vue.extend({
console.log(this.nftData.status); console.log(this.nftData.status);
if(!this.$route.query.officia) { if(!this.$route.query.officia) {
this.showoverlay = true this.showoverlay = true
if(this.nftData.fileUrl && this.nftData.isCommemorate == 0) {
this.$toast('功能正在上线中,请耐心等候')
}else if(this.nftData.isCommemorate == 0) {
this.$toast('用户没有上传文件,不可查看')
}
} }
if (this.nftData.status === 1) { if (this.nftData.status === 1) {
this.getOfficialNft='loading' this.getOfficialNft='loading'
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<van-action-sheet v-model="showAction" title=" " :closeable='false'> <van-action-sheet v-model="showAction" title=" " :closeable='false'>
<div class="content bg-font-light-black py-10 mt-8"> <div class="content bg-font-light-black py-10 mt-8">
<div class=" w-11/12 mx-auto flex flex-col justify-center items-center"> <div class=" w-11/12 mx-auto flex flex-col justify-center items-center">
<div>NFT接受地址</div> <div>我的地址</div>
<div class=" p-2 "> <div class=" p-2 ">
<img :src="qrcode" class=' w-full'> <img :src="qrcode" class=' w-full'>
</div> </div>
......
...@@ -79,6 +79,7 @@ export default Vue.extend({ ...@@ -79,6 +79,7 @@ export default Vue.extend({
// 摄像头分辨率,手机480x640 // 摄像头分辨率,手机480x640
console.log("摄像头分辨率"); console.log("摄像头分辨率");
console.log(video.videoWidth, video.videoHeight); console.log(video.videoWidth, video.videoHeight);
_this.cameraWidth = video.videoWidth; _this.cameraWidth = video.videoWidth;
_this.cameraHeight = video.videoHeight; _this.cameraHeight = video.videoHeight;
// 发送图片进行识别 // 发送图片进行识别
...@@ -179,6 +180,21 @@ export default Vue.extend({ ...@@ -179,6 +180,21 @@ export default Vue.extend({
navigator.webkitGetUserMedia || navigator.webkitGetUserMedia ||
navigator.mozGetUserMedia navigator.mozGetUserMedia
) { ) {
console.log('手机型号',navigator.userAgent.toLowerCase())
if(navigator.userAgent.toLowerCase().match(/huawei/i) == 'huawei') {
//调用用户媒体设备,访问摄像头
this.initVideo({
video: {
height: 500,
facingMode: "environment",
// facingMode: {
// // 强制后置摄像头
// // exact: "user",
// exact: "environment",
// },
},
});
}else {
//调用用户媒体设备,访问摄像头 //调用用户媒体设备,访问摄像头
this.initVideo({ this.initVideo({
video: { video: {
...@@ -191,6 +207,9 @@ export default Vue.extend({ ...@@ -191,6 +207,9 @@ export default Vue.extend({
// }, // },
}, },
}); });
}
} else { } else {
// alert("你的浏览器不支持访问用户媒体设备"); // alert("你的浏览器不支持访问用户媒体设备");
this.$emit("onerror", "你的浏览器不支持访问用户媒体设备"); this.$emit("onerror", "你的浏览器不支持访问用户媒体设备");
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<app-cell text='昵称' boxType='border' :value='userInfo.nickname?userInfo.nickname:"无昵称"' icon='icon-xiayibu' @click.native="goEdit({type:'nickname',title:'设置昵称'})"></app-cell> <app-cell text='昵称' boxType='border' :value='userInfo.nickname?userInfo.nickname:"无昵称"' icon='icon-xiayibu' @click.native="goEdit({type:'nickname',title:'设置昵称'})"></app-cell>
<app-cell text='手机号' boxType='border' type='click' :value='userInfo.telephone?userInfo.telephone:""' ></app-cell> <app-cell text='手机号' boxType='border' type='click' :value='userInfo.telephone?userInfo.telephone:""' ></app-cell>
<!-- <app-cell text='邮箱绑定' boxType='border' :value='userInfo.email?userInfo.email:""' icon='icon-xiayibu' @click.native="goEdit({type:'email',title:'邮箱绑定'})"></app-cell> --> <!-- <app-cell text='邮箱绑定' boxType='border' :value='userInfo.email?userInfo.email:""' icon='icon-xiayibu' @click.native="goEdit({type:'email',title:'邮箱绑定'})"></app-cell> -->
<app-cell text='个性签名' boxType='border' icon='icon-xiayibu' @click.native="goEdit({type:'signature',title:'个性签名'})"></app-cell> <app-cell text='个性签名' :value="signature" boxType='border' icon='icon-xiayibu' @click.native="goEdit({type:'signature',title:'个性签名'})"></app-cell>
<!-- <app-cell text='安全中心' boxType='border' icon='icon-xiayibu' @click.native='$router.push({name:"Deving"})' ></app-cell> <!-- <app-cell text='安全中心' boxType='border' icon='icon-xiayibu' @click.native='$router.push({name:"Deving"})' ></app-cell>
<app-cell text='消息管理' boxType='border' icon='icon-xiayibu' @click.native='$router.push({name:"Deving"})'></app-cell> --> <app-cell text='消息管理' boxType='border' icon='icon-xiayibu' @click.native='$router.push({name:"Deving"})'></app-cell> -->
</div> </div>
...@@ -34,9 +34,21 @@ export default Vue.extend({ ...@@ -34,9 +34,21 @@ export default Vue.extend({
], ],
file:{}, file:{},
avatarImgUrl:'' avatarImgUrl:'',
} }
}, },
computed:{
signature(){
const sign = JSON.parse(localStorage.getItem('KEY_USER') as string).signature
if(!sign) {
return '未编辑'
}else if(sign.length <= 10) {
return sign
}else{
return sign.substring(0,10) + '...'
}
}
},
components:{ components:{
'Layout-Child':()=>import('@/layout/Child.vue'), 'Layout-Child':()=>import('@/layout/Child.vue'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment