From cc8829c331c09e11dd61a19969be4611ce4eb1d5 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Thu, 23 Nov 2023 19:57:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A6=82=E7=8E=87=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=92=8C=E4=BF=AE=E6=94=B9=E5=88=AE=E5=A5=96=E6=96=87?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/api.js                              |   6 +-
 manifest.json                                 |   9 ++-
 pages.json                                    |  12 ++-
 .../ProbabilitySettings.vue                   |  75 ++++++++++++++++++
 pages/about/about.vue                         |   6 ++
 pages/home/home.vue                           |  16 ++--
 static/user/icon_probability.png              | Bin 0 -> 907 bytes
 7 files changed, 111 insertions(+), 13 deletions(-)
 create mode 100644 pages/about/ProbabilitySettings/ProbabilitySettings.vue
 create mode 100644 static/user/icon_probability.png

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 @@
+<template>
+	<view class="probability_box">
+		<view>
+			概率：
+		</view>
+		<view>
+			<input type="text" v-model="rate" placeholder="请输入内容" placeholder-style="color: #999;" />
+		</view>
+		<view>
+			<button class="mini-btn" type="primary" size="mini" @click="save()" style="height: 29px;">保存</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import API from '@/common/js/api.js'
+	export default {
+		data(){
+			return{
+				rate:0+"%"
+			}
+		},
+		methods:{
+			init(){
+				API.request('/setting/getProbability', {} , res=>{
+					this.rate = res.data.rate
+				})
+			},
+			save(){
+				uni.showModal({
+					title:'温馨提示',
+					content:"确定要修改概率吗？",
+					success:(res)=>{
+						if(res.confirm){
+							API.request('/setting/settingProbability',{rate: this.rate}, res=>{
+								if(200==res.code){
+									uni.showToast({
+										title: res.msg
+									})
+									this.init()
+								}else{
+									uni.showToast({
+										title: res.msg
+									})
+								}
+								// console.log(res);
+							})
+						}
+					}
+				})
+			}
+		},
+		created() {
+			this.init()
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.probability_box{
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		margin:10px 5px 5px 5px;
+		input{
+			width: 500rpx;
+			height: 80rpx;
+			border: 1px solid #eee;
+			border-radius: 5px;
+			padding: 0px 10px;
+			box-sizing: border-box;
+			color: #444;
+		}
+	}
+</style>
\ 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 @@
 							<img v-lazy="item.cover_image" />
 						</view>
 						<view class="goods-info">
-							<view class="skeleton-rect" style="color: #333;font-size: 16px;">{{item.title}}</view>
-							<view class="">面值{{item.price}}元</view>
+							<view class="skeleton-rect" style="color: #333;font-size: 16px;margin-bottom: 3px;">{{item.title}}</view>
+							<view style="margin-bottom: 3px;">面值{{item.price}}元</view>
 							<view class="">最高中奖金额{{item.max_awards_amount}}</view>
 						</view>
-						<view class="goods-btn" @click="toDetailUrl(item)">立即刮奖</view>
+						<view class="goods-btn" @click="toDetailUrl(item)">刮奖</view>
 					</view>
 				</view>
 				<view class="list_area" v-if="0">
@@ -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 0000000000000000000000000000000000000000..240bb1d38bc345e09c1b90201e60f75b57f325a9
GIT binary patch
literal 907
zcmV;619bd}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&MM*?KR9HvVmrrQiMHI)sZy;F`lpxfDR&Sw^o!LDYuwscZBJ^Ms3Px&5J%|ug
z+Dnfm+7`iscnOFG5n4-wl9)?dTOm?K(!F#W*?ALL&w>ZVONAn<zb8|EyWRZq`!m@M
z1Rv~aXWsX--+6E5En$y?_E;bPKY+2Zu?GhR2F3x56VbScJi^RVy*e4}fHCGp0H?h$
zfI$F%0N_~odjN9)Hi+o9h-@(PY6w&ifY$mP5zULpc@g=1WMrgXtJUrrV{UW-JO|(#
z00;d?MAiVDa?bsk2a*d=tyU+ZDEbb-bs}1@*7~HK=mPiwz-0GP7-JRyoKQ-=&}cM#
zj?~Bm&|1GjM9Tn{nfcYU-AM<MwP1|#u6UQ;V&+fNa%2J+WBviKnkDX&<vGw6t5hn!
zP;UV^#LPF75UBuK>t!N(LPRF>&M*YP3u>(wiRh^)iY7KUH~;E}*ao1ro+YA7BJ!GZ
z?#sLa3I(WEt4~K!R1=Y7&bg&r0AtKLfF?7)QPf7E0OfLdP$~5@5iMD3=Q9Dy<?;hc
zDc|3-A$=SQ5ZB8E01q+q%b5Vim}da2mrA9F>-D+^$&DmH(Rv~}V6EMs381xpTPgLX
zwf4!PWGP*cwMBsYZw@n`$#dW$fX71b_AUoPcspyl^Ka<_V@xoBF~<Lr_W<~JAUKHV
zH*4)|d&3q0e*{D{Q{+IG_}QeTStN0R`wQtaX8tG@ATGi+W**K;)QfmrFZT)@z!Wog
zT-)M6yA6rxh_&`w5~5e}7~mv;4_mF)zGky|C)I&?p{J}fv)|B(e#GOvUjcZWnY|O8
z$hwLb0UT~W9=jku4d60>X=c8f3*f(uAEQT^`B1;&qobpxQmOPSfKQxr?<SA6=sA8r
zZnfZQPpO-)0ldV_evI1|Ap=Q2;$Hwbu9SMV(P;d*BLKg+J(3a8?;<kC%vVBgoJytg
zj);5!U|2+sI_Flh_U&jW^@SuN-x85)wOaLdJNa`S8X7WD6d59V9>D7&vf`YZDFO}x
zh}$SRmP15-QA)K$M8`sZ`xX|FkCTH(Uk-F{PWfZ<uZYx$=%*-(8p)As*BmHH)a&=b
hN6@Q4(Y`$g_zy!akT8T*aP<HH002ovPDHLkV1iZan$rLP

literal 0
HcmV?d00001