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

202
components/buyPupFudu.vue Normal file
View File

@@ -0,0 +1,202 @@
<template>
<view>
<u-popup key="1" :show="pricespop" :round="10" @close="closePup">
<view class="proListPrice" v-if="proPriceList.length > 0">
<view class="title">
请选择
</view>
<view class="list">
<view :class="['item',curProId == index ? 'active' : '']"
v-for="(item,index) in proPriceList" :key="index" @click="choosePrice(item,index)">
{{item.productName}} - {{item.price}}
</view>
</view>
<view class="tbn flexbox" style="padding-bottom: 20px;">
<view class="saveBtnss buybtn flexbox" @click="oprate('buy')">
<u-icon name="bag" color="#fff" size="28"></u-icon>
<text>立即购买</text>
</view>
<!-- <view class="saveBtnss gouwuche flexbox" @click="oprate('gouwuche')">
<uni-icons type="cart" size="28" style="color: #666;"></uni-icons>
<text>加入购物车</text>
</view> -->
</view>
</view>
</u-popup>
</view>
</template>
<script>
export default {
name:"buyPup",
props:['proPriceList'],
data() {
return {
pricespop:true,
curProId:null,
curPro:{}
};
},methods:{
closePup() {
this.pricespop = false
this.$emit('closePup')
},
choosePrice(item,index) {
console.log(index, 'choosePrice')
this.curProId = index
this.curPro = item
},
oprate(val){
if(this.curProId==null){
uni.showToast({
title:'请选择您的课程',
icon:'none'
})
return
}
if(val=='buy'){
console.log('直接购买');
this.$emit('oprate',{name:val,item:this.curPro,index:this.curProId})
}else if(val == 'gouwuche'){
console.log('加入购物车');
this.$emit('oprate',{name:val,item:this.curPro,index:this.curProId})
}
this.closePup()
}
}
}
</script>
<style lang="scss" scoped>
@import '@/style/mixin.scss';
.flexbox {
display: flex;
}
.saveBtn {
align-items: center;
justify-content: center;
height: 80rpx;
background-color: #00d8df;
// width: 46%;
overflow: hidden;
border-radius: 30rpx;
text {
padding-left: 10rpx;
font-size: 28rpx;
color: #fff;
}
}
.vipBtn {
@include theme("vipbtnbg");
border-radius: 100rpx;
justify-content: center;
width: 150px;
color: #fff;
margin: 10rpx auto;
}
.buyBox {
// position: fixed;
// z-index: 2;
// bottom: 100rpx;
// left: 0;
@include pleft_right(4px);
// @include mshadow(10px, 1);
padding: 20rpx 10rpx;
width: 100%;
font-size: 28rpx;
flex-wrap: wrap;
background-image: linear-gradient(60deg, #e0e9f6 0%,#ece6fa 30%,#d7e8f0 60%, #fff 100%);
// background: rgba(255, 255, 255, 0.9);
.item {
width: 100%;
text-align: center; line-height: 70rpx !important;
}
.tbn {
align-items: center;
}
.buybtn {
color: #fff;
}
}
.proListPrice {
text-align: center;
.title {
font-size: 28rpx;
margin: 10px 0;
}
.list {
padding: 0 10px;
padding-bottom: 20rpx;
.item {
font-size: 26rpx;
color: #333;
margin-bottom: 10rpx;
padding-top:20rpx ;
padding-bottom:20rpx ;
line-height:40rpx;
border-radius: 50rpx;
border: 1px solid #eee;
}
.item.active {
color: $themeColor;
border: 1px solid $themeColor;
}
.item:last-child {
// border-bottom: none
}
}
.tbn {
justify-content: center;
}
.buybtn { padding: 0 20rpx;
background-color: #00d8df;
margin: 0;
margin-right: 20rpx;
text {
color: #fff;
}
}
.saveBtnss {
align-items: center;
justify-content: center;
height: 80rpx;
// width: 46%;
overflow: hidden;
border-radius: 50rpx;
text {
padding-left: 10rpx;
font-size: 28rpx;
}
}
.gouwuche {
border: 1px solid #666;
padding-right: 20rpx;
text {
// color: #fff;
}
}
}
</style>

View File

@@ -6,14 +6,12 @@
"request": 15000
},
"transformPx": false,
"icons" : [
{
"icons": [{
"sizes": "分辨率192x192",
"src": "图片路径"
}
],
"versionName" : "2.0.04",
"versionCode" : 2004,
}],
"versionName": "2.0.05",
"versionCode": 2005,
"app-plus": {
"nvueCompiler": "uni-app",
"compatible": {
@@ -270,4 +268,3 @@
}
}
//

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
"
>
天医币支付<text v-if="orderContet.jfDeduction > 0"
>&nbsp;+ 积分抵扣</text
>
<template v-if="orderContet.orderType == 'point'&&orderContet.bookBuyConfigEntity.realMoney>0">
天医币支付<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
</span></text
>
</view>
</view>

