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

tijiao

Browse Source
This commit is contained in:
始于初见
2025-04-15 14:46:03 +08:00
parent 85edeae7db
commit 0ea678deec
16 changed files with 2250 additions and 2623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
pages/bookShop/orderLCont.vue
View File

@@ -237,6 +237,35 @@
</view>
<view class="order_item" style="">
<view
class="orderReal"
v-if="orderContet.orderStatus != 0"
style="margin-bottom: 20rpx"
>
<span style="color: #666; margin-right: 10rpx; float: left"
>实付款 :
</span>
<b v-if="orderContet.orderType == 'point'" style="color: #dd3c0c"
>￥ {{ orderContet.bookBuyConfigEntity.realMoney }}</b
>
<b style="color: #dd3c0c" v-else>
<template v-if="orderContet.realMoney > 0">
￥{{ orderContet.realMoney }}
</template>
<text
style="margin: 0 4rpx"
v-if="
orderContet.realMoney > 0 && orderContet.jfDeduction > 0
"
>
+
</text>
<text v-if="orderContet.jfDeduction > 0"
>{{ orderContet.jfDeduction }} 积分</text
></b
>
</view>
<view class="orderallpri">
<span style="color: #666; margin-right: 10rpx; float: left"
>商品总价 :
@@ -302,18 +331,6 @@
>￥ {{ orderContet.jfDeduction }}</span
>
</view>
<view class="orderReal" v-if="orderContet.orderStatus != 0">
<span style="color: #666; margin-right: 10rpx; float: left"
>实付款 :
</span>
<b v-if="orderContet.orderType == 'point'" style="color: #dd3c0c"
>￥ {{ orderContet.bookBuyConfigEntity.realMoney }}</b
>
<b style="color: #dd3c0c"
><span>￥</span>{{ orderContet.realMoney }}</b
>
</view>
</view>
<view class="order_item">
<view class="orderYunf">
@@ -343,7 +360,9 @@
<view
class="orderReal"
v-if="
orderContet.orderStatus >= 1 && orderContet.orderStatus != 5&& orderContet.paymentDate
orderContet.orderStatus >= 1 &&
orderContet.orderStatus != 5 &&
orderContet.paymentDate
"
>
<span style="color: #666; margin-right: 10rpx; float: left"
@@ -353,12 +372,7 @@
orderContet.paymentDate
}}</text>
</view>
<view
class="orderReal"
v-if="
orderContet.paymentMethod
"
>
<view class="orderReal" v-if="orderContet.paymentMethod">
<span style="color: #666; margin-right: 10rpx; float: left"
>付款方式 :
</span>
@@ -372,20 +386,27 @@
<span style="color: #666" v-if="orderContet.paymentMethod == 3"
>苹果支付</span
>
<span style="color: #666" v-if="orderContet.paymentMethod == 4"
<span style="color: #666" v-if="orderContet.paymentMethod == 4">
<template
v-if="
orderContet.orderType == 'point' &&
orderContet.bookBuyConfigEntity.realMoney > 0
"
>
<template v-if="orderContet.orderType == 'point'&&orderContet.bookBuyConfigEntity.realMoney>0">
天医币支付<text v-if="orderContet.jfDeduction>0">&nbsp;+ 积分抵扣</text>
天医币支付<text v-if="orderContet.jfDeduction > 0"
>&nbsp;+ 积分抵扣</text
>
</template>
<template v-else-if="orderContet.realMoney">
天医币支付 <text v-if="orderContet.jfDeduction>0">&nbsp;+ 积分抵扣</text>
天医币支付
<text v-if="orderContet.jfDeduction > 0"
>&nbsp;+ 积分抵扣</text
>
</template>
<template v-else-if="orderContet.jfDeduction>0">
积分抵扣
</template>
</span
></text
<template v-else-if="orderContet.jfDeduction > 0">
积分抵扣
</template>
</span></text
>
</view>
</view>

2668
pages/bookShop/orderList.vue
View File

File diff suppressed because it is too large Load Diff

2
pages/course/courseDetail.vue
View File

