diff --git a/.env b/.env
index f9e1aaf..7292e75 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 caa5bb1..34f485c 100644
--- a/index.html
+++ b/index.html
@@ -17,8 +17,8 @@
'')
-->
-
- Winzz777
+ Spinz777
+
diff --git a/src/components/header/MobileSubHeader.vue b/src/components/header/MobileSubHeader.vue
index 87950e8..6def945 100644
--- a/src/components/header/MobileSubHeader.vue
+++ b/src/components/header/MobileSubHeader.vue
@@ -95,7 +95,7 @@
flex-shrink: 0;
display: flex;
justify-content: flex-end;
- padding-right: 30rpx;
+ padding-right: 20rpx;
}
}
\ No newline at end of file
diff --git a/src/locales/lang/en-US/deposit.js b/src/locales/lang/en-US/deposit.js
index 1672da7..99d08db 100644
--- a/src/locales/lang/en-US/deposit.js
+++ b/src/locales/lang/en-US/deposit.js
@@ -43,6 +43,8 @@ export default {
orderConfirmation: 'Order Confirmation',
howtouse: 'How to use?',
history: 'History',
+ // history: 'Recharge not arrived?',
+ historyNot: 'Recharge not arrived?',
tab: {
bank: 'Bank Payment',
wallet: 'Wallet Payment',
@@ -90,7 +92,7 @@ export default {
history1: 'This order will be processed within 2-24 hours',
- tipsDetail1: 'Deposit has not arrived?',
+ tipsDetail1: 'Recharge has not arrived?',
tipsImps1: 'In order to improve your deposit experience, it is recommended that you',
tipsImps2: 'You can long press the input box to paste the UTR',
diff --git a/src/manifest.json b/src/manifest.json
index ef572a1..21ca479 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.2",
- "versionCode" : 122,
+ // "description" : "Winzz777",
+ "description" : "Spinz777",
+ "versionName" : "1.2.3",
+ "versionCode" : 123,
"channel_list" : [
{
"id" : "suisui2"
@@ -23,6 +23,10 @@
"autoclose" : true,
"delay" : 0
},
+
+ "compatible": {
+ "ignoreVersion": true // 忽略SDK版本不一致提示
+ },
/* 模块配置 */
"modules" : {
"Share" : {},
diff --git a/src/pages.json b/src/pages.json
index 52a5a06..7336687 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -357,13 +357,20 @@
"navigationBarTitleText": "ReDeposit Rules",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path": "pages/account/CustomService",
+ "style": {
+ "navigationBarTitleText": "Self-Service Customer",
+ "enablePullDownRefresh": false
+ }
}
],
"globalStyle": {
"navigationStyle": "custom",
"navigationBarTextStyle": "white",
- // "navigationBarTitleText": "Spinz777",
- "navigationBarTitleText": "Winzz777",
+ "navigationBarTitleText": "Spinz777",
+ // "navigationBarTitleText": "Winzz777",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#FFFFFF",
"app-plus": {
diff --git a/src/pages/account/Account.vue b/src/pages/account/Account.vue
index 6cc17bc..e0632f7 100644
--- a/src/pages/account/Account.vue
+++ b/src/pages/account/Account.vue
@@ -124,6 +124,7 @@
{{ $t("account.button.switchAccount") }}
+
@@ -156,6 +157,11 @@ const appStore = useAppStore();
const userStore = useUserStore();
const bindPhone = ref(null);
+const handleService = () => {
+ uni.navigateTo({
+ url: '/pages/account/CustomService'
+ })
+}
const handleDepositClick = () => {
uni.navigateTo({
url: '/pages/wallet/Deposit'
diff --git a/src/pages/account/CustomService.vue b/src/pages/account/CustomService.vue
new file mode 100644
index 0000000..d0ffe08
--- /dev/null
+++ b/src/pages/account/CustomService.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+ 12
+
+
+
+
+
+
+ Send
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/home/Home.vue b/src/pages/home/Home.vue
index 405a7c3..ab3c67b 100644
--- a/src/pages/home/Home.vue
+++ b/src/pages/home/Home.vue
@@ -740,7 +740,11 @@ const getUserBankrupt = async () => {
const popIndex = popupArr.value.findIndex(item => item === greatPopRef.value);
if (popIndex < 0) {
popupArr.value.push(greatPopRef.value);
- showPopQueue()
+ setTimeout(() => {
+ if(popupArr.value.length === 1) {
+ showPopQueue()
+ }
+ }, 500);
}
const slideIndex = slideItems.value.findIndex(item => item.dotName === 'bankrupt_doted');
if (slideIndex < 0) {
diff --git a/src/pages/wallet/Deposit.vue b/src/pages/wallet/Deposit.vue
index b13618f..fb011d8 100644
--- a/src/pages/wallet/Deposit.vue
+++ b/src/pages/wallet/Deposit.vue
@@ -3,7 +3,7 @@
- {{
+ {{
$t('deposit.history')
}}
diff --git a/src/pages/wallet/DepositHistory.vue b/src/pages/wallet/DepositHistory.vue
index ac59c0f..fd182fc 100644
--- a/src/pages/wallet/DepositHistory.vue
+++ b/src/pages/wallet/DepositHistory.vue
@@ -46,7 +46,7 @@
-
+
Self
diff --git a/src/pages/wallet/DepositOrderDetail.vue b/src/pages/wallet/DepositOrderDetail.vue
index 937809e..b9f0263 100644
--- a/src/pages/wallet/DepositOrderDetail.vue
+++ b/src/pages/wallet/DepositOrderDetail.vue
@@ -126,7 +126,7 @@
@@ -169,6 +169,7 @@ const depositStore = useDepositStore();
const pageData = reactive({
orderId: "",
orderDetail: {},
+ orderNo: "",
});
const isShowUtr = computed(() => {
@@ -209,6 +210,7 @@ const loadData = async () => {
return;
}
pageData.orderDetail = data || {};
+ pageData.orderNo = data.orderNo;
};
const handleCopyClick = (text) => {
diff --git a/src/pages/wallet/SelfUtrInfo.vue b/src/pages/wallet/SelfUtrInfo.vue
index 2213642..2bd205c 100644
--- a/src/pages/wallet/SelfUtrInfo.vue
+++ b/src/pages/wallet/SelfUtrInfo.vue
@@ -7,12 +7,12 @@
{{ $t('deposit.utrPage.text2') }}
-
+
{{ $t('deposit.utrPage.title2') }}
diff --git a/src/pages/wallet/components/DepositServiceItem.vue b/src/pages/wallet/components/DepositServiceItem.vue
index b965547..b1bee7f 100644
--- a/src/pages/wallet/components/DepositServiceItem.vue
+++ b/src/pages/wallet/components/DepositServiceItem.vue
@@ -1,38 +1,43 @@
-
+
{{ $t('deposit.message.tips4') }}
-
+
{{ $t('deposit.message.tips5') }}
-
+
\ No newline at end of file
diff --git a/src/pages/wallet/components/OnlineDeposit.vue b/src/pages/wallet/components/OnlineDeposit.vue
index eca65bd..f958bd2 100644
--- a/src/pages/wallet/components/OnlineDeposit.vue
+++ b/src/pages/wallet/components/OnlineDeposit.vue
@@ -48,6 +48,9 @@
{{ $t('withdraw.posterText') }}
+
+ {{ $t('deposit.historyNot') }}
+
{
const payMethod = computed(() => {
return depositStore.onlinePaymentData.depositMethodList.filter(item => item.type == depositStore.activeType)
})
-
+const handleHistoryClick = () => {
+ uni.navigateTo({
+ url: '/pages/wallet/DepositHistory'
+ })
+}
const toPoster = () => {
uni.navigateTo({
url: '/pages/activity/Poster',
@@ -280,6 +287,10 @@ const handleConfirmClick = async () => {
font-size: 24rpx;
text-decoration-line: underline;
}
+ .change-history-text{
+ font-size: 26rpx;
+ text-decoration-line: underline;
+ }
.pay-type-box {
height: 88rpx;
diff --git a/src/pages/wallet/components/SelfServiceUtrItem.vue b/src/pages/wallet/components/SelfServiceUtrItem.vue
index 05791bb..18f07b6 100644
--- a/src/pages/wallet/components/SelfServiceUtrItem.vue
+++ b/src/pages/wallet/components/SelfServiceUtrItem.vue
@@ -1,11 +1,12 @@
-
+
- {{ $t('deposit.message.tipsUtr1') }}:{{ $t('deposit.message.tipsUtr2') }}
+ {{ $t('deposit.message.tipsUtr1') }}:
+
-
+
{{ $t('deposit.message.tipsUtr3') }}
@@ -28,25 +29,25 @@
const { t } = useI18n()
const props = defineProps({
- orderId: {
- type: String,
- default: ''
- },
pendingCount: {
type: Number,
default: 0
+ },
+ orderNo: {
+ type: String,
+ default: ''
}
})
const handleSelfUtrClick = () => {
- if (props.orderId) {
+ if (props.orderNo) {
if (appStore.appConfig.manualPendingMaxCount && appStore.appConfig.manualPendingMaxCount > 0) {
if (props.pendingCount >= appStore.appConfig.manualPendingMaxCount) {
Toast.show(`${t('deposit.toast.text5')} ${appStore.appConfig.manualPendingMaxCount} ${t('deposit.toast.text6')}`)
return
}
}
- openUrl(`${appStore.manualRechargeUrl}?userId=${userStore.userInfo.id}&orderId=${props.orderId}`)
+ openUrl(`${appStore.manualRechargeUrl}?userId=${userStore.userInfo.id}&orderNo=${props.orderNo}`)
} else {
uni.navigateTo({
url: '/pages/wallet/SelfUtrInfo'
diff --git a/src/store/useAppStore.js b/src/store/useAppStore.js
index 9e0ad6f..9d0683b 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": [
// {
@@ -185,7 +185,7 @@ export const useAppStore = defineStore({
},
headerStyle: (state) => {
const windowInfo = state.windowInfo
-
+
let statusBarHeight = windowInfo.safeAreaInsets ? windowInfo.safeAreaInsets.top : 0
if (state.systemInfo.uniPlatform === 'app' && statusBarHeight === 0) {
statusBarHeight = 44