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

Merge branch 'xie'

Browse Source
This commit is contained in:
@fawn-nine
2024-06-26 16:21:55 +08:00
parent 5c50e4bfe6 f507cae272
commit c6598c1dcf
8 changed files with 84 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pages/bookShop/orderList.vue
View File

@@ -396,7 +396,7 @@
<view <view
class="orderstatusbtn orderstatusbtn_success" class="orderstatusbtn orderstatusbtn_success"
v-if="slotProps.row.orderStatus == 0" v-if="slotProps.row.orderStatus == 0"
@click.native.stop="goPay(slotProps.row)" @click.stop="goPay(slotProps.row)"
>继续付款</view >继续付款</view
> >
<view <view
@@ -587,14 +587,14 @@
@close="isShowMore = false" @close="isShowMore = false"
@select="selectClick" @select="selectClick"
></u-action-sheet> ></u-action-sheet>
<music-play :playData="playData"></music-play> <!-- <music-play :playData="playData"></music-play> -->
</view> </view>
</template> </template>
<script> <script>
import $http from "@/config/requestConfig.js"; import $http from "@/config/requestConfig.js";
import emotion from "@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue"; import emotion from "@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue";
import musicPlay from "@/components/music.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 { data } from 'jquery';
import { mapState, mapMutations } from "vuex"; import { mapState, mapMutations } from "vuex";
@@ -719,6 +719,7 @@ export default {
// }); // });
}, },
async onShow() { async onShow() {
uni.hideTabBar();
this.newList = []; this.newList = [];
this.pagination = { this.pagination = {
page: 1, //页码 page: 1, //页码
@@ -998,7 +999,9 @@ export default {
} else { } else {
this.iphonepay(payItem); this.iphonepay(payItem);
} }
} }else if (payItem.paymentMethod == 4){
console.log('天医币二次支付')
}
}, },
// 取消订单 // 取消订单
canceOrder(item) { canceOrder(item) {
@@ -1255,7 +1258,7 @@ export default {
}, },
}, },
components: { components: {
musicPlay, // musicPlay,
emotion, emotion,
}, },
}; };

4
pages/course/courseDetail.vue
View File

@@ -692,7 +692,7 @@ export default {
scene: "WXSceneSession", scene: "WXSceneSession",
type: 0, type: 0,
href: this.$apkUrl, href: this.$apkUrl,
title: "吴门医述", title: `${this.course.title}这门课程讲的不错，快来围观吧-吴门医述app`,
summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！", summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
imageUrl: "static/icon/home_icon_logo.png", imageUrl: "static/icon/home_icon_logo.png",
success: function (res) { success: function (res) {
@@ -709,7 +709,7 @@ export default {
scene: "WXSceneTimeline", scene: "WXSceneTimeline",
type: 0, type: 0,
href: this.$apkUrl, href: this.$apkUrl,
title: "吴门医述", title: `${this.course.title}这门课程讲的不错，快来围观吧-吴门医述app`,
summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！", summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
imageUrl: "static/icon/home_icon_logo.png", imageUrl: "static/icon/home_icon_logo.png",
success: function (res) { success: function (res) {

4
pages/course/coursePrice.vue
View File

@@ -28,7 +28,7 @@
<text>VIP畅学权益生效中</text> <text>VIP畅学权益生效中</text>
</view> </view>
<view :class="['text','courseItem','flexbox']"><u-icon name="pushpin" color="#2979ff" <view :class="['text','courseItem','flexbox']"><u-icon name="pushpin" color="#2979ff"
size="24"></u-icon><text>{{item1.title}}</text> size="24"></u-icon><text style="font-size: 32rpx;">{{item1.title}}</text>
</view> </view>
<template v-if="item1.courseCatalogueEntityList && item1.courseCatalogueEntityList.length > 0"> <template v-if="item1.courseCatalogueEntityList && item1.courseCatalogueEntityList.length > 0">
@@ -510,7 +510,7 @@
display: block; display: block;
text-align: center; text-align: center;
margin-bottom: 10rpx; margin-bottom: 10rpx;
color: #694bc6; // color: #694bc6;
} }
} }

9
pages/course/index.vue
View File

@@ -280,10 +280,17 @@
this.status = 3 // 暂无数据 this.status = 3 // 暂无数据
} }
console.log('status', this.status) console.log('status', this.status)
this.flag = true
} }
this.flag = true
}).catch(e => { }).catch(e => {
this.flag = true
console.log(e, '数据报错') console.log(e, '数据报错')
this.status = 3
uni.showToast({
title:`获取数据失败`,
icon:'error'
})
}); });
}, },
// 跳转 // 跳转

