zm/medicine_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

培训班管理，处理冲突

Browse Source
This commit is contained in:
liuyuan
2025-04-16 09:10:23 +08:00
parent 37e591aa33 8814cbc566
commit 9d9e6efe07
1484 changed files with 2256 additions and 286077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pages/mine/mine/index.vue
View File

@@ -204,15 +204,10 @@
type: "pageJump",
},
{
name: "培训班管理",
url: "/pages/trainingCourse/index",
name: "我的湖分",
url: "/pages/hufen/hufen",
type: "pageJump",
},
// {
// name: "我的湖分",
// url: "/pages/hufen/hufen",
// type: "pageJump",
// },
{
name: "个人资料",
url: "/pages/mine/userInfo/persData",

18
pages/mine/vip/order.vue
View File

@@ -190,11 +190,18 @@
<view class="price_box order_bottom_box">
<text class="price"
>合计：
<text class="total"
>￥{{ dataInfo.lastFee - jfNumber }}
<text v-if="jfNumber > 0" style="margin-left: 10rpx"
>+ {{ jfNumber }}积分</text
<text class="total">
<template v-if="dataInfo.lastFee - jfNumber > 0">
￥{{ dataInfo.lastFee - jfNumber }}
</template>
<text
style="margin: 0 4rpx"
v-if="dataInfo.lastFee - jfNumber > 0 && jfNumber > 0"
>
+
</text>
<text v-if="jfNumber > 0">{{ jfNumber }} 积分</text>
</text>
</text>
</view>
@@ -723,7 +730,7 @@ export default {
this.dataInfo.lastFee = item.rebateFee;
this.dataInfo.id = item.id;
if (this.initData.user && this.initData.user.jf) {
this.jfNumber=0
this.jfNumber = 0;
var totalMoney = this.dataInfo.lastFee;
if (this.initData.user.jf >= totalMoney) {
const integerPart = Math.floor(totalMoney);
@@ -732,7 +739,6 @@ export default {
} else {
this.jfNumberMax = this.initData.user.jf; // 设置 jfNumberMax
}
}
this.$forceUpdate();
},

12
pages/mine/wallet/index/index.vue
View File

@@ -65,6 +65,7 @@
<common-list
:dataList="MoneyRecord"
isCondition="true"
@hancleClick="goClick"
isNoIcon="true"
label="orderType"
>
@@ -286,6 +287,17 @@ export default {
},
//方法
methods: {
goClick(data){
if(data.relationId){
uni.navigateTo({
url: "/pages/bookShop/orderLCont?orderId=" +
id
});
}
},
// 获取
getData() {
var data = {

16
pages/mine/wallet/jf/index.vue
View File

@@ -33,9 +33,9 @@
label="orderType"
>
<template slot="labelSlot" slot-scope="slotProps">
<view class="label_content AC_List">
<view class="label_content AC_List" @click="slotProps.row.relationId?goClick(slotProps.row.relationId):''">
<view class="left">
<view class="title">{{ slotProps.row.orderType }}</view>
<view class="title"><view class="AC_time">{{ slotProps.row.createTime }} </view></view>
</view>
<view
:class="`right ${
@@ -43,13 +43,14 @@
}`"
>
<text v-if="slotProps.row.changeAmount > 0">+</text>
<text>{{ slotProps.row.changeAmount }}</text> </view
<text>{{ slotProps.row.changeAmount }}</text>
</view
><view class="AC_mark" v-if="slotProps.row.remark">{{
slotProps.row.remark
}}</view
><view class="AC_time">{{ slotProps.row.createTime }} </view>
>
</view>
<text class="order" style="font-size: 12px;" v-if="slotProps.row.relationId" @click="goClick(slotProps.row.relationId)">订单详情</text>
<!-- <text class="order" style="font-size: 12px;" v-if="slotProps.row.relationId" @click="goClick(slotProps.row.relationId)">订单详情</text> -->
</template>
</common-list>
</view>
@@ -409,7 +410,7 @@ export default {
overflow: hidden;
.left {
width: calc(100% - 120rpx) !important;
width: calc(100% - 200rpx) !important;
font-weight: 700;
float: left;
color: #333;
@@ -441,15 +442,18 @@ export default {
}
.AC_mark {
width: 100%;
font-size: 28rpx;
margin-top: 10rpx;
margin-bottom: 15rpx;
// white-space: nowrap;
color: #343434;
float: left;
overflow: hidden;
}
.AC_time {
// width: 100%;
color: #909090;
font-size: 28rpx;
}