fixed

.env

@@ -1,16 +1,16 @@
 VITE_APP_H5_NO=1
 VITE_CHANNEL_ID=""
-# VITE_APP_NAME=Spinz777
+VITE_APP_NAME=Spinz777
-VITE_APP_NAME=Winzz777
+# VITE_APP_NAME=Winzz777
 VITE_APP_THEME=red
-# VITE_APP_ID=101
+VITE_APP_ID=101
-VITE_APP_ID=103
+# 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/spinz777_101_1.0.0.apk"
-VITE_APP_DOWNLOAD_URL="https://www.777spinz.com/Winzz777_103_100.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=SPINZ777
-VITE_NAME_UPPER=WINZZ777
+# VITE_NAME_UPPER=WINZZ777
 VITE_CURRENCY=INR
 VITE_CURRENCY_SYMBOL=₹

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>Spinz777</title>
-  <title>Winzz777</title>
+  <!-- <title>Winzz777</title> -->
   <!--preload-links-->
   <!--app-context-->
 </head>

src/components/header/MobileSubHeader.vue

@@ -95,7 +95,7 @@
 			flex-shrink: 0;
 			display: flex;
 			justify-content: flex-end;
-			padding-right: 30rpx;
+			padding-right: 20rpx;
 		}
 	}
 </style>

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',

src/manifest.json

