wangyifang
/
wx-yunyubang-miniprogram
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

up

Browse Source
master
lion 2 years ago
parent 3577f67d0b
commit a7d57d269e
6 changed files with 2320 additions and 2253 deletions
Show Stats Download Patch File Download Diff File

13
packages/packageBuy/pages/shopDetail/shopDetail.vue
Unescape View File

@ -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>
@ -928,6 +928,15 @@
}
}
</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
@ -1545,12 +1554,14 @@
color: #333333;
line-height: 45rpx;
}
}
image {
width: 100%;
margin-top: 30rpx;
}
}
.introBox {

11
packages/packageOrder/pages/myOrder/myOrder.vue
Unescape View File

@ -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">
@ -36,7 +36,8 @@
<!--<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>
<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>
@ -154,6 +155,12 @@
url: "../orderPackageDetail/orderPackageDetail?id=" + id
})
},
goProDetail(id) {
uni.navigateTo({
url: "/packages/packageBuy/pages/shopDetail/shopDetail?id=" + id
})
},
goPay(id) {
var that = this;
weixin.request({

6
packages/packageOrder/pages/orderPackageDetail/orderPackageDetail.vue
Unescape View File

@ -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();

8
pages/active/course.vue
Unescape View File

@ -9,10 +9,10 @@
<u-tr>
<u-th>时间</u-th>
<u-th>
<p style="width:180rpx!important">上课地址</p>
<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>
@ -23,10 +23,10 @@
<p class="time">{{item.time}}</p>
</u-td>
<u-td>
<p class='address'>{{item.address}}</p>
<p class='name'>{{item.theme}}</p>
</u-td>
<u-td>
<p class='name'>{{item.theme}}</p>
<p class='address'>{{item.address}}</p>
</u-td>
<u-td>
<p class='speaker'>{{item.speaker?item.speaker:''}}</p>

88
pages/active/detail.vue
Unescape View File

@ -79,7 +79,8 @@
开始时间：
</view>
<view class="viewlast" v-if="info.start_date">
<view>{{$u.timeFormat(new Date(info.start_date.replace(/-/g,'/')), 'yyyy年mm月dd日')}} {{info.start_time}}</view>
<view>{{$u.timeFormat(new Date(info.start_date.replace(/-/g,'/')), 'yyyy年mm月dd日')}}
{{info.start_time}}</view>
</view>
</view>
<view class='viewchild'>
@ -128,7 +129,9 @@
开始时间：
</view>
<view class="viewlast" v-if="info.apply_start">
<view>{{$u.timeFormat(new Date(info.apply_start.replace(/-/g,'/')), 'yyyy年mm月dd日 hh:MM:ss')}}</view>
<view>
{{$u.timeFormat(new Date(info.apply_start.replace(/-/g,'/')), 'yyyy年mm月dd日 hh:MM:ss')}}
</view>
</view>
</view>
<view class='viewchild'>
@ -137,7 +140,8 @@
截止时间：
</view>
<view class="viewlast" v-if="info.apply_end">
<view>{{$u.timeFormat(new Date(info.apply_end.replace(/-/g,'/')), 'yyyy年mm月dd日 hh:MM:ss')}}</view>
<view>{{$u.timeFormat(new Date(info.apply_end.replace(/-/g,'/')), 'yyyy年mm月dd日 hh:MM:ss')}}
</view>
</view>
</view>
</block>
@ -228,7 +232,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>
@ -244,7 +248,8 @@
开始时间：
</view>
<view class="viewlast" v-if="info.start_date">
<view>{{$u.timeFormat(new Date(info.start_date.replace(/-/g,'/')), 'yyyy年mm月dd日')}} {{info.start_time}}</view>
<view>{{$u.timeFormat(new Date(info.start_date.replace(/-/g,'/')), 'yyyy年mm月dd日')}}
{{info.start_time}}</view>
</view>
</view>
<view class='viewchild'>
@ -293,7 +298,9 @@
开始时间：
</view>
<view class="viewlast" v-if="info.apply_start">
<view>{{$u.timeFormat(new Date(info.apply_start.replace(/-/g,'/')), 'yyyy年mm月dd日 hh:MM:ss')}}</view>
<view>
{{$u.timeFormat(new Date(info.apply_start.replace(/-/g,'/')), 'yyyy年mm月dd日 hh:MM:ss')}}
</view>
</view>
</view>
<view class='viewchild'>
@ -302,7 +309,8 @@
截止时间：
</view>
<view class="viewlast" v-if="info.apply_end">
<view>{{$u.timeFormat(new Date(info.apply_end.replace(/-/g,'/')), 'yyyy年mm月dd日 hh:MM:ss')}}</view>
<view>{{$u.timeFormat(new Date(info.apply_end.replace(/-/g,'/')), 'yyyy年mm月dd日 hh:MM:ss')}}
</view>
</view>
</view>
</block>
@ -413,7 +421,8 @@
</view>
</view>
<view class="subInfo">{{item.start_date}} ~ {{item.end_date}}</view>
<view class="menu"><text class="hui">热</text>{{item.great_services?item.great_services:""}}</view>
<view class="menu"><text class="hui">热</text>{{item.great_services?item.great_services:""}}
</view>
</view>
</view>
</block>
@ -457,8 +466,7 @@
<view class="formCol">
<view>性别<text style="color:red">*</text></view>
<view class="formRight">
<radio-group @change="changeSex"
style="display: flex;align-items: center;">
<radio-group @change="changeSex" style="display: flex;align-items: center;">
<label v-for="(item, index) in ['男','女']" :key="index"
style="display: flex;align-items: center;margin-right: 30rpx;">
<view>
@ -600,7 +608,8 @@
spread_member_id: ''
},
arrHospital: ["请选择建卡医院", "市立医院", "苏大附一院", "苏大附二院","附二浒关院区", "中医院", "第五人民医院", "苏州市第七人民医院", "明基医院", "九龙医院", "娄葑医院",
arrHospital: ["请选择建卡医院", "市立医院", "苏大附一院", "苏大附二院", "附二浒关院区", "中医院", "第五人民医院", "苏州市第七人民医院", "明基医院", "九龙医院",
"娄葑医院",
"吴中人民医院", "甪直人民医院", "相城人民医院", "相城区第二人民医院", "吴江第一人民医院", "吴江第二人民医院", "盛泽医院", "其他"
],
arrRegion: ["请选择区域", "吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
@ -691,7 +700,9 @@
methods: {
// 跳转微信客服
jumpToWeChatCustomerService() {
this.openWeChatCustomerService("https://work.weixin.qq.com/kfid/kfccc6609d51a87324d?enc_scene=ENC5n1b6XBY2paqReUMjwNmTGay8jwTZQuyn17jL8n5xK9T7ZwfJx36T5EHqVbFWTzP8s", "wwe480a61872b54394");
this.openWeChatCustomerService(
"https://work.weixin.qq.com/kfid/kfccc6609d51a87324d?enc_scene=ENC5n1b6XBY2paqReUMjwNmTGay8jwTZQuyn17jL8n5xK9T7ZwfJx36T5EHqVbFWTzP8s",
"wwe480a61872b54394");
},
changeSex(e) {
@ -932,19 +943,29 @@
// 绘制文字（参数：要写的字，x坐标，y坐标）
let packagesFirst = this.info
let active_time = this.info.template=='新'?'上课时间:':'活动时间:'
let active_add = this.info.template=='新'?'上课地点:':'活动地点:'
let active_name = this.info.active_name.length>17?this.info.active_name.substring(0,17):this.info.active_name
let active_name1 = this.info.active_name.length>17?this.info.active_name.substring(17,this.info.active_name.length):''
let active_time = this.info.template == '新' ? '上课时间:' :
'活动时间:'
let active_add = this.info.template == '新' ? '上课地点:' :
'活动地点:'
let active_name = this.info.active_name.length > 17 ? this
.info.active_name.substring(0, 17) : this.info
.active_name
let active_name1 = this.info.active_name.length > 17 ? this
.info.active_name.substring(17, this.info.active_name
.length) : ''
ctx.fillText("" + active_name, 40, (h + 50) * 0.5 + 20);
ctx.fillText("" + active_name1, 40, (h + 50) * 0.5 + 40);
ctx.fillText(active_time + this.info.start_date+' '+this.info.start_time, 40, (h + 50) * 0.5 + 50 + 20);
ctx.fillText(active_time + this.info.start_date + ' ' +
this.info.start_time, 40, (h + 50) * 0.5 + 50 + 20);
// ctx.fillText("结束时间:" + this.info.end_date, 40, (h + 50) * 0.5 + 50 + 40);
let address = this.info.address.length>14?this.info.address.substring(0,14):this.info.address
let address1 = this.info.address.length>14?this.info.address.substring(14,this.info.address.length):''
let address = this.info.address.length > 14 ? this.info
.address.substring(0, 14) : this.info.address
let address1 = this.info.address.length > 14 ? this.info
.address.substring(14, this.info.address.length) : ''
ctx.fillText(active_add + address, 40, (h + 50) * 0.5 + 50 + 40);
ctx.fillText(active_add + address, 40, (h + 50) * 0.5 +
50 + 40);
ctx.fillText(address1, 40, (h + 50) * 0.5 + 50 + 60);
// ctx.fillText(active_add + this.info.apply_end, 40, (h + 50) * 0.5 + 60 + 60);
@ -1101,9 +1122,9 @@
//this.getUserProfile();
}
if (weixin.isNull(this.form.name) || weixin.isNull(this.form.budget_date)
|| weixin.isNull(this.form.phone) || weixin.isNull(this.form.sex)
|| weixin.isNull(this.form.area) || weixin.isNull(this.form.hospital)) {
if (weixin.isNull(this.form.name) || weixin.isNull(this.form.budget_date) ||
weixin.isNull(this.form.phone) || weixin.isNull(this.form.sex) ||
weixin.isNull(this.form.area) || weixin.isNull(this.form.hospital)) {
this.showPop = true;
if (weixin.isNull(this.form.name) || this.form.name == '微信用户') {
this.alert('请输入真实会员姓名')
@ -1214,7 +1235,8 @@
if (that.compareDate(apply_start, nowtime)) {
that.isOrder = false
that.isOrderText = "报名未开始"
}else if(that.compareDate(nowtime,apply_end)||that.compareDate(nowtime,enddate)){
} else if (that.compareDate(nowtime, apply_end) || that.compareDate(nowtime,
enddate)) {
that.isOrder = false
that.isOrderText = "报名截止"
} else {
@ -1279,14 +1301,24 @@
}
}
</script>
<style scoped>
/deep/ .parseHtml video {
width: 80% !important;
min-height: 150px !important;
margin: 20px auto;
height:auto!important
}
</style>
<style lang="scss" scoped>
button::after {
border: none
}
.noscroll {
overflow: hidden;
position: fixed;
}
.userBoxBottomPass {
font-size: 28rpx;
text-align: center;
@ -1401,6 +1433,7 @@
line-height: 72rpx;
color: #fff;
}
.noBtn {
background: linear-gradient(90deg, #ddd 0%, #ddd 100%);
}
@ -1867,17 +1900,21 @@
border-bottom: 0;
}
}
.activeinfo {
margin-top: 10rpx;
padding: 30rpx 30rpx 30rpx 30rpx;
background: #fff;
width: 100%;
box-sizing: border-box;
.viewchild {
display: flex;
justify-content: space-between;
.viewfirst {
width: 30%;
image {
width: 26rpx;
height: 26rpx;
@ -1885,10 +1922,12 @@
margin-right: 12rpx;
}
}
.viewlast {
width: 70%
}
}
u-col {
image {
width: 26rpx;
@ -1898,6 +1937,7 @@
}
}
}
.details {
margin-top: 10rpx;
padding: 0 30rpx 30rpx 30rpx;

113
pages/active/my.vue
Unescape View File

@ -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']?'已参加':"待参加"
}
}
@ -451,6 +458,8 @@
font-size: 28rpx;
font-weight: 400;
color: #666666;
width: 160rpx;
text-align: right;
}
}

Write Preview
Loading…
Cancel
Save