lion 2 years ago
parent 3577f67d0b
commit a7d57d269e

@ -64,7 +64,7 @@
<view class="detail">
<view class="tit" v-if="false"></view>
<view class="txts">
<u-parse :html="info.content"></u-parse>
<u-parse class='parseHtml' :html="info.content"></u-parse>
</view>
</view>
</view>
@ -927,7 +927,16 @@
}
}
</script>
</script>
<style scoped>
/deep/ .parseHtml video {
width: 80% !important;
min-height: 150px !important;
margin: 20px auto;
height:auto!important;
display: block;
}
</style>
<style lang="scss" scoped>
button::after {
border: none
@ -1544,13 +1553,15 @@
font-size: 28rpx;
color: #333333;
line-height: 45rpx;
}
}
}
image {
width: 100%;
margin-top: 30rpx;
}
}
}
.introBox {

@ -23,7 +23,7 @@
<view class="title">
<view>{{item.order_name || '暂无'}}<!-- <text class="free">免费</text> -->
</view>
<view class="status">{{item.statusName}}</view>
<view class="status">{{item.state_name}}</view>
</view>
<view class="infoList">
<view class="infoCol">
@ -35,8 +35,9 @@
</view>
<!--<view class="infoCol"><view class="address"><image mode="heightFix" src="../../static/icon_dizhi.png"></image>苏州·园区星海街188号苏州万怡大酒店南栋大酒店南栋</view></view>-->
</view>
<view class="btn">
<text @click.stop="goDetail(item.id)"> 查看 </text>
<view class="btn">
<text @click.stop="goDetail(item.id)">详情</text>
<text @click.stop="goProDetail(item.bookable_id)">查看</text>
<text v-if="item.state=='unpaid'" class="pay" @click.stop="goPay(item.id)"> </text>
</view>
</view>
@ -153,7 +154,13 @@
uni.navigateTo({
url: "../orderPackageDetail/orderPackageDetail?id=" + id
})
},
},
goProDetail(id) {
uni.navigateTo({
url: "/packages/packageBuy/pages/shopDetail/shopDetail?id=" + id
})
},
goPay(id) {
var that = this;
weixin.request({

@ -37,7 +37,7 @@
</view>
<view class="hasTwo">
<view class="p_left"><text class="twoWords"></text>:</view>
<view class="p_right"><text class="font_red">{{info.statusName}}</text></view>
<view class="p_right"><text class="font_red">{{info.state_name}}</text></view>
</view>
</view>
<view class="orderBox" v-if="info.member_comment">
@ -68,7 +68,7 @@
<text class="f_black">1</text>
</view>
<view class="flex_between">
<text>{{mod.statusName}}</text>
<text>{{mod.state_name}}</text>
</view>
</view>
</block>
@ -202,7 +202,7 @@
console.log(res)
if (res.status == 1) {
uni.showModal({
title: "已申请退款",
title: "已申请退款,请等待平台确认",
success: (res) => {
if (res.confirm) {
that.getOrder();

@ -7,12 +7,12 @@
<view class='course_table'>
<u-table border-color='#fff'>
<u-tr>
<u-th>时间</u-th>
<u-th>
<p style="width:180rpx!important">上课地址</p>
<u-th>时间</u-th>
<u-th>
<p style="width:180rpx!important">主题</p>
</u-th>
<u-th>
<p style="width:180rpx!important">主题</p>
<p style="width:180rpx!important">上课地址</p>
</u-th>
<u-th>主讲</u-th>
<u-th>报名</u-th>
@ -21,13 +21,13 @@
<u-td>
<p class="day">{{item.day}}</p>
<p class="time">{{item.time}}</p>
</u-td>
<u-td>
<p class='name'>{{item.theme}}</p>
</u-td>
<u-td>
<p class='address'>{{item.address}}</p>
</u-td>
<u-td>
<p class='name'>{{item.theme}}</p>
</u-td>
<u-td>
<p class='speaker'>{{item.speaker?item.speaker:''}}</p>
</u-td>

File diff suppressed because it is too large Load Diff

@ -58,9 +58,9 @@
<!--<view class="infoCol"><view class="address"><image mode="heightFix" src="../../static/icon_dizhi.png"></image>苏州·园区星海街188号苏州万怡大酒店南栋大酒店南栋</view></view>-->
</view>
<view class="btn">
<text v-if="item.statusName=='待参加'" @click.stop="cancelActive(item.apply)"> </text>
<text v-if="item.statusName=='待参加'" @click.stop="showCode(item,item.apply)"> </text>
<text @click.stop="goDetail(item.id)"> 查看 </text>
<!-- <text v-if="item.state=='unpaid'" class="pay" @click.stop="goPay(item.id)"> </text> -->
</view>
</view>
@ -149,18 +149,27 @@
txt: "全部",
is_used:""
},
// {
// state: "unpaid",
// txt: ""
// },
{
state: "ongoing",
txt: "待参加",
is_used:0
is_used:1
}, {
state: "finished",
txt: "已参加",
is_used:1
is_used:3
}],
statusNames:[{
id:0,
name:'申请取消'
},{
id:1,
name:'待参加'
},{
id:2,
name:'已取消'
},{
id:3,
name:'已参加'
}],
user_info: {},
openid: ""
@ -207,6 +216,41 @@
url: "/pages/active/detail?id=" + id
})
},
cancelActive(apply){
var that = this;
var id = apply[0]['id']
uni.showModal({
title:'是否确认取消活动?',
success:(res)=>{
if(res.confirm){
weixin.request({
api: '/api/member/active-member-canceled',
method: 'POST',
data: {
id:id
},
utilSuccess: res => {
uni.showToast({
title: "申请取消成功"
})
that.list = []
that.getOrderList(1)
},
utilFail: res => {
uni.showToast({
title: res
})
}
})
}else if(res.cancel){
console.log("dianjiquxiao")
}
}
})
},
showCode(item,apply){
if(apply.length<1){
return
@ -251,48 +295,6 @@
})
},
goPay(id) {
var that = this;
weixin.request({
api: '/api/member/order-payment',
method: 'GET',
data: {
order_id: id,
openid: this.openid
},
utilSuccess: res => {
weixin.getOpenidInfo(() => {}, true);
setTimeout(function() {
uni.hideLoading();
that.showPop = false;
}, 100);
try {
let payParams = JSON.parse(res.jsApiParameters)
payParams.provider = 'wxpay'
payParams.success = result => {
that.status = "ongoing";
that.loadData(that.currentPage);
}
payParams.fail = result => {
console.log(result);
}
wx.requestPayment(payParams);
} catch (err) {
console.log(err)
} finally {
// finallyCode - try / catch
}
},
utilFail: res => {
uni.showToast({
title: res
})
console.log(res);
}
})
},
getOrderList(page) {
const userInfo = uni.getStorageSync('userInfo')
uni.showLoading({
@ -304,12 +306,12 @@
page_size: 6,
token: userInfo.access_token,
myself:1,
is_used:this.is_used,
state:this.is_used,
}
if (this.status != "") {
data = {
...data,
state: this.status
// state: this.status
};
}
var that = this;
@ -334,7 +336,12 @@
for (var m of r.data.data) {
if(m.apply){
m.statusName = m.apply[0]['used_time']?'已参加':"待参加"
for(var s of that.statusNames){
if(m.apply[0]['state']==s.id){
m.statusName = s.name
}
}
// m.statusName = m.apply[0]['used_time']?'':""
}
}
@ -450,7 +457,9 @@
.status {
font-size: 28rpx;
font-weight: 400;
color: #666666;
color: #666666;
width: 160rpx;
text-align: right;
}
}

Loading…
Cancel
Save