Commit 61906b5d authored by Edwise's avatar Edwise 🍷

1

parent ecad66a0
...@@ -16,3 +16,10 @@ ...@@ -16,3 +16,10 @@
flex-direction: column; flex-direction: column;
} }
.testBg {
width:750rpx;
height:1624rpx;
position:fixed;
top:0rpx;
left:0rpx;
}
\ No newline at end of file
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<canvas disable-scroll="true" id="canvas" class="canvas" onTouchStart="onMouseEvent" onTouchMove="onMouseEvent" onTouchEnd="onMouseEvent" onReady="onCanvasReady"> <canvas disable-scroll="true" id="canvas" class="canvas" onTouchStart="onMouseEvent" onTouchMove="onMouseEvent" onTouchEnd="onMouseEvent" onReady="onCanvasReady">
</canvas> </canvas>
</view> </view>
<image class="testBg" a:if="{{customValue==1}}" src={{resList['2ef3e6b8-e635-4007-ba62-36df45e096c1'].url}} />
<end-modal a:if="{{endModalVisible}}" ></end-modal> <end-modal a:if="{{endModalVisible}}" ></end-modal>
<rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal> <rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
import { import {
Main Main
} from './output'; } from './output';
import resList from '../../resconfig/resList'; //import API from '../../api';
import API from '../../api'; import API from '../../api';
const app = getApp(); const app = getApp();
const { const {
...@@ -33,6 +34,7 @@ const checkSystem = async () => { ...@@ -33,6 +34,7 @@ const checkSystem = async () => {
Page({ Page({
data: { data: {
resList: resList,
catType: 1, catType: 1,
catName: '', catName: '',
activityBaseInfo: null, activityBaseInfo: null,
...@@ -52,7 +54,8 @@ Page({ ...@@ -52,7 +54,8 @@ Page({
getcatModalData: {}, getcatModalData: {},
catbackbedModalVisible: false, catbackbedModalVisible: false,
catruleModalVisible: 0, catruleModalVisible: 0,
thanksModalVisible:false thanksModalVisible:false,
customValue:1
}, },
async doHelp() { async doHelp() {
if (!app.inviteId) return; if (!app.inviteId) return;
...@@ -356,7 +359,12 @@ Page({ ...@@ -356,7 +359,12 @@ Page({
if (success) { if (success) {
my.hideLoading(); my.hideLoading();
app.openId = data.openId; app.openId = data.openId;
this.initCanvas(); if(data.customValue != 1){
this.initCanvas();
}
this.setData({
customValue:data.customValue
})
this.getActivityBaseInfoById(); this.getActivityBaseInfoById();
} }
......
...@@ -575,5 +575,11 @@ const resList = { ...@@ -575,5 +575,11 @@ const resList = {
uuid: '255668e8-739f-41a5-9f83-207def3aa3fd', uuid: '255668e8-739f-41a5-9f83-207def3aa3fd',
url: '//yun.duiba.com.cn/spark/assets/cf23d4ed33f7fa384c206ba3f4c1c965f3aaa000.png' url: '//yun.duiba.com.cn/spark/assets/cf23d4ed33f7fa384c206ba3f4c1c965f3aaa000.png'
}, },
'2ef3e6b8-e635-4007-ba62-36df45e096c1': {
name: 'lodingFake',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/lodingFake.1897ec11d95b52aecae8a6771a1d8b838583ab7b.png',
uuid: '2ef3e6b8-e635-4007-ba62-36df45e096c1'
}
}; };
export default resList; export default resList;
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