maguodong/uniapp-ZHSQ
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: maguodong:244b6dea601adbaf65d831c2875b3654191066fb
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb
..
compare: maguodong:2030e5e84d4db3a4a91f0eb36f297d85ec0d48da
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb

No commits in common. "244b6dea601adbaf65d831c2875b3654191066fb" and "2030e5e84d4db3a4a91f0eb36f297d85ec0d48da" have entirely different histories.
244b6dea60 ... 2030e5e84d

6 changed files with 24 additions and 34 deletions
Show Stats Expand all files Collapse all files

21
packages/localLife/pay/index.vue
View File

@ -180,25 +180,7 @@ export default {
// 'custom-header': 'hello' //自定义请求头信息
},
success: (res) => {
// 检查是否成功获取到access_token
if (res.data && res.data.access_token) {
this.createQrcode2(res.data.access_token)
} else {
uni.hideLoading();
uni.showToast({
title: '获取二维码失败，请重试',
icon: 'none'
});
console.error('获取微信access_token失败:', res);
}
},
fail: (err) => {
console.error('获取微信access_token失败:', err);
uni.hideLoading();
uni.showToast({
title: '获取二维码失败，请重试',
icon: 'none'
});
this.createQrcode2(res.data.access_token)
}
});
},
@ -325,7 +307,6 @@ export default {
const params = {
id: this.OrderMsg.id,
back_wygjj: this.homeMoney,
back_points: this.integral,
}
request(apiArr.tradeQuery, "POST", params).then(res => {
})

1
packages/storeManagement/index/index.css
View File

@ -630,7 +630,6 @@ image {
.walletBox_content{
display: flex;
justify-content: space-between;
padding: 0 80rpx;
}
.walletBox_item{

4
packages/storeManagement/index/index.vue
View File

@ -33,10 +33,10 @@
<view>{{ walletInfo.receivable ? walletInfo.receivable.toFixed(2) : "0.00" }}元</view>
<view class="walletBox_item_text">应收</view>
</view>
<!-- <view class="walletBox_item" @click="goWallet(3, walletInfo.handling_fee.toFixed(2))">
<view class="walletBox_item" @click="goWallet(3, walletInfo.handling_fee.toFixed(2))">
<view>{{ walletInfo.handling_fee ? walletInfo.handling_fee.toFixed(2) : "0.00" }}元</view>
<view class="walletBox_item_text">手续费</view>
</view> -->
</view>
</view>
</view>
<view class="iconStyle content2">

20
packages/user/wallet/index.vue
View File

@ -39,10 +39,7 @@
<text
:class="['amount-sign', record.change_reason == '下单' ? 'positive' : 'negative']">{{
record.change_reason == '下单' ? '+' : '-' }}</text>
<text v-if="topVal == '积分'"
:class="['amount-value', record.change_reason == '下单' ? 'positive' : 'negative']">¥{{
record.change_value }}</text>
<text v-else
<text
:class="['amount-value', record.change_reason == '下单' ? 'positive' : 'negative']">¥{{
record.amount_change }}</text>
</view>
@ -68,7 +65,20 @@ export default {
topVal: "",
photoVal: '',
balance: "",
records: [],
records: [
{
name: "退单-1312312317972",
time: "2025-08-12 13:00:00",
amount: "-1808.5",
remain: "286.79"
},
{
name: "退单-1312312317972",
time: "2025-08-12 13:00:00",
amount: "-1808.5",
remain: "286.79"
}
],
itemObj: {},
itemType: '',
page_num: 1,

2
packages/workOrderDashboard/guide/index.css
View File

@ -137,7 +137,7 @@
.walletBox_item{
/* margin: 20rpx 30rpx; */
width: 32%;
width: 25%;
display: block;
text-align: center;
font-size: 35rpx;

10
packages/workOrderDashboard/guide/index.vue
View File

@ -17,22 +17,22 @@
<view class="walletBox">
<view class="walletBox_top">钱包</view>
<view class="walletBox_content">
<view class="walletBox_item" @click="goWallet(1, walletInfo.receivable ? walletInfo.receivable.toFixed(2) : '0.00')">
<view class="walletBox_item" @click="goWallet(1, walletInfo.receivable.toFixed(2))">
<view>{{ walletInfo.receivable ? walletInfo.receivable.toFixed(2) : "0.00" }}元</view>
<view class="walletBox_item_text">应收</view>
</view>
<view class="walletBox_item" @click="goWallet(2, walletInfo.received ? walletInfo.received.toFixed(2) : '0.00')">
<view class="walletBox_item" @click="goWallet(2, walletInfo.received.toFixed(2))">
<view>{{ walletInfo.received ? walletInfo.received.toFixed(2) : "0.00" }}元</view>
<view class="walletBox_item_text">已收</view>
</view>
<view class="walletBox_item" @click="goWallet(3, walletInfo.pending ? walletInfo.pending.toFixed(2) : '0.00')">
<view class="walletBox_item" @click="goWallet(3, walletInfo.pending.toFixed(2))">
<view>{{ walletInfo.pending ? walletInfo.pending.toFixed(2) : "0.00" }}元</view>
<view class="walletBox_item_text">待收物业公积金</view>
</view>
<!-- <view class="walletBox_item" @click="goWallet(4, walletInfo.handling_fee.toFixed(2))">
<view class="walletBox_item" @click="goWallet(4, walletInfo.handling_fee.toFixed(2))">
<view>{{ walletInfo.handling_fee ? walletInfo.handling_fee.toFixed(2) : "0.00" }}元</view>
<view class="walletBox_item_text">手续费</view>
</view> -->
</view>
</view>
</view>
<view class="work-order-section">