feat: 更新

This commit is contained in:
dengtongyu committed 2023-04-19 18:36:41 +08:00
1 parent 6501e61ffa
commit 4d4dbe4cd9
10 files changed
+101 -9

No files matched your search

+2 -2
View File
@@ -3,10 +3,10 @@
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="icon" type="image/png" href="/logo.png"/>
<link rel="icon" type="image/png" href="./favicon.jpg"/>
<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0"/>
<title><%- title %></title>
<style>.xtbg-loading {display:inline-block;width:80px;height:80px;background-image:url("/logo.png");background-size:40px auto;background-repeat:no-repeat;background-position:center;position:fixed;margin-left:-40px;margin-top:-40px;left:50%;top:50%;}
<style>.xtbg-loading {display:inline-block;width:80px;height:80px;background-image:url("./logo.png");background-size:40px auto;background-repeat:no-repeat;background-position:center;position:fixed;margin-left:-40px;margin-top:-40px;left:50%;top:50%;}
.xtbg-loading:after {content:" ";display:block;width:80px;height:80px;box-sizing:border-box;border-radius:50%;border:4px solid #ffef30;border-color:#ffef30 transparent #ffef30 transparent;animation:xtbg-loading 1.3s linear infinite;}
@keyframes xtbg-loading {0% {transform:rotate(0deg);}
100% {transform:rotate(360deg);}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

+1
View File
@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681899453935" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3055" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024C229.23264 1024 0 794.76736 0 512S229.23264 0 512 0s512 229.23264 512 512-229.23264 512-512 512zM283.92448 484.07552l-41.8816 55.84896 223.41632 209.4592 339.77344-386.32448-32.57344-37.24288-307.2 316.5184-181.53472-158.2592z" fill="rgba(255, 240, 51, 1)" p-id="3056"></path></svg>

After

Width:  |  Height:  |  Size: 624 B

+2 -2
View File
@@ -30,10 +30,10 @@ const iconStyle = computed(() => {
</script>
<template>
<div class="xtbg-tips-page-image" :style="iconStyle">
<div class="toupai-tips-page-image" :style="iconStyle">
<img :src="icon || defaultIcon">
</div>
<div class="xtbg-tips-page-text">
<div class="toupai-tips-page-text">
<p>{{ text || defaultText }}</p>
</div>
</template>
+3 -3
View File
@@ -85,9 +85,9 @@ const renderItemList = computed(() => {
</script>
<template>
<div class="xtbg-tips-page">
<div class="toupai-tips-page">
<IconAndText :icon="icon || defaultIcon" :text="text || defaultText" />
<div v-if="!buttonHidden" class="xtbg-tips-page-btn">
<div v-if="!buttonHidden" class="toupai-tips-page-btn">
<template v-if="$slots.button">
<slot name="button"></slot>
</template>
@@ -95,7 +95,7 @@ const renderItemList = computed(() => {
<van-button
v-for="item in renderItemList"
:key="item.code"
class="xtbg-tips-page-btn-class"
class="toupai-tips-page-btn-class"
:type="item.type"
@click="item.handler"
>
+52
View File
@@ -0,0 +1,52 @@
<script setup lang="ts" name="Success">
import { useRoute, useRouter } from "vue-router";
import Abnormal from "@/components/abnormal/index.vue";
defineProps<{
text?: string;
}>();
const route = useRoute();
const from: any = route.query.from;
const msg: any = route.query.text;
const router = useRouter();
const icon = new URL("@/assets/svg/pay_success.svg", import.meta.url).href;
const defaultText = "支付成功";
const goBack = () => { router.go(-1);};
</script>
<template>
<Abnormal
:icon="icon"
:text="text || msg || defaultText"
:from="from"
>
<template #button>
<div class="pay-success">
<van-button
class="pay-success-button"
type="default"
round
block
size="large"
color="rgba(255, 240, 51, 1)"
@click="goBack"
>返回继续充值</van-button>
</div>
</template>
</Abnormal>
</template>
<style lang="less" scoped>
.pay-success {
width: 60%;
&-button {
color: #222 !important;
}
}
</style>
+1
View File
@@ -1,6 +1,7 @@
const routes = [
{ path: "/", name: "root", redirect: "/home" },
{ path: "/home", name: "home", meta: { power: true }, component: () => import("../pages/Home.vue") },
{ path: "/success", name: "success", component: () => import("../pages/Success.vue") },
{ path: "/nonetwork:text?", name: "nonetwork", props: true, component: () => import("../pages/error/NoNetwork.vue") },
{ path: "/noaccess/:text?", name: "noaccess", props: true, component: () => import("../pages/error/NoAccess.vue") },
{ path: "/empty/:text?", name: "empty", props: true, component: () => import("../pages/error/NoData.vue") },
+35 -1
View File
@@ -45,4 +45,38 @@
-webkit-tap-highlight-color:rgba(255,0,0,0);
-moz-tap-highlight-color:rgba(255,0,0,0);
tap-highlight-color:rgba(255,0,0,0);
}
}
.toupai-tips-page {
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
&-image {
width: 160px;
height: 160px;
& > img {
width: 100%;
height: 100%;
object-fit: cover;
}
}
&-text {
margin-top: 30px;
padding: 0 16px;
line-height: 26px;
color: #888;
font-size: 16px;
}
&-btn {
margin-top: 30px;
width: 100%;
display: flex;
justify-content: center;
&-class {
min-width: 100px;
margin: 0 8px !important;
}
}
}
+5 -1
View File
@@ -13,7 +13,11 @@ const onBridgeReady = function (data: any) {
},
function (res: any) {
if (res.err_msg === "get_brand_wcpay_request:ok") {// 使用以上方式判断前端返回,微信团队郑重提示:res.err_msg将在用户支付成功后返回ok,但并不保证它绝对可靠。
window.location.reload();
// window.location.reload();
showDialog({
title: "充值提示",
message: "充值成功"
});
} else if (res.err_msg === "get_brand_wcpay_request:fail") {
showDialog({
title: "充值提示",