Skip to content

Commit

Permalink
偏移
Browse files Browse the repository at this point in the history
  • Loading branch information
cayuli committed Jul 24, 2018
1 parent 959ebb2 commit f9aad6e
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 15 deletions.
11 changes: 11 additions & 0 deletions .eslintrc.js
Expand Up @@ -7,6 +7,17 @@ module.exports = {
env: {
browser: true
},
globals: {
globalData: true,
props: true,
config: true,
mixins: true,
data: true,
components: true,
methods: true,
props: true,
computed: true
},
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
extends: 'standard',
// required to lint *.wpy files
Expand Down
1 change: 1 addition & 0 deletions project.config.json
Expand Up @@ -11,6 +11,7 @@
"appid": "wx025841df48304564",
"projectname": "luckdraw",
"miniprogramRoot": "./dist",
"libVersion": "2.2.0",
"condition": {
"search": {
"current": -1,
Expand Down
4 changes: 2 additions & 2 deletions src/app.wpy
Expand Up @@ -6,7 +6,6 @@ import { service } from './config.js'
export default class extends wepy.app {
config = {
pages: [
'pages/turn',
'pages/home',
'pages/historyDraw',
'pages/getMoreFLC',
Expand All @@ -22,7 +21,8 @@ export default class extends wepy.app {
'pages/record',
'pages/probability',
'pages/FLBRecord',
'pages/strategy'
'pages/strategy',
'pages/turn'
],
window: {
backgroundTextStyle: 'light',
Expand Down
10 changes: 5 additions & 5 deletions src/pages/getMoreFLC.wpy
Expand Up @@ -158,8 +158,8 @@ export default class FLBRecord extends wepy.page {
label {
color: #fb5a35;
font-size: 40rpx;
// font-weight: bold;
line-height: 50rpx;
margin-bottom: 6rpx;
}
text {
color: #888888;
Expand All @@ -170,16 +170,16 @@ export default class FLBRecord extends wepy.page {
padding: 0 32rpx;
background-color: white;
.coinTitle {
height: 83rpx;
line-height: 83rpx;
height: 86rpx;
line-height: 86rpx;
color: #333;
font-size: 32rpx;
}
.coinItems {
width: 100%;
view {
height: 92rpx;
line-height: 92rpx;
height: 91rpx;
line-height: 91rpx;
border-bottom: 1rpx solid #ebebeb;
label {
color: #999;
Expand Down
11 changes: 4 additions & 7 deletions src/pages/historyDraw.wpy

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/pages/turn.wpy
Expand Up @@ -50,7 +50,6 @@ export default class Home extends wepy.page {
isBackBtn: false,
titleText: '抽奖',
canRoll: true, // 控制 防止用户点击两次
lotteryArrLen: 0,
num: 1, // 用户第二次点击时接着上次角度继续转
// width[i]=(turnDeg[i]-turnDeg[i-1])/2 tan旋转的角度
turnwidth: [6, 30, 27, 29, 28, 30, 27, 30, 28, 29, 10, 30, 27, 29], // 每个区域占的角度
Expand Down

0 comments on commit f9aad6e

Please sign in to comment.