ci(other): ci update

This commit is contained in:
2025-10-31 19:13:49 +08:00
parent d831ee932b
commit 63b61bbc98
15 changed files with 197 additions and 26 deletions

View File

@@ -188,23 +188,22 @@ const pay = async () => {
const confirmPay = async () => {
try {
const res = await payOrder({
const { data: res } = await payOrder({
oid: opt.value.oid,
OrderType: payVal.value,
PayType: payVal.value,
});
Taro.requestPayment({
timeStamp: res.data.data.timeStamp,
nonceStr: res.data.data.nonceStr,
package: res.data.data.package,
signType: res.data.data.signType,
paySign: res.data.data.paySign,
timeStamp: res.data.timeStamp,
nonceStr: res.data.nonceStr,
package: res.data.package,
signType: res.data.signType,
paySign: res.data.paySign,
success: function () {
Taro.showToast({
title: '支付成功',
icon: 'success',
});
isLoading.value = false;
},
fail: function () {
Taro.showToast({
@@ -218,7 +217,6 @@ const confirmPay = async () => {
url: `/pages/users/order_list/index?type=0`,
});
}, 2000);
// isLoading.value = false;
},
});
} catch (err) {
@@ -227,7 +225,7 @@ const confirmPay = async () => {
icon: 'none',
});
} finally {
// isLoading.value = false;
isLoading.value = false;
}
};

View File

@@ -38,12 +38,12 @@ page {
}
.banner {
position: relative;
text-align: center;
.title {
background-image: url('//p0.meituan.net/csc/542112fc072d4687b437848bc29b0a1730495.png');
background-size: 100% 100%;
width: 600px;
height: 90px;
margin: auto;
left: 50%;
}
.jf-btn {

View File

@@ -13,7 +13,12 @@
<view class="search-btn" @click="clickSearch">搜索</view>
</view>
<view class="banner">
<view class="title"></view>
<!-- <view
class="title"
:style="{
backgroundImage: `url('${titleImgPath}')`,
}"></view> -->
<image class="title" :src="titleImgPath"></image>
<view class="jf-btn" hover-class="none"></view>
<!-- <view class="footer">
<navigator
@@ -62,6 +67,8 @@ import Popup from '@/components/Popup.vue';
const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight;
const BarHeight = ref((statusBarHeight as number) + 7);
const titleImgPath = require(process.env.TARO_APP_TITLE_IMG as string);
interface navigationType {
ID?: number;
type: number;
@@ -74,7 +81,8 @@ const navigationList = ref<Array<navigationType>>([]);
const imgList = ref([
// require('../../static/popTip-1.png'),
require('../../static/popTip.png'),
// require('../../static/popTip.png'),
require('../../static/zhenggai.png'),
]);
Taro.useShareAppMessage(() => ({

View File

@@ -171,7 +171,7 @@
<!-- 版权 -->
<view class="mt-5 text-[20px] text-center">
<view class="text-[#999999]">鑫瓴科技版权所有</view>
<view class="text-[#999999]">{{ copText }}</view>
<!-- <view>v4.0.0</view> -->
</view>
<!-- 登录 -->
@@ -198,6 +198,8 @@ const isShowLogin = ref(false);
const isLogin = ref(false);
const copText = process.env.TARO_APP_COP;
interface UserInfo {
data?: {
nickName?: string;

View File

@@ -3,12 +3,17 @@ import Taro from '@tarojs/taro';
import UserModal from '@/components/UserModal.vue';
import { ref } from 'vue';
import { getPhone, login, getPersonalInfo } from '@/api/user';
import logoImg from '../../../static/logo.jpg';
// import logoImg from '../../../static/logo.jpg';
import { Left, Home } from '@nutui/icons-vue-taro';
const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight;
const BarHeight = ref((statusBarHeight as number) - 7);
const appName = process.env.TARO_APP_NAME;
const logoImg = require(process.env.TARO_APP_LOGO_IMG as string);
// const logoImg = process.env.TARO_APP_LOGO_IMG;
const isShow = ref(false);
const val = ref(false);
@@ -157,8 +162,8 @@ const clickText = (type: number, text: string) => {
</view>
<image src="../../../static/wechat_login.jpg" />
<view class="logo">
<image :src="logoImg" />
<view>捷兑通</view>
<image :src="logoImg"></image>
<view>{{ appName }}</view>
</view>
<view class="center">
<nut-button