diff --git a/common/js/api.js b/common/js/api.js
index 4a693db..7475aba 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -1,6 +1,8 @@
// let baseUrl = 'http://192.168.66.221:8000'
-let baseUrl = 'http://192.168.66.16:8084'
-// baseUrl = 'https://ggl.xingtongworld.com'
+// let baseUrl = 'http://192.168.66.16:8084'
+// let baseUrl = 'http://192.168.31.119:8000'
+
+let baseUrl = 'https://ggl.xingtongworld.com'
// baseUrl = 'https://ggl.dingguagua.vip'
// baseUrl = 'https://apps.dingguagua.vip'
diff --git a/manifest.json b/manifest.json
index ce93d5b..67a9781 100644
--- a/manifest.json
+++ b/manifest.json
@@ -71,5 +71,12 @@
"uniStatistics" : {
"enable" : false
},
- "vueVersion" : "2"
+ "vueVersion" : "2",
+ "h5" : {
+ "optimization" : {
+ "treeShaking" : {
+ "enable" : false
+ }
+ }
+ }
}
diff --git a/pages.json b/pages.json
index dbdd7ae..00a0423 100644
--- a/pages.json
+++ b/pages.json
@@ -341,8 +341,16 @@
"enablePullDownRefresh": false
}
- }
-
+ },
+ {
+ "path" : "pages/about/ProbabilitySettings/ProbabilitySettings",
+ "style" :
+ {
+ "navigationBarTitleText": "概率设置",
+ "enablePullDownRefresh": false
+ }
+
+ }
,{
"path" : "pages/recordsList/WinningRecord/WinningRecord",
"style" :
diff --git a/pages/about/ProbabilitySettings/ProbabilitySettings.vue b/pages/about/ProbabilitySettings/ProbabilitySettings.vue
new file mode 100644
index 0000000..36cc704
--- /dev/null
+++ b/pages/about/ProbabilitySettings/ProbabilitySettings.vue
@@ -0,0 +1,75 @@
+
+
+
+ 概率:
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/about/about.vue b/pages/about/about.vue
index 71271d1..98a784a 100644
--- a/pages/about/about.vue
+++ b/pages/about/about.vue
@@ -56,6 +56,12 @@
"to": '/pages/about/noticeManage/noticeManage',
"icon": "compose",
"iconN": "flag"
+ },
+ {
+ "title": '概率设置',
+ "to": '/pages/about/ProbabilitySettings/ProbabilitySettings',
+ "icon": "compose",
+ "iconN": "probability"
}
]
]
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 20e881e..501e0bd 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -43,11 +43,11 @@
- {{item.title}}
- 面值{{item.price}}元
+ {{item.title}}
+ 面值{{item.price}}元
最高中奖金额{{item.max_awards_amount}}
- 立即刮奖
+ 刮奖
@@ -792,18 +792,18 @@
.goods-info{
display: flex;
flex-direction: column;
- justify-content: space-between;
+ // justify-content: space-between;
margin: 0px 5px;
flex: 1;
}
.goods-btn{
- width: 78px;
- height: 40px;
+ width: 50px;
+ height: 30px;
background-color: #e33838;
border-radius: 5px;
- font-size: 14px;
+ font-size: 11px;
color: #fff;
- line-height: 40px;
+ line-height: 30px;
text-align: center;
}
}
diff --git a/static/user/icon_probability.png b/static/user/icon_probability.png
new file mode 100644
index 0000000..240bb1d
Binary files /dev/null and b/static/user/icon_probability.png differ