Skip to content

P
project-online-fi
提交 6473ec6f authored 作者: matian's avatar matian
浏览文件
操作

updates

上级 8e42ccd5
显示空白字符变更
内嵌 并排
正在显示 包含 62 行增加 和 47 行删除
src/modules/pay/components/Confirm.vue
浏览文件 @ 6473ec6f
......@@ -237,7 +237,7 @@ const handlePrev = () => {
/>
<div class="radio_tit">支付宝支付</div>
<div
:class="payMode === '12' ? 'radio_check_active' : 'radio_check'"
:class="payMode === 1 ? 'radio_check_active' : 'radio_check'"
@click="checkdChange('12')"
>
<template v-if="currentCheck === '12'">
......@@ -251,7 +251,7 @@ const handlePrev = () => {
/>
<div class="radio_tit">微信支付</div>
<div
:class="payMode === '4' ? 'radio_check_active' : 'radio_check'"
:class="payMode === 2 ? 'radio_check_active' : 'radio_check'"
@click="checkdChange('4')"
>
<template v-if="currentCheck === '4'">
......
src/modules/pay/components/Order.vue
浏览文件 @ 6473ec6f
......@@ -33,7 +33,8 @@ onMounted(() => {
if (props.payMethod === 1) {
params.payment_method = '11'
// 微信扫码支付
} else if (props.payMethod === 2) {
}
if (props.payMethod === 2) {
params.payment_method = '1'
}
createOrder(params).then((res: any) => {
......
src/modules/shop/components/TeacherCard.vue
浏览文件 @ 6473ec6f
......@@ -2,10 +2,11 @@
import { Swiper, SwiperSlide } from 'swiper/vue'
import { Grid, Navigation } from 'swiper'
import { useDevice } from '@/composables/useDevice'
const { mobile } = useDevice()
import 'swiper/css'
import 'swiper/css/grid'
import 'swiper/css/navigation'
const { mobile } = useDevice()
defineProps({
lecturerList: {
type: Array
......@@ -39,7 +40,10 @@ const list = [
{
avatar: 'https://webapp-pub.ezijing.com/project_online/fi/teacher_04.png',
name: '陈秉正',
title_list: ['清华大学经济管理学院金融系教授', '中国保险与风险管理研究中心主任']
title_list: [
'清华大学经济管理学院金融系教授',
'中国保险与风险管理研究中心主任'
]
}
]
</script>
......@@ -57,12 +61,19 @@ const list = [
:spaceBetween="20"
:slidePreview="1"
:modules="[Navigation, Grid]"
@swiper="swiper => (swiper1 = swiper)"
@swiper="(swiper) => (swiper1 = swiper)"
>
<SwiperSlide
v-for="(item, index) in lecturerList"
:key="index"
class="teacher-item"
>
<SwiperSlide v-for="(item, index) in lecturerList" :key="index" class="teacher-item">
<div class="item_top">
<img
:src="item.avatar || 'https://webapp-pub.ezijing.com/project_online/fi/teacher_04.png'"
:src="
item.avatar ||
'https://webapp-pub.ezijing.com/project_online/fi/teacher_04.png'
"
class="top_img"
/>
<div class="top_name">{{ item.name }}</div>
......@@ -84,13 +95,20 @@ const list = [
</div>
</div>
</div>
<div class="teacher_list" v-else >
<div class="teacher_list" v-else>
<div class="con_tit">讲师介绍</div>
<div class="con_teacher">
<div v-for="(item, index) in lecturerList" :key="index" class="teacher-item">
<div
v-for="(item, index) in lecturerList"
:key="index"
class="teacher-item"
>
<div class="item_top">
<img
:src="item.avatar || 'https://webapp-pub.ezijing.com/project_online/fi/teacher_04.png'"
:src="
item.avatar ||
'https://webapp-pub.ezijing.com/project_online/fi/teacher_04.png'
"
class="top_img"
/>
<div class="top_name">{{ item.name }}</div>
......@@ -108,10 +126,8 @@ const list = [
</template>
<style lang="scss" scoped>
.is-pc{
.teacher_list {
.is-pc {
.teacher_list {
.list_con {
width: 396px;
height: 433px;
......@@ -181,8 +197,8 @@ const list = [
}
}
}
}
.my-swiper {
}
.my-swiper {
--swiper-navigation-size: 14px;
--swiper-navigation-color: #333333;
position: relative;
......@@ -191,27 +207,27 @@ const list = [
:deep(.swiper-slide) {
height: 33%;
}
}
.swiper-button-prev {
}
.swiper-button-prev {
left: 5px;
top: -6%;
color: #333333;
}
.swiper-button-next {
}
.swiper-button-next {
right: 5px;
top: -6%;
color: #333333;
}
.swiper-button-next:after {
}
.swiper-button-next:after {
font-size: 12px;
}
.swiper-button-prev:after {
}
.swiper-button-prev:after {
font-size: 12px;
}
}
}
.is-h5{
.teacher_list {
margin-top:0.3rem;
.is-h5 {
.teacher_list {
margin-top: 0.3rem;
.con_tit {
font-size: 0.28rem;
font-weight: 500;
......@@ -219,24 +235,23 @@ const list = [
color: #333333;
}
.con_teacher{
.con_teacher {
overflow-x: auto;
display: flex;
.teacher-item{
.teacher-item {
width: 5.49rem;
background: #F4F8FB;
padding:0.27rem 0.2rem;
background: #f4f8fb;
padding: 0.27rem 0.2rem;
border-radius: 0.16rem;
margin-right:0.2rem;
.item_top{
margin-right: 0.2rem;
.item_top {
display: flex;
align-items: center;
.top_img{
width:0.86rem;
.top_img {
width: 0.86rem;
}
.top_name{
.top_name {
font-size: 0.28rem;
color: #333333;
margin-left: 0.15rem;
......@@ -259,7 +274,6 @@ const list = [
}
}
}
}
}
}
</style>
src/utils/wxpay.ts → src/utils/wxpay.js
浏览文件 @ 6473ec6f
......@@ -14,11 +14,11 @@ import * as api from '@/api/base'
/**
* 获取微信openId
* */
export function getOpenId(code:any, callback:any) {
export function getOpenId(code, callback) {
if (!code) {
return getCode()
}
api.getOpenId({ code, identity: 'ezijing' }).then((resp:any) => {
api.getOpenId({ code, identity: 'ezijing' }).then((resp) => {
const openId = resp.data.openid
openId && localStorage.setItem('openId', openId)
callback && callback(openId)
......@@ -28,13 +28,13 @@ import * as api from '@/api/base'
/**
* 微信JSAPI支付
* */
export function wxJSPay(order:any, callback:any) {
export function wxJSPay(order, callback) {
if (!order.payment_more_info) {
alert('订单创建错误')
return
}
const payInfo = JSON.parse(order.payment_more_info)
WeixinJSBridge.invoke('getBrandWCPayRequest', payInfo, (resp:any) => {
window.WeixinJSBridge.invoke('getBrandWCPayRequest', payInfo, (resp) => {
callback && callback(resp)
})
}
\ No newline at end of file
}1
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论