Skip to content

J
jueqing
Commit 028ad081 by xhw
Options

更新

parent d625f845
Showing with 77 additions and 31 deletions
pages/index/index.vue
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
<view class="sendMoney plg4"> <view class="sendMoney plg4">
<button open-type="share" @click="shareToTimeline" class="shareWord"></button> <button open-type="share" @click="shareToTimeline" class="shareWord"></button>
</view> </view>
<view @click="sendMoneyMethods" class="sendMoney plg5" ></view> <view @click="sendMoneyMethods" class="sendMoney plg5" v-if="tools_money"></view>
<!-- v-if="JSON.parse(currentPageData.worldParameter).includes('物品')" --> <!-- v-if="JSON.parse(currentPageData.worldParameter).includes('物品')" -->
<view class="sendMoney plg6" @click="handleMore"></view> <view class="sendMoney plg6" @click="handleMore" v-if="tools_total"></view>
</view> </view>
<!-- 提供一个弹窗 用于输入昵称 --> <!-- 提供一个弹窗 用于输入昵称 -->
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<view v-if="board" class="board"> <view v-if="board" class="board">
<view class="jk"> <view class="jk">
<!-- <image class="bk" :src="base64Img" /> --> <!-- <image class="bk" :src="base64Img" /> -->
<view class="imageH" :style="{backgroundImage:'url(' + base64Img + ')',backgroundSize:'contain',backgroundRepeat:'no-repeat'}"></view> <view class="imageH" :style="{backgroundImage:'url(' + base64Img + ')',backgroundSize:'cover',backgroundRepeat:'no-repeat'}"></view>
<!-- 内容区域 --> <!-- 内容区域 -->
<!-- background: 'url(../../static/UI/结局框.png)', --> <!-- background: 'url(../../static/UI/结局框.png)', -->
<view class="jklock"> </view> <view class="jklock"> </view>
...@@ -420,6 +420,8 @@ var recorderManager = uni.getRecorderManager(); ...@@ -420,6 +420,8 @@ var recorderManager = uni.getRecorderManager();
export default { export default {
data() { data() {
return { return {
tools_money:true,
tools_total:true,
UI_show:true, UI_show:true,
normal:false, normal:false,
ttf:false, ttf:false,
...@@ -630,6 +632,21 @@ export default { ...@@ -630,6 +632,21 @@ export default {
console.log('this.worldParameter',this.worldParameter) console.log('this.worldParameter',this.worldParameter)
console.log('currentPageData',this.currentPageData) console.log('currentPageData',this.currentPageData)
console.log()
const tool = JSON.parse(this.currentPageData.worldRules).tools
if(tool.length==0){
//道具红包都不显示
this.tools_money = false
this.tools_total = false
}else if(tool.length==1){
if(tool[0]=="物品"){
this.tools_money = false
}else if(tool[0]=="红包"){
this.tools_total = false
}
}else if(tool.length==2){
//红包物品都显示
}
this.worldParameter = JSON.parse(this.currentPageData.worldParameter) this.worldParameter = JSON.parse(this.currentPageData.worldParameter)
this.worldParameter = this.worldParameter.filter(item=>{ this.worldParameter = this.worldParameter.filter(item=>{
return item!='时间' && item!='地点' && item!='物品' return item!='时间' && item!='地点' && item!='物品'
...@@ -864,7 +881,7 @@ export default { ...@@ -864,7 +881,7 @@ export default {
uni.hideLoading(); uni.hideLoading();
//处理把数据添加至页面 //处理把数据添加至页面
const backValue = JSON.parse(message.data) const backValue = JSON.parse(message.data)
// console.log('----onMessage----',backValue) console.log('----onMessage----',backValue)
if(!this.header){ if(!this.header){
this.glod_dp = false //先隐藏数字人对话框 this.glod_dp = false //先隐藏数字人对话框
} }
...@@ -1213,10 +1230,8 @@ export default { ...@@ -1213,10 +1230,8 @@ export default {
}) })
}, },
getPhoto(){ reloadGetPhoto(){
//获取背景图 uni.request({
uni.request(
{
url:`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.png` ? url:`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.png` ?
`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.png` : `https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.png` :
`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.jpg` ? `https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.jpg` ?
...@@ -1225,6 +1240,7 @@ export default { ...@@ -1225,6 +1240,7 @@ export default {
`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.gif` : `https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.gif` :
`/images/ai1.png`, `/images/ai1.png`,
method: 'GET', method: 'GET',
responseType: 'arraybuffer',
data: { data: {
id: this.currentPageData.worldName, id: this.currentPageData.worldName,
}, },
...@@ -1233,14 +1249,41 @@ export default { ...@@ -1233,14 +1249,41 @@ export default {
'Cookie': `${uni.getStorageSync('session_token')}`, 'Cookie': `${uni.getStorageSync('session_token')}`,
"Cache-Control": "no-cache" "Cache-Control": "no-cache"
} }
}).then(res => { }).then(res => {
const arrayBuffer = res[1].data const arrayBuffer = res[1].data
this.codeUrl = 'data:image/png;base64,' + uni.arrayBufferToBase64(arrayBuffer); this.dpPhoto = 'data:image/png;base64,' + uni.arrayBufferToBase64(arrayBuffer);
}).catch(err => console.log(err)) }).catch(err => {
console.log(err)
})
},
//获取数字人头像 getPhoto(){
//获取背景图
uni.request( uni.request(
{ {
url:`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.png` ?
`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.png` :
`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.jpg` ?
`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.jpg` :
`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.gif` ?
`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.gif` :
`/images/ai1.png`,
method: 'GET',
data: {
id: this.currentPageData.worldName,
},
responseType: 'arraybuffer',
header: {
'Cookie': `${uni.getStorageSync('session_token')}`,
"Cache-Control": "no-cache"
}
}).then(res => {
const arrayBuffer = res[1].data
this.codeUrl = 'data:image/png;base64,' + uni.arrayBufferToBase64(arrayBuffer);
}).catch(err => console.log(err))
//获取数字人头像
uni.request({
url:`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.png` ? url:`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.png` ?
`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.png` : `https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.png` :
`https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.jpg` ? `https://admin.mindepoch.com:8089/worlds/${this.currentPageData.worldName}.jpg` ?
...@@ -2715,7 +2758,7 @@ export default { ...@@ -2715,7 +2758,7 @@ export default {
} }
.board{ .board{
width: 80vw; width: 80vw;
height: 85vh; height: 70vh;
border-radius: 10rpx; border-radius: 10rpx;
position: fixed; position: fixed;
top:50%; top:50%;
...@@ -2723,7 +2766,9 @@ export default { ...@@ -2723,7 +2766,9 @@ export default {
transform: translate(-50%,-50%); transform: translate(-50%,-50%);
z-index: 999999; z-index: 999999;
padding: 12rpx; padding: 12rpx;
/**
overflow-y:scroll; overflow-y:scroll;
**/
} }
.boardBG{ .boardBG{
width: 80vw; width: 80vw;
...@@ -2760,10 +2805,10 @@ export default { ...@@ -2760,10 +2805,10 @@ export default {
padding: 0rpx 30rpx; padding: 0rpx 30rpx;
line-height: 45rpx; line-height: 45rpx;
overflow-y: scroll; overflow-y: scroll;
height: 350rpx; height: 450rpx;
} }
.imageH{ .imageH{
height: 340rpx; height: 320rpx;
width: 80%; width: 80%;
margin:auto; margin:auto;
z-index: -1; z-index: -1;
...@@ -2773,11 +2818,11 @@ export default { ...@@ -2773,11 +2818,11 @@ export default {
top:0; top:0;
left:0; left:0;
background-image: url(https://admin.mindepoch.com:8089/worlds/结局框.png); background-image: url(https://admin.mindepoch.com:8089/worlds/结局框.png);
background-size: contain; background-size: cover;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 80vw; width: 80vw;
height: 80vh; height: 70vh;
z-index:-2; z-index:-2;
} }
.HHH{ .HHH{
...@@ -2821,9 +2866,11 @@ export default { ...@@ -2821,9 +2866,11 @@ export default {
height: 60rpx; height: 60rpx;
width:100%; width:100%;
display: flex; display: flex;
margin-top: 20px;
/**
position:absolute; position:absolute;
bottom:60rpx; bottom:60rpx;
left:0; left:0; **/
} }
.home{ .home{
width: 200rpx; width: 200rpx;
......
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/common/vendor.js
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/pages/index/index.js
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/pages/index/index.wxss
...@@ -557,7 +557,7 @@ ...@@ -557,7 +557,7 @@
} }
.board.data-v-57280228{ .board.data-v-57280228{
width: 80vw; width: 80vw;
height: 85vh; height: 70vh;
border-radius: 10rpx; border-radius: 10rpx;
position: fixed; position: fixed;
top:50%; top:50%;
...@@ -566,7 +566,9 @@ ...@@ -566,7 +566,9 @@
transform: translate(-50%,-50%); transform: translate(-50%,-50%);
z-index: 999999; z-index: 999999;
padding: 12rpx; padding: 12rpx;
/**
overflow-y:scroll; overflow-y:scroll;
**/
} }
.boardBG.data-v-57280228{ .boardBG.data-v-57280228{
width: 80vw; width: 80vw;
...@@ -604,10 +606,10 @@ ...@@ -604,10 +606,10 @@
padding: 0rpx 30rpx; padding: 0rpx 30rpx;
line-height: 45rpx; line-height: 45rpx;
overflow-y: scroll; overflow-y: scroll;
height: 350rpx; height: 450rpx;
} }
.imageH.data-v-57280228{ .imageH.data-v-57280228{
height: 340rpx; height: 320rpx;
width: 80%; width: 80%;
margin:auto; margin:auto;
z-index: -1; z-index: -1;
...@@ -617,11 +619,11 @@ ...@@ -617,11 +619,11 @@
top:0; top:0;
left:0; left:0;
background-image: url(https://admin.mindepoch.com:8089/worlds/结局框.png); background-image: url(https://admin.mindepoch.com:8089/worlds/结局框.png);
background-size: contain; background-size: cover;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 80vw; width: 80vw;
height: 80vh; height: 70vh;
z-index:-2; z-index:-2;
} }
.HHH.data-v-57280228{ .HHH.data-v-57280228{
...@@ -666,9 +668,11 @@ ...@@ -666,9 +668,11 @@
height: 60rpx; height: 60rpx;
width:100%; width:100%;
display: flex; display: flex;
margin-top: 20px;
/**
position:absolute; position:absolute;
bottom:60rpx; bottom:60rpx;
left:0; left:0; **/
} }
.home.data-v-57280228{ .home.data-v-57280228{
width: 200rpx; width: 200rpx;
......
unpackage/dist/dev/mp-weixin/project.config.json
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
}, },
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"es6": false,
"postcss": false,
"minified": false,
"newFeature": true,
"bigPackageSizeSupport": true,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],
......
unpackage/dist/dev/mp-weixin/uni_modules/zebra-swiper/components/z-swiper/z-swiper.js
This source diff could not be displayed because it is too large. You can view the blob instead.
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