From 9da61d8f938f7a52736841303d2ec1fe1b26ee8e Mon Sep 17 00:00:00 2001
From: Eudemon <jarvanzx@qq.com>
Date: Wed, 19 Mar 2025 20:59:39 +0800
Subject: [PATCH] fixed

---
 .env                                          | 16 ++--
 index.html                                    |  4 +-
 src/components/layout/MobileLayout.vue        | 16 +++-
 src/manifest.json                             | 12 +--
 src/pages.json                                |  4 +-
 src/pages/wallet/DepositOrderDetail.vue       |  6 +-
 .../wallet/components/DepositServiceItem.vue  |  2 +-
 src/pages/wallet/components/OnlineDeposit.vue | 82 +++++++++----------
 .../wallet/components/SelfServiceUtrItem.vue  |  3 +-
 src/store/useAppStore.js                      |  4 +-
 src/store/useDepositStore.js                  |  1 +
 11 files changed, 82 insertions(+), 68 deletions(-)

diff --git a/.env b/.env
index 7292e75..f9e1aaf 100644
--- a/.env
+++ b/.env
@@ -1,16 +1,16 @@
 VITE_APP_H5_NO=1
 VITE_CHANNEL_ID=""
-VITE_APP_NAME=Spinz777
-# VITE_APP_NAME=Winzz777
+# VITE_APP_NAME=Spinz777
+VITE_APP_NAME=Winzz777
 VITE_APP_THEME=red
-VITE_APP_ID=101
-# VITE_APP_ID=103
-VITE_APP_DOWNLOAD_URL="https://www.777spinz.com/spinz777_101_1.0.0.apk"
-# VITE_APP_DOWNLOAD_URL="https://www.777spinz.com/Winzz777_103_100.apk"
+# VITE_APP_ID=101
+VITE_APP_ID=103
+# VITE_APP_DOWNLOAD_URL="https://www.777spinz.com/spinz777_101_1.0.0.apk"
+VITE_APP_DOWNLOAD_URL="https://www.777spinz.com/Winzz777_103_100.apk"
 VITE_APP_LOCALE=en
 VITE_APP_IMAGE_URL="https://img1.sp77.in/frontimg"
 VITE_WALLET_URL="https://inrchain.in/#/?inviteCode=m5ncrxv0"
-VITE_NAME_UPPER=SPINZ777
-# VITE_NAME_UPPER=WINZZ777
+# VITE_NAME_UPPER=SPINZ777
+VITE_NAME_UPPER=WINZZ777
 VITE_CURRENCY=INR
 VITE_CURRENCY_SYMBOL=₹
\ No newline at end of file
diff --git a/index.html b/index.html
index 34f485c..caa5bb1 100644
--- a/index.html
+++ b/index.html
@@ -17,8 +17,8 @@
         '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
         (coverSupport ? ', viewport-fit=cover' : '') + '" />')
     </script> -->
-  <title>Spinz777</title>
-  <!-- <title>Winzz777</title> -->
+  <!-- <title>Spinz777</title> -->
+  <title>Winzz777</title>
   <!--preload-links-->
   <!--app-context-->
 </head>
diff --git a/src/components/layout/MobileLayout.vue b/src/components/layout/MobileLayout.vue
index 168197a..48cc565 100644
--- a/src/components/layout/MobileLayout.vue
+++ b/src/components/layout/MobileLayout.vue
@@ -1,5 +1,5 @@
 <template>
-	<common-layout>
+	<common-layout :bgColor="_bgColor">
 		<view class="mobile-sub-layout" :style="{ 'padding-top': appStore.headerStyle.height + 'px' }">
 			<MobileHeader
 				:title="title"
@@ -17,10 +17,14 @@
 </template>
 
 <script setup>
+
+	import { computed } from 'vue'
 	import MobileHeader from '@/components/header/MobileHeader'
 	import { useAppStore } from '@/store/useAppStore'
+	import { useThemeStore } from '@/store/useThemeStore'
 	
 	const appStore = useAppStore()