22
pages/course/myCourse.vue
View File

@@ -565,9 +565,10 @@
this.LearningCourseList.status = 2 this.LearningCourseList.status = 2
// } // }
} else { } else {
this.LearningCourseList.list = []
this.LearningCourseList.status = 3 // 暂无数据 this.LearningCourseList.status = 3 // 暂无数据
} }
console.log('status', this.LearningCourseList.status) // console.log('status我刷新了', this.LearningCourseList)
} }
// this.LearningCourseList.flag = false // this.LearningCourseList.flag = false
}).catch(e => { }).catch(e => {
@@ -670,7 +671,7 @@
}) })
}, },
delCollection(val, index){ delCollection(val, index){
// console.log(val,'val'); console.log('val++++++++', val.id);
$http.request({ $http.request({
url: "medical/course/delUserCourseStudying", url: "medical/course/delUserCourseStudying",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
@@ -690,13 +691,18 @@
}) })
if(this.curTagId == 0){ if(this.curTagId == 0){
console.log(this.MyCourseList.list[index],'this.MyCourseList[index]') console.log(this.MyCourseList.list[index],'this.MyCourseList[index]')
this.MyCourseList.list[index].isStudying = 0 this.MyCourseList.list[index].isStudying = 0
this.getLearningCourseList() // 刷新收藏列表 setTimeout(() => {
this.getLearningCourseList() // 刷新收藏列表
},500)
}else if(this.curTagId == 1){ }else if(this.curTagId == 1){
this.LearningCourseList.list.splice(index,1) this.LearningCourseList.list.splice(index,1)
this.MyCourseList.page = 1
this.MyCourseList.list = [] setTimeout(() => {
this.getMyCourseList() this.MyCourseList.page = 1
this.MyCourseList.list = []
this.getMyCourseList()
},500)
} }
} }

12
pages/course/tryListen.vue
View File

@@ -107,11 +107,7 @@
url: `${url}?id=${thatId}&title=${title}` url: `${url}?id=${thatId}&title=${title}`
}); });
}, },
getData() { getData() {
// if(!this.flag){
// console.log('正在执行，未完成')
// return
// }
this.status = 1 this.status = 1
this.flag = false this.flag = false
$http.request({ $http.request({
@@ -147,7 +143,13 @@
} }
this.flag = true this.flag = true
}).catch(e => { }).catch(e => {
this.flag = true
this.status = 3
console.log(e,'数据报错') console.log(e,'数据报错')
uni.showToast({
title:`获取数据失败`,
icon:'error'
})
}); });
} }
}, },

56
pages/mine/vip/index.vue
View File