@@ -1,12 +1,12 @@
 {
     /* Spinz777 */// 
-    "name" : "Winzz777",
+    // "name" : "Winzz777",
-    // "name" : "Spinz777",
+    "name" : "Spinz777",
     "appid" : "__UNI__FECBD22",
-    "description" : "Winzz777",
+    // "description" : "Winzz777",
-    // "description" : "Spinz777",
+    "description" : "Spinz777",
-    "versionName" : "1.2.2",
+    "versionName" : "1.2.3",
-    "versionCode" : 122,
+    "versionCode" : 123,
     "channel_list" : [
         {
             "id" : "suisui2"
@@ -23,6 +23,10 @@
             "autoclose" : true,
             "delay" : 0
         },
+        
+        "compatible": {
+            "ignoreVersion": true  // 忽略SDK版本不一致提示
+        },
         /* 模块配置 */
         "modules" : {
             "Share" : {},

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": "Spinz777",
-    "navigationBarTitleText": "Winzz777",
+    // "navigationBarTitleText": "Winzz777",
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#FFFFFF",
     "app-plus": {

src/pages/account/Account.vue

@@ -124,6 +124,7 @@
             {{ $t("account.button.switchAccount") }}
           </view>
         </view>
+        <button @click="handleService">Self-Service</button>
         <view class="w-full" style="height: 240rpx;"></view>
       </view>
     </view>
@@ -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'

src/pages/account/CustomService.vue

@@ -0,0 +1,81 @@
+<script setup>
+import { ref, computed } from 'vue'
+import { useThemeStore } from "@/store/useThemeStore";
+import { useAppStore } from '@/store/useAppStore'
+
+const themeStore = useThemeStore()
+const appStore = useAppStore()
+const scrollHeight = computed(() => {
+    return appStore.windowInfo.screenHeight - appStore.windowInfo.statusBarHeight - 50
+})
+const questions = ref([
+    {
+        id: 1,
+        question: 'What is the capital of France?',
+    },
+    {
+        id: 2,
+        question: 'Which planet is known as the Red Planet?',
+    },
+    {
+        id: 3,
+        question: 'What is the largest mammal in the world?',
+    }
+])
+const inputVal = ref('')
+
+</script>
+<template>
+    <mobile-custom-layout title="Self-service Customer" bgColor="#2F0101"
+        :headBgColor="themeStore.theme.bgColor" :paddingTop="appStore.headerStyle.height">
+        <template #head-right>
+            <view>
+                <theme-image src="@/static/account/customer_head.png" class="icon-kf-head"></theme-image>
+            </view>
+        </template>
+        <scroll-view scroll-y class="w-full p-2 scroll" :style="{ height: scrollHeight + 'px' }">
+            12
+        </scroll-view>
+        <view class="w-full input-line safe-area">
+            <view class="w-full flex items-center input-content">
+                <view class="flex-1 p-1 input-box">
+                    <input type="text" v-model="inputVal" class="w-full ft12" placeholder="Please enter your question" />
+                </view>
+                <view class="submit-btn ml-2 ft13 flex-center">Send</view>
+            </view>
+        </view>
+    </mobile-custom-layout>
+</template>
+<style lang="scss" scoped>
+.scroll{
+    box-sizing: border-box;
+}
+.icon-kf-head{
+    width: 46rpx;
+    height: 46rpx;
+}
+.input-line {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 1000;
+    background-color: #280000;
+
+    .input-content {
+        height: 120rpx;
+        padding: 0 24rpx;
+
+        .input-box{
+            height: 56rpx;
+            background-color: #5A0107;
+            border-radius: 4px;
+        }
+        .submit-btn{
+            height: 56rpx;
+            width: 100rpx;
+            background-color: #5A0107;
+            border-radius: 4px;
+        }
+    }
+}
+</style>

src/pages/home/Home.vue

@@ -740,8 +740,12 @@ const getUserBankrupt = async () => {
             const popIndex = popupArr.value.findIndex(item => item === greatPopRef.value);
             if (popIndex < 0) {
                 popupArr.value.push(greatPopRef.value);
+                setTimeout(() => {
+                    if(popupArr.value.length === 1) {
                         showPopQueue()
                     }
+                }, 500);
+            }
             const slideIndex = slideItems.value.findIndex(item => item.dotName === 'bankrupt_doted');
             if (slideIndex < 0) {
                 let dot = getDot("bankrupt_doted");

src/pages/wallet/Deposit.vue

@@ -3,7 +3,7 @@
         <template #header-right>
             <view class="history flex-center flex-column" @click.stop="handleHistoryClick">
                 <theme-image src="@/static/deposit_log.png" mode="aspectFit" style="width: 42rpx; height: 42rpx;" />
-                <text style="font-size: 13px;" :style="{ color: themeStore.theme.wallet.normal }">{{
+                <text style="font-size: 13px; white-space: no-wrap;" :style="{ color: themeStore.theme.wallet.normal }">{{
                     $t('deposit.history')
                 }}</text>
             </view>

src/pages/wallet/DepositHistory.vue

@@ -46,7 +46,7 @@
 							<theme-image v-if="item.status === 1" src="@/static/icon-succeed.png" style="width: 50rpx; height: 50rpx;"></theme-image>
 							<!-- <theme-image v-else-if="item.status === 0" src="@/static/wallet/icon-fail.png" style="width: 50rpx; height: 50rpx;"></theme-image> -->
 							<theme-image v-else src="@/static/icon-pending.png" style="width: 50rpx; height: 50rpx;"></theme-image>
-							<view v-if="item.manualRechargeStatus !== 0" class="list-item-utr-conner">
+							<view v-if="item.manualRechargeStatus === 0 || item.manualRechargeStatus === 3" class="list-item-utr-conner">
 								<view>Self</view>
 							</view>
 						</view>

src/pages/wallet/DepositOrderDetail.vue

@@ -126,7 +126,7 @@
       </view>
       <view v-if="depositStore.fillOrderSwitch && isShowUtr" class="plr30 mt24">
         <SelfServiceUtrItem
-          :orderId="pageData.orderId"
+          :orderNo="pageData.orderNo"
           :pendingCount="pageData.manualPendingCount"
         />
       </view>
@@ -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) => {

src/pages/wallet/SelfUtrInfo.vue

@@ -7,12 +7,12 @@
 			<view class="ft13" :style="{ color: themeStore.theme.text.normal }">
 				{{ $t('deposit.utrPage.text2') }}
 			</view>
-			<view class="ft16 mt32 mb16" :style="{ color: themeStore.theme.text.highlight }">
+			<!-- <view class="ft16 mt32 mb16" :style="{ color: themeStore.theme.text.highlight }">
 				{{ $t('deposit.utrPage.title1') }}
 			</view>
 			<view class="ft13" :style="{ color: themeStore.theme.text.normal }">
 				{{ $t('deposit.utrPage.text3') }}
-			</view>
+			</view> -->
 			<view class="ft16 mt32 mb16" :style="{ color: themeStore.theme.text.highlight }">
 				{{ $t('deposit.utrPage.title2') }}
 			</view>

src/pages/wallet/components/DepositServiceItem.vue

@@ -1,16 +1,18 @@
 <template>
 	<view class="self-service-utr-container">
-		<view class="self-service-utr-card plr30 ptb24 flex-acenter flex-sbetween" style="border-radius: 30rpx;" :style="{ background: themeStore.theme.lightBgColor }" @click.stop="handleClick">
+		<view class="self-service-utr-card plr30 ptb24 flex-acenter flex-sbetween" style="border-radius: 30rpx;"
+			: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">
 					{{ $t('deposit.message.tips4') }}
 				</view>
-				<view class="mt12 ft9" :style="{ color: themeStore.theme.text.subtitle }">
+				<view class="mt12 ft10" :style="{ color: themeStore.theme.text.theme }">
 					{{ $t('deposit.message.tips5') }}
 				</view>
 			</view>
-			<theme-image src="@/static/wallet/icon-arrow-right-red.png" mode="aspectFit" style="width: 16rpx; height: 30rpx;" />
+			<theme-image src="@/static/wallet/icon-arrow-right-red.png" mode="aspectFit"
+				style="width: 16rpx; height: 30rpx;" />
 		</view>
 	</view>
 </template>
@@ -24,7 +26,10 @@
 const userStore = useUserStore()
 
 const handleClick = () => {
-		openUrl(userStore.serviceUrl)
+	// openUrl(userStore.serviceUrl)
+	uni.navigateTo({
+		url: '/pages/account/CustomService'
+	})
 }
 </script>
 

src/pages/wallet/components/OnlineDeposit.vue

@@ -48,6 +48,9 @@
 			<text v-if="depositStore.activeType == 2" @click="toPoster" class="change-account-text" :style="{ color: themeStore.theme.text.theme }">
 				{{ $t('withdraw.posterText') }}
 			</text>
+			<text v-else @click="handleHistoryClick" class="change-history-text" :style="{ color: themeStore.theme.text.theme }">
+				{{ $t('deposit.historyNot') }}
+			</text>
 		</view>
 		<view class="pt24 plr16 flex-wrap pay-method">
 			<view class="select-btn-container" v-for="(item, index) in payMethod" :key="index"
@@ -183,7 +186,11 @@ const tabStyle = computed(() => {
 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;
 

src/pages/wallet/components/SelfServiceUtrItem.vue

@@ -1,11 +1,12 @@
 <template>
 	<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.deposit.itemBgColor }" @click.stop="handleSelfUtrClick">
+		<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 }">
-					{{ $t('deposit.message.tipsUtr1') }}:<span class="ml24" :style="{ color: themeStore.theme.text.theme }">{{ $t('deposit.message.tipsUtr2') }}</span>
+					{{ $t('deposit.message.tipsUtr1') }}:
+					<!-- <span class="ml24" :style="{ color: themeStore.theme.text.theme }">{{ $t('deposit.message.tipsUtr2') }}</span> -->
 				</view>
-				<view class="ft9 mt12" :style="{ color: '#FF2D20' }">
+				<view class="ft11 mt12" :style="{ color: themeStore.theme.text.theme }">
 					{{ $t('deposit.message.tipsUtr3') }}
 				</view>
 			</view>
@@ -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'

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": [
     //       {