Commit e3d0a9dd authored by zhangjinzhou's avatar zhangjinzhou

暂存

parent 1ce0f63f
project/public/assets/guide1.png

162 KB | W: | H:

project/public/assets/guide1.png

49.7 KB | W: | H:

project/public/assets/guide1.png
project/public/assets/guide1.png
project/public/assets/guide1.png
project/public/assets/guide1.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -10,6 +10,8 @@
<script id="scriptjs" src="//yun.duiba.com.cn/js-libs/px-token/0.0.4/px-token.min.js"></script>
<script src="//yun.duiba.com.cn/js-libs/rem/1.1.0/rem.min.js"></script>
<script src="//yun.duiba.com.cn/h5/lib/zepto.min.js"></script>
<script src="http://yun.duiba.com.cn/db_games/libs0924/svgaParser.minWeb.js"></script>
<script>
function getApp() {
return {
......
This diff is collapsed.
......@@ -6,7 +6,7 @@ import API from '../../api';
import { Aup, AUPOP, AUP_MBX_STATE } from '../../pop';
import './main3.less';
import { CanvasWidget } from 'spark-utils';
import { Guideact } from '@spark/guideact';//'./bundle';//
import { Guideact } from './bundle';//'@spark/guideact';//
import { widgetConfig } from './widgetConfig';
import { GDispatcher } from "spark-wrapper-fyge"
import dataCenter, { Store } from '../../dataCenter';
......@@ -23,7 +23,7 @@ class Main3 extends Component {
};
}
updateMoney(){
updateMoney() {
console.log('update money')
}
......@@ -33,7 +33,7 @@ class Main3 extends Component {
}
onClick_signBtn = () => {
API.signInfo().then((res)=>{
API.signInfo().then((res) => {
Aup.show('Sign', res.data, this);
})
}
......@@ -53,10 +53,10 @@ class Main3 extends Component {
componentDidMount() {
this.initEvent();
if(!this.props.data.isnewUser) {
API.signInfo().then((res)=>{
const {needPopup} =res.data;
if(needPopup)
if (!this.props.data.isnewUser) {
API.signInfo().then((res) => {
const { needPopup } = res.data;
if (needPopup)
Aup.show('Sign', res.data, this);
})
}
......@@ -149,9 +149,9 @@ class Main3 extends Component {
txt: null,
role: [
{
rolex: 40,
roley: (canvashei - 764) / 2,
roletex: "guide1"
"rolex": 360,
"roley": 875,
"roletex": "guide1"
}
],
nextbtn: null,
......@@ -181,10 +181,10 @@ class Main3 extends Component {
txty: 224,
txtalign: "center"
},
role :[
role: [
{
rolex: 375,
roley: canvashei-550,
roley: canvashei - 550,
roletex: "guide2_1"
}
],
......@@ -220,10 +220,10 @@ class Main3 extends Component {
txty: 245,
txtalign: "left"
},
role :[
role: [
{
rolex: 375,
roley: canvashei-550,
roley: canvashei - 550,
roletex: "guide2_1"
}
],
......@@ -259,10 +259,10 @@ class Main3 extends Component {
txty: 357,
txtalign: "left"
},
role :[
role: [
{
rolex: 375,
roley: canvashei-550,
roley: canvashei - 550,
roletex: "guide2_1"
}
],
......@@ -297,10 +297,10 @@ class Main3 extends Component {
txty: 580,
txtalign: "left"
},
role :[
role: [
{
rolex: 375,
roley: canvashei-550,
roley: canvashei - 550,
roletex: "guide2_1"
}
],
......@@ -335,10 +335,10 @@ class Main3 extends Component {
txty: 500,
txtalign: "left"
},
role :[
role: [
{
rolex: 375,
roley: canvashei-550,
roley: canvashei - 550,
roletex: "guide2_1"
}
],
......@@ -358,16 +358,16 @@ class Main3 extends Component {
let offsety7 = 0;
let holly = 1110;
if((holly+165/2)>canvashei-300){
let holly1 = canvashei-300-165/2;
offsety7 = holly-holly1;
if ((holly + 165 / 2) > canvashei - 300) {
let holly1 = canvashei - 300 - 165 / 2;
offsety7 = holly - holly1;
}
this.guideconfig[7] = {
hole: {
holetype: "cir",
holex: 575,
holey: 1110-offsety7,
holey: 1110 - offsety7,
holesize: [
165,
440
......@@ -377,19 +377,19 @@ class Main3 extends Component {
text: "点击小卖铺可以进到\n商城页面,在这里购\n买心仪的物品哦~",
txtwidth: 320,
txtx: 85,
txty: 500-offsety7,
txty: 500 - offsety7,
txtalign: "left"
},
role :[
role: [
{
rolex: 0,
roley: canvashei-550,
roley: canvashei - 550,
roletex: "guide2_1"
}
],
nextbtn: {
btnx: 86,
btny: 665-offsety7,
btny: 665 - offsety7,
btntex: "nextbtn"
},
skipbtn: {
......@@ -401,7 +401,7 @@ class Main3 extends Component {
touch: touchdata,
pagey: offsety7,
}
console.log("77777偏移===》",offsety7);
console.log("77777偏移===》", offsety7);
_widget && _widget.dispatchInEvent("setStepData", {
step: 7,
stepdata: this.guideconfig[7]
......@@ -422,9 +422,9 @@ class Main3 extends Component {
case "guidecomplete":
dataCenter.setData(Store.needguide, false);
API.signInfo().then((res)=>{
const {needPopup} =res.data;
if(needPopup)
API.signInfo().then((res) => {
const { needPopup } = res.data;
if (needPopup)
Aup.show('Sign', res.data, this);
})
break;
......@@ -434,7 +434,7 @@ class Main3 extends Component {
let nowstepdata = this.guideconfig[payload];
let nowpagey = nowstepdata.pagey;
this.refs.main3.scrollTop = nowpagey;
console.log("滑动位置调整===》",nowpagey);
console.log("滑动位置调整===》", nowpagey);
break;
default:
......@@ -515,7 +515,7 @@ class Main3 extends Component {
src={this.state.resList['98666530-5e40-49d7-8b86-8397e3ee0889'].url}
/>
<img
onClick={this.onClick_shareBtn}
onClick={this.onClick_shareBtn}
className="main3_share "
uuid="def4d721-bfe0-4c42-970c-40d99e1c2944"
src={this.state.resList['82a28387-28f0-4e49-856a-dbe5e981bbb1'].url}
......
......@@ -7,8 +7,8 @@
"txt": null,
"role": [
{
"rolex": 40,
"roley": 460,
"rolex": 360,
"roley": 875,
"roletex": "guide1"
}
],
......@@ -48,8 +48,8 @@
},
"role": [
{
"rolex": 375,
"roley": 911,
"rolex": 360,
"roley": 875,
"roletex": "guide2_1"
}
],
......@@ -93,8 +93,8 @@
},
"role": [
{
"rolex": 375,
"roley": 911,
"rolex": 360,
"roley": 875,
"roletex": "guide2_1"
}
],
......@@ -137,8 +137,8 @@
},
"role": [
{
"rolex": 375,
"roley": 911,
"rolex": 360,
"roley": 875,
"roletex": "guide2_1"
}
],
......@@ -181,8 +181,8 @@
},
"role": [
{
"rolex": 375,
"roley": 911,
"rolex": 360,
"roley": 875,
"roletex": "guide2_1"
}
],
......@@ -225,8 +225,8 @@
},
"role": [
{
"rolex": 375,
"roley": 911,
"rolex": 360,
"roley": 875,
"roletex": "guide2_1"
}
],
......@@ -344,8 +344,8 @@
},
"role": [
{
"rolex": 238,
"roley": 768,
"rolex": 0,
"roley": 0,
"roletex": "guide2_1"
}
],
......
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