gxwebsoft/gxtyzx-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复已知问题

Browse Source
This commit is contained in:
赵忠林
2024-10-09 12:31:09 +08:00
parent 10533eb67d
commit 6161d9c1d3
12 changed files with 140 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/package/goods/order-detail.vue
+5 -2
View File
@@ -55,7 +55,10 @@
</uv-cell>
<uv-cell :title="`订单状态`" :cellStyle="{ padding: '8px' }">
<template v-slot:value>
<view v-if="form.payStatus == 0">
<view v-if="form.orderStatus === 2">
<span class="web-text-secondary">已取消</span>
</view>
<view v-else-if="form.payStatus === 0">
<!-- <uv-count-down :time="form.timestamp" format="mm:ss"></uv-count-down> -->
<span style="color: #ff0000">未支付</span>
</view>
@@ -70,7 +73,7 @@
</uni-card>
</block>
<uv-gap height="20"></uv-gap>
<view class="checkout-car" v-if="form.payStatus == 0">
<view class="checkout-car" v-if="form.payStatus === 0 && form.orderStatus !== 2">
<view class="car-total">
<text style="color: #ebcf00">￥</text>
<uv-count-to decimals="2" duration="30" color="#ebcf00" bold :endVal="form.payPrice"></uv-count-to>
src/package/goods/order.vue
+1 -1
View File
@@ -166,7 +166,7 @@ export default {
reload() {
const app = this;
const { where, userId } = this;
if (userId == 0) {
if (userId === 0) {
app.openLogin();
return;
}
src/package/user/card.vue
+14 -13
View File
@@ -10,15 +10,18 @@
v-for="(item, index) in cardList"
:key="index"
@click="openUrl('/package/user/card-detail?cardId=' + item.id)"
:style="{ background: `url(${item.image}) no-repeat center center`, backgroundSize: '100%', opacity: '0.85' }"
:style="{ background: `url(https://oss.wsdns.cn/20240920/5e3327e1ad97472e942c824ab1776f52.jpg?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90) no-repeat center center`, backgroundSize: '100%', opacity: '0.85' }"
>
<view class="content web-cell">
<view class="merchant-avatar">
<uv-avatar :src="item.merchantAvatar" size="36" style="border: 3rpx solid #ffffff"></uv-avatar>
</view>
<!-- <view class="merchant-avatar">-->
<!-- <uv-avatar :src="item.merchantAvatar" size="36" style="border: 3rpx solid #ffffff"></uv-avatar>-->
<!-- </view>-->
<view class="card-info web-cell-content">
<view class="title-bar">
<view class="web-text-heading" style="color: #ffffff; font-size: 17px; font-weight: 600">{{ item.name }}</view>
<view class="web-text-heading" style="color: #ffffff; font-size: 20px; font-weight: 600">{{ item.name }}</view>
<view class="desc py-3" style="text-align: left;">
{{ item.siteNames }}
</view>
<!-- <block v-if="item.type == 2">
<view class="desc web-text-heading" style="color: #ffffff; font-size: 14px">{{ item.month }}个月</view>
</block> -->
@@ -66,8 +69,7 @@
</template>
<script>
import * as Api from '@/api/booking/userCard';
import { pageWechatDeposit } from '@/api/shop/wechatDeposit';
import * as Api from '@/api/think/thinkUsersVip';
import { getWeek, getKey } from '@/utils/common';
export default {
@@ -137,15 +139,15 @@ export default {
reload() {
const app = this;
const { where, userId } = this;
if (userId == 0) {
if (userId === 0) {
app.openLogin();
return;
}
where.userId = userId;
where.uid = uni.getStorageSync('uid');
where.status = 1;
where.sceneType = 'myCardAll';
app.loadMore = 'loading';
Api.pageUserCard(where)
Api.pageThinkUsersVip(where)
.then((res) => {
console.log('res: ', res);
const list = res.list.map((d) => {
@@ -253,7 +255,7 @@ export default {
/* #endif */
justify-content: center;
align-items: center;
height: 150px;
height: 380rpx;
text-align: center;
}
@@ -278,14 +280,13 @@ export default {
.card-list {
.container {
width: 700rpx;
height: 200rpx;
height: 380rpx;
position: relative;
margin: 25rpx auto;
display: flex;
justify-content: space-between;
align-items: center;
border-radius: 20rpx;
position: relative;
box-shadow: 0 0px 6px 0 rgba(0, 0, 0, 0.2);
// background: linear-gradient(to right, #70b915, #008e04);
color: #ffffff;
src/package/user/coupon.vue
+1 -1
View File
@@ -126,7 +126,7 @@
app.openLogin()
return;
}
// where.userId = userId;
where.userId = userId;
uni.showLoading({
title: '数据读取中.'
})
src/package/user/ic-card-order.vue
+7 -7
View File
@@ -16,11 +16,11 @@
</view>
</view>
</uni-card>
<view class="btn-bar">
<uv-button class="save-user-profile"
:customStyle="{background: 'linear-gradient(to right, #70b915, #008e04)',borderRadius: '30px',color: '#ffffff'}"
text="添加" @click="add"></uv-button>
</view>
<!-- <view class="btn-bar">-->
<!-- <uv-button class="save-user-profile"-->
<!-- :customStyle="{background: 'linear-gradient(to right, #70b915, #008e04)',borderRadius: '30px',color: '#ffffff'}"-->
<!-- text="添加" @click="add"></uv-button>-->
<!-- </view>-->
<!-- 登录组件 -->
<ws-login ref="login" :logo="logo" @done="reload" />
<!-- EmergencyEdit弹窗 -->
@@ -101,7 +101,7 @@
Api.pageEmergency({
userId: userInfo.userId
}).then(res => {
app.list = res.list;
app.list = []
})
},
navTo(item) {
@@ -200,4 +200,4 @@
margin: auto;
clear: both;
}
</style>
</style>
src/package/user/invoice-show.vue
+3 -3
View File
@@ -7,7 +7,7 @@
<script>
// import { useUserStore } from '@/store/modules/user';
import * as Api from '@/api/booking/userInvoice';
import * as Api from '@/api/think/thinkInvoice';
import { copyText, openUrl } from '@/utils/common';
// import { useTenantStore } from '@/store/modules/tenant';
@@ -28,7 +28,7 @@ export default {
this.reload(e.id);
},
methods: {
async reload(orderNo) {
async reload(oid) {
const app = this;
// 当前登录用户信息
// const userInfo = await userStore.fetchUserInfo();
@@ -40,7 +40,7 @@ export default {
// }
// 读取最后一次
await Api.showInvoice(orderNo).then((res) => {
await Api.pageThinkInvoice({oid}).then((res) => {
if (res) {
const json = JSON.parse(res);
if (json.code) {