diff --git a/src/assets/video/chest_bg_2.mp4 b/src/assets/video/chest_bg_2.mp4 index 6eafb21..c818131 100644 Binary files a/src/assets/video/chest_bg_2.mp4 and b/src/assets/video/chest_bg_2.mp4 differ diff --git a/src/main.js b/src/main.js index 379b1e4..8e38b85 100644 --- a/src/main.js +++ b/src/main.js @@ -53,7 +53,7 @@ datafluxRum.init({ traceType: 'ddtrace', // 非必填,默认为ddtrace,目前支持 ddtrace、zipkin、skywalking_v3、jaeger、zipkin_single_header、w3c_traceparent 6种类型 allowedTracingOrigins: ['https://api.example.com',/https:\/\/.*\.my-api-domain\.com/], // 非必填,允许注入trace采集器所需header头部的所有请求列表。可以是请求的origin,也可以是是正则 }); -datafluxRum.startSessionReplayRecording() +// datafluxRum.startSessionReplayRecording() Vue.config.productionTip = false diff --git a/src/utils/version.js b/src/utils/version.js index e37e5a6..f7d1efe 100644 --- a/src/utils/version.js +++ b/src/utils/version.js @@ -1,4 +1,4 @@ // const version = require('./package.json').version -const marketVersion = '1.0.2' +const marketVersion = '1.0.3' export default marketVersion \ No newline at end of file diff --git a/src/utils/webapi.js b/src/utils/webapi.js index 58034d4..69ea823 100644 --- a/src/utils/webapi.js +++ b/src/utils/webapi.js @@ -66,13 +66,13 @@ export const loginNonce = async (address) => { return nonce; } -export const loginWithSignature = async (message, signature, activity) => { +export const loginWithSignature = async (message, signature, activity, wallet) => { let fps = await fp.load(); let result = await fps.get() const clientId = result.clientId; return fetch(`${API_BASE}/api/wallet/login`, { method: "POST", - body: JSON.stringify({ message, signature, activity,clientId }), + body: JSON.stringify({ message, signature, activity,clientId, wallet }), headers: { "Content-Type": "application/json", }, diff --git a/src/views/home/boxBtm.vue b/src/views/home/boxBtm.vue index 45a0929..d7eeeca 100644 --- a/src/views/home/boxBtm.vue +++ b/src/views/home/boxBtm.vue @@ -54,12 +54,7 @@
-
@@ -321,7 +316,7 @@ export default { boostingCurrentPage: 1, isLoading: false, originalNumber: 5, - divisor: 1 + divisor: 1, }; }, computed: { @@ -359,6 +354,7 @@ export default { // 助力进度条 filteredBoxBar() { + console.log(this.boxData.bounsCount,this.boxData.maxBounsCount,'====================') if (this.boxData.bounsCount) { return Math.floor( (Number(this.boxData.bounsCount) / @@ -369,6 +365,19 @@ export default { return 0; } }, + videoKey() { + if(this.filteredBoxBar <= 20) { + return 1 + } else if(this.filteredBoxBar <= 40) { + return 2 + } else if(this.filteredBoxBar <= 60) { + return 3 + } else if(this.filteredBoxBar <= 80) { + return 4 + } else if(this.filteredBoxBar <= 100) { + return 5 + } + }, }, mounted() { this.token = getToken(); @@ -721,8 +730,7 @@ export default { width: 720px; height: 700px; background: #fff; - background: url("./../../assets/box/Bg_chest.png") no-repeat; - background-size: 100% 100%; + background: #1a1821; position: relative; top: -20px; .videoContainer { diff --git a/src/wallet/index.js b/src/wallet/index.js index 8402137..42f65fb 100644 --- a/src/wallet/index.js +++ b/src/wallet/index.js @@ -245,8 +245,8 @@ export class Wallet { // console.log(chainId, "----"); const nonce = await loginNonce(address); // console.log(nonce, "nonce-------------"); - const nonceStr = `${nonce}| ${walletType}`; - const nonceEncrypt = hexToBase58(aesEncrypt(nonceStr, 'uaw_activity')); + + // const nonceEncrypt = hexToBase58(aesEncrypt(nonceStr, 'uaw_activity')); const message = new SiweMessage({ domain: document.location.host, address: address, @@ -254,14 +254,14 @@ export class Wallet { uri: document.location.origin, version: '1', statement: process.env.VUE_APP_APP_NAME, - nonce: nonceEncrypt, + nonce, }); let msgSign = message.toMessage(); let signature = await this.provider.request({ method: 'personal_sign', params: [web3.utils.utf8ToHex(msgSign), address], }); - let resLogin = await loginWithSignature(message, signature, activityList.activity); + let resLogin = await loginWithSignature(message, signature, activityList.activity, walletType); // console.log(resLogin.errcode, '61'); if (!resLogin.errcode) { new GlobalData().token = resLogin.data.token;