+	const themeStore = useThemeStore()
 	const props = defineProps({
 		title: {
 			type: String,
@@ -29,8 +33,18 @@
 		lineHeight: {
 			type: Number,
 			default: 0
+		},
+		bgColor: {
+			type: String,
+			default: ''
 		}
 	})
+	const _bgColor = computed(() => {
+		if(props.bgColor) {
+			return props.bgColor
+		}
+		return themeStore.theme.bgColor
+	})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/manifest.json b/src/manifest.json
index d4e691e..8e2d04f 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,12 +1,12 @@
 {
     /* Spinz777 */// 
-    // "name" : "Winzz777",
-    "name" : "Spinz777",
+    "name" : "Winzz777",
+    // "name" : "Spinz777",
     "appid" : "__UNI__FECBD22",
-    // "description" : "Winzz777",
-    "description" : "Spinz777",
-    "versionName" : "1.2.3",
-    "versionCode" : 123,
+    "description" : "Winzz777",
+    // "description" : "Spinz777",
+    "versionName" : "1.2.4",
+    "versionCode" : 124,
     "channel_list" : [
         {
             "id" : "suisui2"
diff --git a/src/pages.json b/src/pages.json
index 2f81c56..5a3ab07 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -376,8 +376,8 @@
   "globalStyle": {
     "navigationStyle": "custom",
     "navigationBarTextStyle": "white",
-    "navigationBarTitleText": "Spinz777",
-    // "navigationBarTitleText": "Winzz777",
+    // "navigationBarTitleText": "Spinz777",
+    "navigationBarTitleText": "Winzz777",
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#FFFFFF",
     "app-plus": {
diff --git a/src/pages/wallet/DepositOrderDetail.vue b/src/pages/wallet/DepositOrderDetail.vue
index b9f0263..d127b8c 100644
--- a/src/pages/wallet/DepositOrderDetail.vue
+++ b/src/pages/wallet/DepositOrderDetail.vue
@@ -1,6 +1,6 @@
 <template>
-  <mobile-sub-layout :title="$t('deposit.title2')">
-    <view class="deposit-order-detail-container">
+  <mobile-sub-layout :title="$t('deposit.title2')" bgColor="#610606">
+    <view class="deposit-order-detail-container" :style="{background: themeStore.theme}">
       <view
         v-if="pageData.orderDetail.status === 1"
         class="flex-column flex-acenter"
@@ -121,7 +121,7 @@
           </view>
         </view>
       </view>
-      <view class="ft15 plr30 pt16">
+      <view class="ft15 plr30 pt16" :style="{color:themeStore.theme.light}">
         {{ $t("deposit.message.tipsDetail1") }}
       </view>
       <view v-if="depositStore.fillOrderSwitch && isShowUtr" class="plr30 mt24">
diff --git a/src/pages/wallet/components/DepositServiceItem.vue b/src/pages/wallet/components/DepositServiceItem.vue
index b1bee7f..44e8961 100644
--- a/src/pages/wallet/components/DepositServiceItem.vue
+++ b/src/pages/wallet/components/DepositServiceItem.vue
@@ -4,7 +4,7 @@
 			:style="{ background: themeStore.theme.lightBgColor }" @click.stop="handleClick">
 			<!-- <theme-image src="@/static/home/icon-service.png" mode="aspectFit" style="width: 76rpx; height: 76rpx;" /> -->
 			<view>
-				<view class="ft12">
+				<view class="ft12" :style="{color: themeStore.theme.light}">
 					{{ $t('deposit.message.tips4') }}
 				</view>
 				<view class="mt12 ft10" :style="{ color: themeStore.theme.text.theme }">
diff --git a/src/pages/wallet/components/OnlineDeposit.vue b/src/pages/wallet/components/OnlineDeposit.vue
index ef4c316..9384ba2 100644
--- a/src/pages/wallet/components/OnlineDeposit.vue
+++ b/src/pages/wallet/components/OnlineDeposit.vue
@@ -56,50 +56,39 @@
 			</text>
 		</view>
 		<view class="pt24 plr16 flex-wrap pay-method">
-			<view class="relative select-btn-container" v-for="(item, index) in payMethod" :key="index"
-				@click.stop="handlePayMethodSelect(item, index)">
-				<view class="flex-center select-btn"
-					:style="{ background: activeMethod === index ? themeStore.theme.wallet.payBg : themeStore.theme.wallet.payBg1 }">
-					<theme-image :src="`@/static/${item.icon}`" style="width: 40rpx; height: 40rpx;"></theme-image>
-					<view class="pay-name" :style="{ color: themeStore.theme.light }">{{ item.name }}</view>
-				</view>
-				<theme-image v-if="activeMethod === index" src="@/static/wallet/icon-btn-select-m.png"
-					class="select-btn-check-img pos-absolute" mode="aspectFill" />
-				<view v-if="false" class="select-btn"
-					:style="{ 'background': item.disable ? themeStore.theme.corner.disabledBg : item.name == depositStore.onlinePaymentData.rechargeName ? themeStore.theme.corner.selectBtnBg : themeStore.theme.corner.selectBtnColor }">
-					<view class="nice-icon" v-if="item.isRecommend"
-						:style="{ 'color': themeStore.theme.corner.text, 'background': themeStore.theme.corner.selectBtnColor }">
-						<view>{{ appStore.currencySign }}{{ item.isRecommend }}+</view>
+			<template v-if="depositStore.activeType == 2">
+				<view class="relative select-btn-container" v-for="(item, index) in depositStore.walletPayList"
+					:key="index" @click.stop="handleWalletMethodSelect(item, index)">
+					<view class="flex-center select-btn"
+						:style="{ background: activeWallet === index ? themeStore.theme.wallet.payBg : themeStore.theme.wallet.payBg1 }">
+						<!-- <theme-image :src="`@/static/${item.icon}`" style="width: 40rpx; height: 40rpx;"></theme-image> -->
+						<view class="pay-name" :style="{ color: themeStore.theme.light }">{{ item.name }}</view>
 					</view>
-					<!-- <theme-image v-if="item.type === depositStore.onlinePaymentData.depositMethod"
-						class="select-btn-bg-img" src="@/static/wallet/icon-btn-bg-select.png" mode="aspectFill" />
-					<theme-image v-else-if="item.disable" src="@/static/wallet/icon-btn-bg-disable.png"
-						class="select-btn-bg-img" mode="aspectFill" />
-					<theme-image v-else src="@/static/wallet/icon-btn-bg.png" class="select-btn-bg-img"
-						mode="aspectFill" /> -->
-					<view class="flex-acenter cfff select-btn-text" :class="{ 'disable': item.disable }">
-						<!-- <theme-image v-if="item.disable" :src="item.unableUrl" mode="aspectFit"
-							class="pay-type-icon flex-shrink-0" style="width: 50rpx; height: 45rpx"></theme-image>
-						<theme-image v-else :src="item.iconUrl" mode="aspectFit" class="pay-type-icon flex-shrink-0"
-							style="width: 50rpx; height: 45rpx"></theme-image> -->
-						<view class="flex-1 flex-scenter">
-							<view>{{ item.name }}</view>
-						</view>
-						<view style="width: 20rpx;"></view>
-					</view>
-					<!-- <view class="select-btn-check-img"
-						v-if="item.type === depositStore.onlinePaymentData.depositMethod">
-						<theme-image src="@/static/wallet/icon-btn-select-m.png" mode="scaleToFill"
-							style="width: 100%; height: 100%;" />
-					</view> -->
+					<theme-image v-if="activeWallet === index" src="@/static/wallet/icon-btn-select-m.png"
+						class="select-btn-check-img pos-absolute" mode="aspectFill" />
 				</view>
-			</view>
-			<view class="select-btn-container">
+			</template>
+			<template v-else>
+				<view class="relative select-btn-container" v-for="(item, index) in payMethod" :key="index"
+					@click.stop="handlePayMethodSelect(item, index)">
+					<view class="flex-center select-btn"
+						:style="{ background: activeMethod === index ? themeStore.theme.wallet.payBg : themeStore.theme.wallet.payBg1 }">
+						<theme-image :src="`@/static/${item.icon}`" style="width: 40rpx; height: 40rpx;"></theme-image>
+						<view class="pay-name" :style="{ color: themeStore.theme.light }">{{ item.name }}</view>
+					</view>
+					<theme-image v-if="activeMethod === index" src="@/static/wallet/icon-btn-select-m.png"
+						class="select-btn-check-img pos-absolute" mode="aspectFill" />
+				</view>
+			</template>
+			<!-- <theme-image v-if="item.type === depositStore.onlinePaymentData.depositMethod"
+						class="select-btn-bg-img" src="@/static/wallet/icon-btn-bg-select.png" mode="aspectFill" /> -->
+			<view class="select-btn-container" v-if="depositStore.activeType == 1">
 				<view class="select-btn ft12 flex-acenter flex-scenter" @click.stop="handleHowtouseClick"
 					:style="{ color: themeStore.theme.text.highlight2, background: themeStore.theme.wallet.payBg1 }">
 					<view class="howto flex-center">
 						{{ $t('deposit.howtouse') }}
-						<theme-image src="@/static/pay_guide/db-right.png" style="width: 24rpx;height: 24rpx;margin-left: 6rpx;"></theme-image>
+						<theme-image src="@/static/pay_guide/db-right.png"
+							style="width: 24rpx;height: 24rpx;margin-left: 6rpx;"></theme-image>
 					</view>
 				</view>
 			</view>
@@ -152,7 +141,7 @@
 			</view>
 		</view>
 		<DepositSuccessPopup ref="depositSuccessPopupRef" />
-		<TipsPopup ref="depositEventPopupRef" :text="$t('deposit.message.tips3')" />
+		<TipsPopup ref="depositEventPopupRef" :text="$t('deposit.message.tips3') " />
 	</view>
 </template>
 
@@ -237,7 +226,16 @@ const handleSelect = (type) => {
 const handleChannelChange = (channel) => {
 	depositStore.onlinePaymentData.payType = channel
 }
-
+const activeWallet = ref(0)
+const handleWalletMethodSelect = (item, idx) => {
+	activeWallet.value = idx
+	depositStore.onlinePaymentData.depositMethod = item.type
+	depositStore.onlinePaymentData.depositMethodName = item.name
+	depositStore.onlinePaymentData.depositMethodSelectItem = item
+	depositStore.onlinePaymentData.rechargeName = item.name
+	depositStore.onlinePaymentData.payType = item.payType?.split(',')[0]
+	depositStore.payType = item.payType
+}
 const handlePayMethodSelect = (item, idx) => {
 	console.log(item);
 	activeMethod.value = idx
@@ -395,10 +393,12 @@ const handleConfirmClick = async () => {
 		position: relative;
 		overflow: hidden;
 		border-radius: 16rpx;
-		.howto{
+
+		.howto {
 			font-size: 26rpx;
 			color: white;
 		}
+
 		.nice-icon {
 			position: absolute;
 			top: 0rpx;
diff --git a/src/pages/wallet/components/SelfServiceUtrItem.vue b/src/pages/wallet/components/SelfServiceUtrItem.vue
index 18f07b6..43a0402 100644
--- a/src/pages/wallet/components/SelfServiceUtrItem.vue
+++ b/src/pages/wallet/components/SelfServiceUtrItem.vue
@@ -2,9 +2,8 @@
 	<view class="self-service-utr-container">
 		<view class="self-service-utr-card plr30 ptb24 flex-acenter flex-sbetween" style="border-radius: 19rpx;" :style="{ background: themeStore.theme.lightBgColor }" @click.stop="handleSelfUtrClick">
 			<view>
-				<view class="ft12" :style="{ color: themeStore.theme.text.normal }">
+				<view class="ft12" :style="{ color: themeStore.theme.light }">
 					{{ $t('deposit.message.tipsUtr1') }}:
-					<!-- <span class="ml24" :style="{ color: themeStore.theme.text.theme }">{{ $t('deposit.message.tipsUtr2') }}</span> -->
 				</view>
 				<view class="ft11 mt12" :style="{ color: themeStore.theme.text.theme }">
 					{{ $t('deposit.message.tipsUtr3') }}
diff --git a/src/store/useAppStore.js b/src/store/useAppStore.js
index 9d0683b..28ea212 100644
--- a/src/store/useAppStore.js
+++ b/src/store/useAppStore.js
@@ -136,9 +136,9 @@ export const useAppStore = defineStore({
             updateText: '',
             updateType: 0
         },
-        packageName: 'uni.UNIFECBD22',//101 Spinz777
+        // packageName: 'uni.UNIFECBD22',//101 Spinz777
         // packageName: 'uni.UNIFECBD22', //102 
-        // packageName: 'com.kllksgqoCasw3d.game',//103 Winzz777
+        packageName: 'com.kllksgqoCasw3d.game',//103 Winzz777
     }),
     // 	"dependencies": [
     //       {
diff --git a/src/store/useDepositStore.js b/src/store/useDepositStore.js
index 8a62c02..282ac82 100644
--- a/src/store/useDepositStore.js
+++ b/src/store/useDepositStore.js
@@ -124,6 +124,7 @@ export const useDepositStore = defineStore({
 			this.rechargeTypeList = chargeInfo.rechargeTypeList || []
 			const bank = this.rechargeTypeList.filter(el => el.type === 1)
 			const wallet = this.rechargeTypeList.filter(el => el.type === 2)
+			this.walletPayList = wallet
 			const arr = []
 			if(bank.length > 0) {
 				arr.push({