@@ -43,7 +43,7 @@
></view> ></view>
<view class="qunyi_box"> <view class="qunyi_box">
<view style="height: auto"> <view style="height: auto">
<view <view class="item"
v-for="(item, index1) in v.quanyi" v-for="(item, index1) in v.quanyi"
:style="item.style" :style="item.style"
v-html="item.name" v-html="item.name"
@@ -92,6 +92,7 @@
</view> --> </view> -->
</view> </view>
</u-popup> </u-popup>
<z-navigation></z-navigation>
</view> </view>
</template> </template>
@@ -110,9 +111,11 @@ export default {
selectVipData: {}, selectVipData: {},
orderModalShow: false, orderModalShow: false,
superQuanyi: [ superQuanyi: [
{ name: "众妙之门视频", style: { { name: "众妙之门视频",
color: "#2D38F4", // style: {
},}, // color: "#2D38F4",
// },
},
{ {
name: "吴门医述视频", name: "吴门医述视频",
@@ -120,27 +123,29 @@ export default {
{ name: "专属视频视听" }, { name: "专属视频视听" },
{ {
name: "读书相关权益", name: "读书相关权益",
style: { // style: {
color: "#2D38F4", // color: "#2D38F4",
}, // },
}, },
{ name: "活动报名折扣价<text style='color:red'>(更优惠)</text>" }, { name: "活动报名折扣价<text style='color:red'>(更优惠)</text>" },
], ],
sociologyQuanyi: [ sociologyQuanyi: [
// {
{ // name: "-",
name: "-", // style: {
style: { // color: "#b0b0b0",
color: "#b0b0b0", // },
}, // },
}, { name: "吴门医述视频" }, { name: "吴门医述视频" },
{ name: "专属视频视听" }, { name: "专属视频视听" },
{
name: "-", // {
style: { // name: "-",
color: "#b0b0b0", // style: {
}, // color: "#b0b0b0",
}, // },
// },
{ name: "活动报名折扣价" }, { name: "活动报名折扣价" },
], ],
@@ -276,7 +281,8 @@ export default {
"linear-gradient(to right, #3F7FC9 0%,#D3EEFC 100%) ", "linear-gradient(to right, #3F7FC9 0%,#D3EEFC 100%) ",
// titleBackground: // titleBackground:
// "linear-gradient(130deg, rgb(153, 202, 192) 0%, rgb(192, 223, 207) 50%)", // "linear-gradient(130deg, rgb(153, 202, 192) 0%, rgb(192, 223, 207) 50%)",
color: "linear-gradient(130deg,rgb(45, 56, 244) 0%, #72AD92 100%)", list: res.list[i], color: "linear-gradient(130deg,rgb(45, 56, 244) 0%, #72AD92 100%)",
list: res.list[i],
quanyi: this.superQuanyi, quanyi: this.superQuanyi,
}); });
} else if (i == "sociology" || i == "sociology_hd") { } else if (i == "sociology" || i == "sociology_hd") {
@@ -859,7 +865,7 @@ export default {
.flash_sale_content_item { .flash_sale_content_item {
width: auto; width: auto;
min-width: 47%; min-width: 47%;
min-height: 48%; min-height: 56%;
margin: 10rpx !important; margin: 10rpx !important;
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
@@ -867,7 +873,7 @@ export default {
.vip_content { .vip_content {
width: 100%; width: 100%;
height: calc(100% - 80rpx); height: calc(100% - 80rpx);
padding: 20rpx; // padding: 20rpx;
padding-top: 0; padding-top: 0;
// display: flex; // display: flex;
// align-items: center; // align-items: center;
@@ -953,6 +959,8 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.item{line-height: 60rpx; text-align: center; padding: 0 10rpx; border: 1px solid #64bec5; border-radius: 50rpx; margin-bottom: 20rpx;}
} }
.popup_box { .popup_box {
max-height: 95vh; max-height: 95vh;

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

@@ -90,9 +90,8 @@
<text <text
class="fdButtonBox aui-text-danger fdButtonBoxRed" class="fdButtonBox aui-text-danger fdButtonBoxRed"
style="float: right" style="float: right"
@click=" @click="onPageJump('/pages/mine/wallet/recharge/index?source=order')"
onPageJump('/pages/mine/wallet/recharge/index?source=order')
"
>立即充值</text >立即充值</text
> >
</view> </view>
@@ -407,6 +406,7 @@ export default {
}, },
onPageJump(url) { onPageJump(url) {
console.log(url, "url"); console.log(url, "url");
uni.navigateTo({ uni.navigateTo({
url: url, url: url,
}); });
@@ -451,6 +451,7 @@ export default {
console.log("res at line 374:", res); console.log("res at line 374:", res);
if (res.code == 0) { if (res.code == 0) {
this.initData = res.data; this.initData = res.data;
// this.$emit('user')
} }
this.$forceUpdate(); this.$forceUpdate();
@@ -557,7 +558,13 @@ export default {
// quantity: this.cartList[i].productAmount, // quantity: this.cartList[i].productAmount,
// }); // });
// } // }
if(this.payType == 4 && this.initData.user.peanutCoin < this.dataInfo.lastFee){
uni.showToast({
title:'天医币余额不足',
icon:'none'
})
return
}
let data = { let data = {
paymentMethod: this.payType, //1微信2支付宝3苹果支付4虚拟币 paymentMethod: this.payType, //1微信2支付宝3苹果支付4虚拟币
orderMoney: this.dataInfo.lastFee, //订单金额 orderMoney: this.dataInfo.lastFee, //订单金额