From d46a4e6b666332e87bc5d67831ab6721d33b1db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Wed, 11 Dec 2024 09:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=9D=E8=80=83=E9=A2=98=20=E5=A4=9A?=
=?UTF-8?q?=E6=AC=A1=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 389 +++++++++---------
manifest.json | 4 +-
pages/bookShop/orderLCont.vue | 245 +++++++----
pages/bookShop/orderList.vue | 8 +-
.../commonComponents/video/index.vue | 2 +-
pages/course/chapterDetailAndorid.vue | 18 +-
6 files changed, 382 insertions(+), 284 deletions(-)
diff --git a/App.vue b/App.vue
index 21ce195..0948067 100644
--- a/App.vue
+++ b/App.vue
@@ -1,220 +1,217 @@
\ No newline at end of file
+/* #endif */
+
diff --git a/manifest.json b/manifest.json
index add9dfc..599fb67 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,8 +10,8 @@
"sizes": "分辨率，192x192",
"src": "图片路径"
}],
- "versionName": "1.0.36",
- "versionCode": 1036,
+ "versionName": "1.0.39",
+ "versionCode": 1039,
"app-plus": {
"nvueCompiler": "weex",
"compatible": {
diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue
index bdab518..de50514 100644
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -1,5 +1,8 @@
-
+
@@ -166,23 +169,23 @@
-
-
-
-
- {{ orderContet.remark }}
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ orderContet.remark }}
+
+
+
+
+
+
+
+
商品总价 :
- ￥{{ orderContet.orderMoney }}
+
+ ￥ {{ orderContet.bookBuyConfigEntity.realMoney }}
+ ￥ {{ orderContet.orderMoney }}
运费 :
- ￥{{ orderContet.shippingMoney }}
+ ￥{{ orderContet.shippingMoney }}
+
+
+ 优惠券 :
+
+ - ￥{{ orderContet.couponAmount }}
-
- 优惠券 :
-
- - ￥{{ orderContet.couponAmount }}
-
积分 :
@@ -260,6 +270,9 @@
实付款 :
+ ￥ {{ orderContet.bookBuyConfigEntity.realMoney }}
￥{{ orderContet.realMoney }}
@@ -309,11 +322,14 @@
发货时间 :
{{orderContet.shippingTime}}
-->
-
-
- 订单有问题？去申诉
-
+
+ 订单有问题？去申诉
+
@@ -331,8 +347,10 @@
>
合计:
-
- ￥{{ orderContet.realMoney }}
+
+ ￥ {{ orderContet.bookBuyConfigEntity.realMoney }}
+
+ ￥{{ orderContet.realMoney }}
@@ -481,6 +499,68 @@ import { mapState } from "vuex";
export default {
data() {
return {
+ A: {
+ orderId: 15316,
+ orderSn: "20241209141541253186600376645070",
+ userId: 13487,
+ userName: null,
+ statusNum: null,
+ shippingUser: null,
+ userPhone: "18834844847",
+ province: null,
+ city: null,
+ district: null,
+ address: null,
+ come: 2,
+ paymentMethod: "3",
+ orderMoney: 39,
+ districtMoney: 0,
+ realMoney: 39,
+ shippingMoney: null,
+ shippingCompName: null,
+ shippingSn: null,
+ jfDeduction: 0,
+ createTime: "2024-12-09 14:15:41",
+ shippingTime: null,
+ orderStatus: "0",
+ successTime: null,
+ couponId: null,
+ couponName: null,
+ delFlag: 0,
+ products: null,
+ productList: null,
+ buyType: null,
+ orderType: "point",
+ expNo: null,
+ isSend: null,
+ vipBuyConfigId: 0,
+ addressId: null,
+ remark: null,
+ orderCode: null,
+ paymentDate: null,
+ productId: "21",
+ recordId: null,
+ timestamp: null,
+ user: null,
+ expressList: null,
+ addressModified: 0,
+ consigneeVo: null,
+ appName: null,
+ bookBuyConfigEntity: {
+ priceTypeId: 21,
+ type: "point",
+ qudao: "IOS",
+ realMoney: "45",
+ money: "39",
+ givejf: "0",
+ month: null,
+ description: "",
+ effective: 0,
+ startTime: null,
+ endTime: null,
+ },
+ vipBuyConfigEntity: null,
+ },
iconList: [
{
text: "联系客服",
@@ -562,11 +642,11 @@ export default {
},
methods: {
- gotoWorkOrder(){
- uni.navigateTo({
- url:`/pages/user/workOrder?name=order`
- })
- },
+ gotoWorkOrder() {
+ uni.navigateTo({
+ url: `/pages/user/workOrder?name=order`,
+ });
+ },
async goBuyJie(data) {
console.log("index at line 532:", data);
if (data.text == "继续付款") {
@@ -911,28 +991,29 @@ export default {
orderTabCLi(e) {
this.orderListTab = e;
},
- async getCouponDetail(id){
- await this.$http
- .request({
- url: "common/coupon/getCouponHistoryInfo",
- method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
- data: {
- id
- },
- header: {
- //默认 无 说明：请求头
- "Content-Type": "application/json",
- },
- })
- .then(async (res) => {
- if(res.code != 0) return this.$commonJS.showToast(res.errMsg);
- this.orderContet.couponAmount = res.couponHistory.couponEntity.couponAmount
-
- }).catch(e => {
- console.log(e);
- this.$commonJS.showToast(e.errMsg);
- })
- },
+ async getCouponDetail(id) {
+ await this.$http
+ .request({
+ url: "common/coupon/getCouponHistoryInfo",
+ method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+ data: {
+ id,
+ },
+ header: {
+ //默认 无 说明：请求头
+ "Content-Type": "application/json",
+ },
+ })
+ .then(async (res) => {
+ if (res.code != 0) return this.$commonJS.showToast(res.errMsg);
+ this.orderContet.couponAmount =
+ res.couponHistory.couponEntity.couponAmount;
+ })
+ .catch((e) => {
+ console.log(e);
+ this.$commonJS.showToast(e.errMsg);
+ });
+ },
// 获取订单详情
async getOrderList() {
console.log("this.orderType", this.orderType);
@@ -955,10 +1036,10 @@ export default {
this.orderContet = res.data.buyOrder;
this.goodsList = res.data.productInfo;
this.consigneeShow = true;
- // 存在优惠券信息，就查询优惠券集体金额
- if(this.orderContet.couponId && this.orderContet.couponId != null){
- await this.getCouponDetail(this.orderContet.couponId)
- }
+ // 存在优惠券信息，就查询优惠券集体金额
+ if (this.orderContet.couponId && this.orderContet.couponId != null) {
+ await this.getCouponDetail(this.orderContet.couponId);
+ }
if (
this.orderContet.orderStatus == 2 &&
this.sheetList.length > 0 &&
@@ -980,7 +1061,10 @@ export default {
color: "#fff",
});
}
- if (this.orderContet.orderStatus == 0 && this.orderContet.paymentMethod != 3) {
+ if (
+ this.orderContet.orderStatus == 0 &&
+ this.orderContet.paymentMethod != 3
+ ) {
this.customButton.push({
width: "160rpx",
text: "继续付款",
@@ -1128,10 +1212,10 @@ export default {
// 苹果充值
console.log("苹果二次支付");
uni.showModal({
- content:'apple内购订单不支持继续支付，请重新发起支付申请并完成支付',
- confirmText:'好的',
- showCancel:false
- })
+ content: "apple内购订单不支持继续支付，请重新发起支付申请并完成支付",
+ confirmText: "好的",
+ showCancel: false,
+ });
}
},
@@ -1140,19 +1224,18 @@ export default {
console.log("data at line 1277:订单详情参数", data);
if (data.delFlag == -1) {
this.$commonJS.showToast("商品已下架");
- }else if(data.goodsType == '05'){
- if(data.courseIds && data.courseIds.length > 0){
- uni.navigateTo({
- url: `/pages/course/courseDetail?id=${data.courseIds[0].courseId}`,
- });
- }else{
- uni.showToast({
- title: "课程数据出错",
- icon: "none"
- });
- }
-
- } else {
+ } else if (data.goodsType == "05") {
+ if (data.courseIds && data.courseIds.length > 0) {
+ uni.navigateTo({
+ url: `/pages/course/courseDetail?id=${data.courseIds[0].courseId}`,
+ });
+ } else {
+ uni.showToast({
+ title: "课程数据出错",
+ icon: "none",
+ });
+ }
+ } else {
uni.navigateTo({
// url: '../bookShop/commodityDetail?id=' + item.id
url: `/pages/goods/index/index?navTitle=''&title=''&id=${id}`,
diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index 48c18a9..49f8a5a 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -219,12 +219,18 @@
font-weight: 700;
">
￥
+
+ {{ slotProps.row.bookBuyConfigEntity.realMoney }}
+
+
{{
slotProps.row.realMoney ||
slotProps.row.realMoney == 0
? slotProps.row.realMoney
: ""
- }}
+ }}
+
+
diff --git a/pages/component/commonComponents/video/index.vue b/pages/component/commonComponents/video/index.vue
index e8ab36c..2c81919 100644
--- a/pages/component/commonComponents/video/index.vue
+++ b/pages/component/commonComponents/video/index.vue
@@ -281,7 +281,7 @@
},
// 存储本地播放时间
recordTime(data) {
- console.log('recordTime', data.time);
+ // console.log('recordTime', data.time);
this.currentTime = data.time;
var list = [];
diff --git a/pages/course/chapterDetailAndorid.vue b/pages/course/chapterDetailAndorid.vue
index b24acfa..466312e 100644
--- a/pages/course/chapterDetailAndorid.vue
+++ b/pages/course/chapterDetailAndorid.vue
@@ -150,7 +150,11 @@
-
+
+
+
+
+
@@ -187,6 +191,7 @@
},
data() {
return {
+ isClick:true,
classList:[], // 进行中的小班
isInClass:false, // 是否加入了班级
showEditBlank: false,
@@ -349,6 +354,7 @@
uni.stopPullDownRefresh();
},
onShow() {
+ this.isClick=true;
// #endif
this.getClassList()
},
@@ -382,7 +388,8 @@
// console.log('this.answerForm++++', this.answerForm);
}
// 赋值给编辑器
- this.onEditorReady()
+ this.onEditorReady()
+ this.isClick=true
this.showEditBlank = true
},
gotoClass(item){
@@ -499,7 +506,9 @@
}
this.answerForm.display = e.detail.value
},
- async onSubmit() {
+ async onSubmit() { if(!this.isClick){
+ return false
+ }
debounce(async () => {
let data = await this.getHtml();
var _data = data.html.replace(/<.*?>/g, "")
@@ -535,6 +544,7 @@
}
console.log('提交的data', data1);
+ this.isClick=false;
$http.request({
url: _url,
method: "POST",
@@ -550,6 +560,7 @@
})
this.fileList1 = []
setTimeout(() => {
+ this.isClick=true;
this.getMyQuestAnswer(this.curriculumData.id)
this.closePup()
// this.pPage = 0
@@ -558,6 +569,7 @@
// this.getZuoyeList()
}, 200)
}).catch(e => {
+ this.isClick=true;
uni.showToast({
title: '操作失败',
icon: 'error'