@@ -207,7 +207,7 @@
<!-- 实际购买课程到期时间 -->
<text style="line-height: 50rpx;">课程有效期截止到：{{librayList[curIndex].endTime}} </text>
<!-- 自己买的可以续费 -->
<text class="xufeiBtn" @click="handleClickGetGoodsList(librayList[curIndex])">续费</text>
<text class="xufeiBtn" @click="goNewPay(librayList[curIndex])">续费</text>
</template>
</view>
</view>

19
pages/course/myCourse.vue
View File

@@ -135,7 +135,7 @@
<!-- 评论弹出 -->
<public-module></public-module>
<tree-list ref="treeList" v-if="treeListVisible" @clickCourseInfo="clickCourseInfo"></tree-list>
<buy-pup v-if="pricespop" :proPriceList="proPriceList" @closePup="closePup" @oprate="oprate"></buy-pup>
<buy-pup-fudu v-if="pricespop" :proPriceList="proPriceList" @closePup="closePup" @oprate="oprate"></buy-pup-fudu>
<z-navigation></z-navigation>
<!-- <music-play :playData="playData"></music-play> -->
</view>
@@ -144,7 +144,7 @@
<script>
// import musicPlay from '@/components/music.vue'
import buyPup from '@/components/buyPup.vue'
import buyPupFudu from '@/components/buyPupFudu.vue'
import treeList from '@/components/tagTree.vue'
import commentsList from '@/components/commentsList.vue'
import emojiList1 from '../../bkhumor-emojiplus/emoji/biaoqin.js'
@@ -276,7 +276,7 @@
// musicPlay
emotion,
treeList,
buyPup
buyPupFudu
// commentsList
},
@@ -285,7 +285,7 @@
oprate(data){
console.log(data,'得到的内容')
if(data.name == 'buy'){
this.buy(data.item)
this.buy(data.item,data.index)
}else if(data.name == 'gouwuche'){
this.addCart(data.item)
}
@@ -412,7 +412,7 @@
}
},
// 直接购买
buy(val){
buy(val,index){
var mynavData = JSON.stringify({
        goods: [
          {
@@ -423,7 +423,8 @@
            goodsType: val.goodsType,
          },
        ],
isFudu: true,
fuduId: val.catalogueId,
        navTitle: val.productName,
        title: val.productName,
        typeId: 0,
@@ -730,10 +731,10 @@
xufei(val){
// console.log('去续费,获取商品列表')
$http.request({
url: "sociology/product/getProductListForCourse",
url: "common/courseRelearn/relearnShopProductList",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
data: {
"id": val.catalogueId
"catalogueId": val.catalogueId
},
header: { //默认 无 说明：请求头
'Content-Type': 'application/json'
@@ -742,7 +743,7 @@
.then(res => {
if (res.code == 0) {
if (res.productList.length > 0) {
this.proPriceList = res.productList
this.proPriceList = res.productList.map((e)=>{return {...e,catalogueId:val.catalogueId}})
// this.curProId = this.proPriceList[0].productId
this.pricespop = true
} else {

17
pages/goods/order/index.vue
View File

@@ -74,7 +74,7 @@
</image>
<image
v-else
src="/static/nobg1.jpg"
src="/static/nobg1.jpg" class="goods_item_img"
mode="widthFix"
@click="goDetail(item.productId)"
></image>
@@ -468,12 +468,21 @@
<!-- leftSlot -->
<template slot="leftSlot" slot-scope="slotProps">
<view class="price_box order_bottom_box"
><text class="number">共{{ number }}件</text>
>
<text class="price"
>合计:
<text class="total"
>￥{{ Number(actualPayment).toFixed(2) }}</text
>
<template v-if="actualPayment>0">
￥{{ Number(actualPayment).toFixed(2) }}
</template>
<text style="margin: 0 4rpx;" v-if="actualPayment>0&&jfNumber>0">
+
</text>
<text v-if="jfNumber>0">{{ jfNumber }} 积分</text>
</text
>
</text>
</view>
@@ -716,7 +725,7 @@ export default {
},
customButton: [
{
width: "340rpx",
width: "200rpx",
text: "立即支付",
backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)",
color: "#fff",

1281
pages/hufen/hufen.vue
View File

File diff suppressed because it is too large Load Diff

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

@@ -203,11 +203,11 @@
url: "/pages/certificate/certificate",
type: "pageJump",
},
// {
// 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();
},

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;
}