View File

@@ -1,28 +1,56 @@
<template>
<view class="container commonPageBox commonDetailPage" style="background-color: #f6f7fb">
<view
class="container commonPageBox commonDetailPage"
style="background-color: #f6f7fb"
>
<!-- 公共组件-每个页面必须引入 -->
<public-module></public-module>
<z-nav-bar title="我的订单" bgColor="#258feb" fontColor="#fff" :backState="2000">
<z-nav-bar
title="我的订单"
bgColor="#258feb"
fontColor="#fff"
:backState="2000"
>
</z-nav-bar>
<view class="cateList flexbox">
<common-sticky itemStyle="width:20%; height: 68rpx;font-size:24rpx;" :list="ordersTabs" label="name"
:currentCateIndex="currentCateIndex" @handleselectCate="ordersTabCLi"></common-sticky>
<common-sticky
itemStyle="width:20%; height: 68rpx;font-size:24rpx;"
:list="ordersTabs"
label="name"
:currentCateIndex="currentCateIndex"
@handleselectCate="ordersTabCLi"
></common-sticky>
</view>
<!-- 站位 -->
<!-- <view v-if="ordersListTab == 1"> -->
<view class="order_box" :style="`height: calc(100% - ${(80 + statusBarHeight) * 2}rpx);`"
style="background-color: #f2f2f2">
<common-list imgUrl="url" indexKey="orderSn" noDataIcon="data" :isScroll="true"
:isLoadingHide="isLoadingHide" :isNoIcon="true" :isCondition="true" :dataList="newList"
@hancleClick="toDetail" @lower="onReachBottom1" :pagination="pagination" label="title">
<view
class="order_box"
:style="`height: calc(100% - ${(80 + statusBarHeight) * 2}rpx);`"
style="background-color: #f2f2f2"
>
<common-list
imgUrl="url"
indexKey="orderSn"
noDataIcon="data"
:isScroll="true"
:isLoadingHide="isLoadingHide"
:isNoIcon="true"
:isCondition="true"
:dataList="newList"
@hancleClick="toDetail"
@lower="onReachBottom1"
:pagination="pagination"
label="title"
>
<view slot="labelSlot" slot-scope="slotProps">
<view class="orderInfo color_shandow">
<view class="mainContent">
<view class="btns" style="margin-top: 0rpx">
<view class="flexbox opbtns" style="letter-spacing: 1rpx">
<view style="
<view
style="
width: 100%;
display: flex;
align-items: center;
@@ -31,29 +59,71 @@
color: #9b9b9b;
font-size: 26rpx;
font-weight: 400;
">{{ slotProps.row.orderSn }}
"
>{{ slotProps.row.orderSn }}
<u-tag @click="handleCopy(slotProps.row.orderSn, '订单编号')" borderColor="#258feb"
color="#258feb" text="复制" plain style="float: right" size="mini"
type="success"></u-tag>
<u-tag
@click="handleCopy(slotProps.row.orderSn, '订单编号')"
borderColor="#258feb"
color="#258feb"
text="复制"
plain
style="float: right"
size="mini"
type="success"
></u-tag>
</view>
</view>
</view>
<view class="item">
<view class="item_top" style="margin-top: 10rpx; margin-bottom: 0">
<view
class="item_top"
style="margin-top: 10rpx; margin-bottom: 0"
>
<view class="source_app"></view>
<view style="text-align: left">
<text class="orderstatus" v-show="slotProps.row.orderStatus == 0">未付款</text>
<text class="orderstatus" v-show="slotProps.row.orderStatus == 1">待发货</text>
<text class="orderstatus" v-show="slotProps.row.orderStatus == 2">已发货</text>
<text class="orderstatus" v-show="slotProps.row.orderStatus == 3">交易成功</text>
<text class="orderstatus" v-show="slotProps.row.orderStatus == 4">交易失败</text>
<text class="orderstatus" v-show="slotProps.row.orderStatus == 5">已过期</text>
<text
class="orderstatus"
v-show="slotProps.row.orderStatus == 0"
>未付款</text
>
<text
class="orderstatus"
v-show="slotProps.row.orderStatus == 1"
>待发货</text
>
<text
class="orderstatus"
v-show="slotProps.row.orderStatus == 2"
>已发货</text
>
<text
class="orderstatus"
v-show="slotProps.row.orderStatus == 3"
>交易成功</text
>
<text
class="orderstatus"
v-show="slotProps.row.orderStatus == 4"
>交易失败</text
>
<text
class="orderstatus"
v-show="slotProps.row.orderStatus == 5"
>已过期</text
>
</view>
</view>
<view v-if="slotProps.row.orderType == 'relearn'" class="bookinfolist">
<image class="feng fengPoint" src="/static/icon/fugou.png" mode="aspectFill">
<view
v-if="slotProps.row.orderType == 'relearn'"
class="bookinfolist"
>
<image
class="feng fengPoint"
src="/static/icon/fugou.png"
mode="aspectFill"
>
</image>
<!-- <view class="description" >课程复读订单
</view> -->
@@ -62,12 +132,14 @@
{{ slotProps.row.remark }}
</view>
<view style="
<view
style="
line-height: 58rpx;
color: #333;
font-size: 26rpx;
font-weight: 700;
">
"
>
<text style="font-size: 20rpx"></text>
</view>
</view>
@@ -78,33 +150,59 @@
下单时间{{ slotProps.row.createTime }}
</view> -->
</view>
<view v-if="slotProps.row.orderType == 'vip'" class="bookinfolist">
<image class="feng fengPoint" src="/static/icon/vip.png" mode="aspectFill"></image>
<view
v-if="slotProps.row.orderType == 'vip'"
class="bookinfolist"
>
<image
class="feng fengPoint"
src="/static/icon/vip.png"
mode="aspectFill"
></image>
<!-- <view class="description" v-html="item.content">
</view> -->
<view class="btns flexbox">
<view class="booknameleft">
{{ slotProps.row.vipBuyConfigEntity?slotProps.row.vipBuyConfigEntity.title:' ' }}
<text class="vip_year" v-if="slotProps.row.vipBuyConfigEntity">({{ slotProps.row.vipBuyConfigEntity.year }})</text>
{{
slotProps.row.vipBuyConfigEntity
? slotProps.row.vipBuyConfigEntity.title
: " "
}}
<text
class="vip_year"
v-if="slotProps.row.vipBuyConfigEntity"
>({{ slotProps.row.vipBuyConfigEntity.year }})</text
>
</view>
<view style="
<view
style="
line-height: 58rpx;
color: #333;
font-size: 26rpx;
font-weight: 700;
">
"
>
<text style="font-size: 20rpx"></text>
</view>
</view>
<view class="btns flexbox"
style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx">
<view
class="btns flexbox"
style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx"
>
下单时间{{ slotProps.row.createTime }}
</view>
</view>
<view v-if="slotProps.row.orderType == 'point'" class="bookinfolist">
<image class="feng fengPoint" src="/static/icon/pay_3.png" mode="aspectFill">
<view
v-if="slotProps.row.orderType == 'point'"
class="bookinfolist"
>
<image
class="feng fengPoint"
src="/static/icon/pay_3.png"
mode="aspectFill"
>
</image>
<!-- <view class="description" v-html="item.content">
</view> -->
@@ -114,35 +212,54 @@
{{ slotProps.row.bookBuyConfigEntity.money }}天医币
</view>
<view style="
<view
style="
line-height: 58rpx;
color: #333;
font-size: 26rpx;
font-weight: 700;
">
"
>
</view>
</view>
<view class="btns flexbox"
style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx">
<view
class="btns flexbox"
style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx"
>
下单时间{{ slotProps.row.createTime }}
</view>
</view>
<view v-if="slotProps.row.orderType == 'order'">
<view v-for="(item2, index2) in slotProps.row.productList"
:key="slotProps.row.orderId" class="bookinfolist">
<view
v-for="(item2, index2) in slotProps.row.productList"
:key="slotProps.row.orderId"
class="bookinfolist"
>
<view v-if="item2.product">
<view class="feng" v-if="item2.product && item2.product.productImages">
<image :key="Date.now()" style="width: 100%; height: 100%"
mode="aspectFit" :src="item2.product.productImages"></image>
<view
class="feng"
v-if="item2.product && item2.product.productImages"
>
<image
:key="Date.now()"
style="width: 100%; height: 100%"
mode="aspectFit"
:src="item2.product.productImages"
></image>
</view>
<view v-else class="feng" style="
<view
v-else
class="feng"
style="
color: #c0c4cc;
font-size: 22rpx;
line-height: 140rpx;
text-align: center;
">暂无封面图</view>
"
>暂无封面图</view
>
<!-- <view class="description" v-html="item.content">
</view> -->
<view class="btns flexbox">
@@ -152,21 +269,24 @@
: ""
}}</view>
<view style="
<view
style="
line-height: 58rpx;
color: #333;
font-size: 26rpx;
font-weight: 700;
">
"
>
<text style="font-size: 20rpx"></text>
{{
item2.product.price ? item2.product.price : ""
}}
{{ item2.product.price ? item2.product.price : "" }}
</view>
</view>
<view class="btns flexbox" style="margin-top: 10rpx">
<view class="left" style="color: #c0c4cc"></view>
<view class="right flexbox opbtns" style="color: #c0c4cc">
<view
class="right flexbox opbtns"
style="color: #c0c4cc"
>
×{{ item2.quantity ? item2.quantity : "" }}
</view>
</view>
@@ -174,8 +294,13 @@
<view v-else>
<view class="feng"></view>
<view class="btns flexbox">
<view class="booknameleft" style="color: #181818">未知商品</view>
<view style="" class="right flexbox opbtns product_quantity">
<view class="booknameleft" style="color: #181818"
>未知商品</view
>
<view
style=""
class="right flexbox opbtns product_quantity"
>
×{{ item2.quantity ? item2.quantity : "" }}
</view>
</view>
@@ -184,99 +309,125 @@
</view>
<view style="margin-top: 10rpx; overflow: hidden">
<view class="btns flexbox" style="float: right; width: auto !important">
<view class="right flexbox opbtns" style="
<view
class="btns flexbox"
style="float: right; width: auto !important"
>
<view
class="right flexbox opbtns"
style="
width: auto;
line-height: 44rpx;
letter-spacing: 1rpx;
display: flex;
align-items: center;
">
<view style="
"
>
<view
style="
line-height: 46rpx;
color: #000;
font-size: 28rpx;
font-weight: 500;
margin-right: 10rpx;
">实付款</view>
<view style="
"
>实付款</view
>
<view
style="
/* margin-top: 8rpx; */
line-height: 46rpx;
color: #333;
font-size: 30rpx;
font-weight: 700;
">
<text style="font-size: 20rpx"></text>
"
>
<!-- <text style="font-size: 20rpx"></text> -->
<text v-if="slotProps.row.orderType == 'point'">
{{ slotProps.row.bookBuyConfigEntity.realMoney }}
</text>
<text v-else>
{{
<!-- {{
slotProps.row.realMoney ||
slotProps.row.realMoney == 0
? slotProps.row.realMoney
: ""
}}
}} -->
<template v-if="slotProps.row.realMoney > 0">
{{ slotProps.row.realMoney }}
</template>
<text
style="margin: 0 4rpx"
v-if="
slotProps.row.realMoney > 0 &&
slotProps.row.jfDeduction > 0
"
>
+
</text>
<text v-if="slotProps.row.jfDeduction > 0"
>{{ slotProps.row.jfDeduction }} 积分</text
>
</text>
</view>
</view>
</view>
<view class="btns flexbox" style="
margin-top: 0rpx;
float: right;
width: auto;
margin-left: 20rpx;
" v-if="
(slotProps.row.addressId == 0 ||
slotProps.row.addressId == null) &&
slotProps.row.jfDeduction > 0
">
<view class="right flexbox opbtns" style="
line-height: 44rpx;
letter-spacing: 1rpx;
display: flex;
align-items: center;
"><text style="color: #9b9b9b"> </text>
<view style="
line-height: 46rpx;
color: #9b9b9b;
font-size: 24rpx;
font-weight: 500;
margin-right: 10rpx;
">积分抵扣</view>
<view style="
/* margin-top: 8rpx; */
line-height: 46rpx;
color: #9b9b9b;
font-size: 26rpx;
font-weight: 700;
">
<text style="font-size: 20rpx">¥</text>
{{ slotProps.row.jfDeduction }}
</view>
</view><text style="color: #9b9b9b"></text>
</view>
</view>
<view class="operation_box boxShadow" v-if="slotProps.row.isShowMore == true">
<view v-if="slotProps.row.orderStatus == 0"
@click.native.stop="canceOrder(slotProps.row)">取消订单</view>
</view>
<view
class="operation_box boxShadow"
v-if="slotProps.row.isShowMore == true"
>
<view
v-if="slotProps.row.orderStatus == 0"
@click.native.stop="canceOrder(slotProps.row)"
>取消订单</view
>
</view>
<view class="btns flexbox" style="margin-top: 10rpx">
<view class="left" style="color: #c0c4cc" @click.native.stop="
<view
class="left"
style="color: #c0c4cc"
@click.native.stop="
openMore(slotProps.row, slotProps.rowIndex)
">更多</view>
"
>更多</view
>
<view class="right flexbox opbtns">
<view class="orderstatusbtn orderstatusbtn_success"
v-if="slotProps.row.orderStatus == 0 && slotProps.row.paymentMethod != 3"
@click.stop="goPay(slotProps.row)">继续付款</view>
<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 1">催发货</view>
<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 2"
@click.native.stop="seeExpressDetail(slotProps.row)">查看物流</view>
<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 2"
@click.native.stop="OverOrder(slotProps.row)">确认收货</view>
<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 3">申请售后</view>
<view
class="orderstatusbtn orderstatusbtn_success"
v-if="
slotProps.row.orderStatus == 0 &&
slotProps.row.paymentMethod != 3
"
@click.stop="goPay(slotProps.row)"
>继续付款</view
>
<view
class="orderstatusbtn"
v-if="slotProps.row.orderStatus == 1"
>催发货</view
>
<view
class="orderstatusbtn"
v-if="slotProps.row.orderStatus == 2"
@click.native.stop="seeExpressDetail(slotProps.row)"
>查看物流</view
>
<view
class="orderstatusbtn"
v-if="slotProps.row.orderStatus == 2"
@click.native.stop="OverOrder(slotProps.row)"
>确认收货</view
>
<view
class="orderstatusbtn"
v-if="slotProps.row.orderStatus == 3"
>申请售后</view
>
<!-- <view
class="orderstatusbtn"
v-if="item.orderStatus == 3 && userRecordid == null"
@@ -287,8 +438,10 @@
</view>
</view>
<view style="border-bottom: 2rpx solid #e9e9e9; height: 50rpx"
v-if="slotProps.rowIndex < slotProps.row.length - 1"></view>
<view
style="border-bottom: 2rpx solid #e9e9e9; height: 50rpx"
v-if="slotProps.rowIndex < slotProps.row.length - 1"
></view>
</view>
<!-- <view class="btns" style="margin-top: 10rpx">
<view class="flexbox opbtns" style="">
@@ -337,49 +490,100 @@
</uni-forms>
<!-- <u-button type="success" @click="submitPJ">提交评价</u-button> -->
<!-- 提交 -->
<view class="padding-bottom-sm flex padding-lr-sm" style="border-bottom: 1px solid #eeeeee">
<view
class="padding-bottom-sm flex padding-lr-sm"
style="border-bottom: 1px solid #eeeeee"
>
<view class="mb30" v-if="pjType != 'zhuiping'">
<view :class="['star', Pform.star >= 1 ? 'starLight' : 'starGray']" @click="getStar(1)">
<view
:class="['star', Pform.star >= 1 ? 'starLight' : 'starGray']"
@click="getStar(1)"
>
</view>
<view :class="['star', Pform.star >= 2 ? 'starLight' : 'starGray']" @click="getStar(2)">
<view
:class="['star', Pform.star >= 2 ? 'starLight' : 'starGray']"
@click="getStar(2)"
>
</view>
<view :class="['star', Pform.star >= 3 ? 'starLight' : 'starGray']" @click="getStar(3)">
<view
:class="['star', Pform.star >= 3 ? 'starLight' : 'starGray']"
@click="getStar(3)"
>
</view>
<view :class="['star', Pform.star >= 4 ? 'starLight' : 'starGray']" @click="getStar(4)">
<view
:class="['star', Pform.star >= 4 ? 'starLight' : 'starGray']"
@click="getStar(4)"
>
</view>
<view :class="['star', Pform.star >= 5 ? 'starLight' : 'starGray']" @click="getStar(5)">
<view
:class="['star', Pform.star >= 5 ? 'starLight' : 'starGray']"
@click="getStar(5)"
>
</view>
</view>
<view class="mb30" v-if="pjType != 'zhuiping'">
<!-- <uni-file-picker :auto-upload="false" ref="files" @delete="deleteImg" limit="5" @success="upSuccess" @select="select" v-model="Pform.img" fileMediatype="image" :image-styles="imageStyles"/> -->
<u-upload :fileList="Pform.img" @afterRead="afterRead" @delete="deletePic" multiple
:maxCount="4" width="80" height="80" :previewFullImage="true">
<u-upload
:fileList="Pform.img"
@afterRead="afterRead"
@delete="deletePic"
multiple
:maxCount="4"
width="80"
height="80"
:previewFullImage="true"
>
</u-upload>
</view>
<view class="flex-sub flexbox">
<i @click="showEmj()" :class="emojiIcon"></i>
<!-- <input type="text" @focus="InputFocus" @blur="InputBlur" v-model="message" @input="textareaBInput" placeholder-style="font-size:24rpx;color:#aaaaaa;" placeholder="请输入您要发送的内容"></input> -->
<textarea class="textarea" v-model="Pform.comment" @focus="InputFocus" @blur="InputBlur"
@input="textareaBInput" placeholder-style="font-size:24rpx;color:#aaaaaa;"
placeholder="请输入您要发送的内容"></textarea>
<textarea
class="textarea"
v-model="Pform.comment"
@focus="InputFocus"
@blur="InputBlur"
@input="textareaBInput"
placeholder-style="font-size:24rpx;color:#aaaaaa;"
placeholder="请输入您要发送的内容"
></textarea>
</view>
<view class="">
<!-- <button class="cu-btn bg-gradual-blue shadow-blur">发送</button> -->
<u-button type="success" @click="submitPJ" v-if="pjType != 'zhuiping'">提交评价</u-button>
<u-button type="success" @click="zhuiping" v-else>提交追评</u-button>
<u-button
type="success"
@click="submitPJ"
v-if="pjType != 'zhuiping'"
>提交评价</u-button
>
<u-button type="success" @click="zhuiping" v-else
>提交追评</u-button
>
</view>
</view>
<view style="position: relative">
<emotion @emotion="handleEmj" :height="220" v-if="isShowEmj" :windowWidth="windowWidth">
<emotion
@emotion="handleEmj"
:height="220"
v-if="isShowEmj"
:windowWidth="windowWidth"
>
</emotion>
</view>
</view>
</view>
</u-popup>
<z-navigation></z-navigation>
<u-action-sheet :closeOnClickAction="true" :closeOnClickOverlay="true" :actions="moreList" :show="isShowMore"
cancelText="关闭" @close="isShowMore = false" @select="selectClick"></u-action-sheet>
<u-action-sheet
:closeOnClickAction="true"
:closeOnClickOverlay="true"
:actions="moreList"
:show="isShowMore"
cancelText="关闭"
@close="isShowMore = false"
@select="selectClick"
></u-action-sheet>
</view>
</template>
@@ -387,16 +591,9 @@
import $http from "@/config/requestConfig.js";
import emotion from "@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue";
// import musicPlay from "@/components/music.vue";
import {
setPay,
setPayAssign,
setWXPay
} from "@/config/utils";
import { setPay, setPayAssign, setWXPay } from "@/config/utils";
// import { data } from 'jquery';
import {
mapState,
mapMutations
} from "vuex";
import { mapState, mapMutations } from "vuex";
export default {
data() {
return {
@@ -404,10 +601,12 @@
come: "2",
isShowTab: false,
isLoadingHide: false,
moreList: [{
moreList: [
{
name: "取消订单",
key: "false",
}, ],
},
],
currentCateIndex: 0,
pagination: {
// 请求参数
@@ -432,7 +631,8 @@
status: 3,
shupingList: [],
bfaid: null,
ordersTabs: [{
ordersTabs: [
{
name: "全部",
value: -1,
badge: {},
@@ -590,7 +790,8 @@
// url:'../bookShop/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
// })
uni.navigateTo({
url: "/pages/bookShop/orderLCont?orderId=" +
url:
"/pages/bookShop/orderLCont?orderId=" +
val.orderId +
"&orderType=" +
val.orderStatus +
@@ -698,7 +899,8 @@
console.log(payItem, "订单数据");
if (payItem.paymentMethod == 2) {
console.log("阿里支付");
setPay({
setPay(
{
typePay: "alipay",
subject: "order",
totalAmount: payItem.realMoney,
@@ -756,17 +958,17 @@
// 苹果充值
console.log("苹果二次支付");
uni.showModal({
content: 'apple内购订单不支持继续支付请重新发起支付申请并完成支付',
confirmText: '好的',
showCancel: false
})
content: "apple内购订单不支持继续支付请重新发起支付申请并完成支付",
confirmText: "好的",
showCancel: false,
});
} else if (payItem.paymentMethod == 4) {
console.log('天医币二次支付')
console.log("天医币二次支付");
}
},
// 取消订单
canceOrder(item) {
console.log('item.orderSn', item);
console.log("item.orderSn", item);
uni.showModal({
title: "提示",
content: "确定要取消订单吗?",
@@ -777,9 +979,7 @@
success: (res) => {
if (res.confirm) {
this.$http
.post(
"book/buyOrder/appDelete?orderId=" + item.orderId
)
.post("book/buyOrder/appDelete?orderId=" + item.orderId)
.then((res) => {
if (res.code == 0) {
uni.showToast({
@@ -840,7 +1040,8 @@
// }else if(this.sheetList.length == 1){
// 直接展示详情
uni.navigateTo({
url: "./deliverDetail?orderSn=" +
url:
"./deliverDetail?orderSn=" +
item.orderSn +
"&expressOrderSn=" +
item.expressList[0].expressOrderSn,
@@ -882,7 +1083,8 @@
this.getBookList(this.ordersListTab, false);
}
});
} else if (res.cancel) {}
} else if (res.cancel) {
}
},
});
},
@@ -1014,7 +1216,7 @@
} else {
this.emoji.push({
tag: i.emotion,
name: i.emotioni
name: i.emotioni,
});
// console.log(this.emoji,'this.emoji')
this.Pform.comment += i.emotioni;

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>

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 {

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",

File diff suppressed because it is too large Load Diff

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",

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();
},

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.