1.首页搜索UI问题
2.新增分类中搜索之后移到全部的分类上 3.修复系统消息消息重复的问题 4.优化部分页面标题加粗 5.信阳五院官网修改
This commit is contained in:
parent
6711ff4abe
commit
a47a1ff4fd
@ -132,8 +132,8 @@
|
||||
<text>是否同意退款</text>
|
||||
<text style="color: #FF4810;">{{ '否' }}</text>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
|
||||
<text>驳回原因</text>
|
||||
<view class="flex w-100 space-between hui" style="margin-top: 40rpx;">
|
||||
<text style="width: 400rpx;">驳回原因</text>
|
||||
<text style="color: #323232;">{{ info.reason }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
@ -1712,7 +1712,7 @@
|
||||
position: absolute;
|
||||
bottom: 173rpx;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
justify-content: center;
|
||||
align-items: self-start;
|
||||
width: 750rpx;
|
||||
height: 247rpx;
|
||||
@ -1722,6 +1722,7 @@
|
||||
font-family: PingFang SC Regular, PingFang SC Regular;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
gap: 180rpx;
|
||||
|
||||
.save {
|
||||
margin-top: 60rpx;
|
||||
|
@ -177,9 +177,12 @@
|
||||
<image src="@/static/detail/fenxiangsys.png" style="width: 100%;height: 100%;" mode="widthFix">
|
||||
</image>
|
||||
</view>
|
||||
<view v-if="detail.status != -3" class="footer-right" @click="cancelsOpen">
|
||||
<view v-if="detail.status != -3 && detail.status != -1" class="footer-right" @click="cancelsOpen">
|
||||
取消活动
|
||||
</view>
|
||||
<view v-if="detail.status == -1" class="footer-right-no">
|
||||
活动已取消
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
@ -193,7 +196,7 @@
|
||||
<view class="pop-header flex align-items flex-column flex-start">
|
||||
<span class="name white-space">是否确认取消活动</span>
|
||||
<span class="price">
|
||||
取消活动后,如果再次举办活动需重新设置并提交信息审核
|
||||
取消活动后,若再次举办活动,需重新设置活动内容,并提交平台审核
|
||||
</span>
|
||||
<!-- <image src="../../static/center/buy.png" mode="" style="width: 168rpx; height: 48rpx;">
|
||||
</image> -->
|
||||
@ -1673,7 +1676,7 @@
|
||||
position: absolute;
|
||||
bottom: 173rpx;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
justify-content: center;
|
||||
align-items: self-start;
|
||||
width: 750rpx;
|
||||
height: 247rpx;
|
||||
@ -1683,6 +1686,7 @@
|
||||
font-family: PingFang SC Regular, PingFang SC Regular;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
gap: 180rpx;
|
||||
|
||||
.save {
|
||||
margin-top: 60rpx;
|
||||
@ -1692,6 +1696,19 @@
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
.footer-right-no {
|
||||
margin: 0 auto;
|
||||
width: 100%;
|
||||
height: 90rpx;
|
||||
background: #E1E1E1;
|
||||
text-align: center;
|
||||
line-height: 90rpx;
|
||||
border-radius: 200rpx;
|
||||
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
|
||||
font-weight: 400;
|
||||
font-size: 48rpx;
|
||||
color: #999999;
|
||||
}
|
||||
</style>
|
||||
<style scoped>
|
||||
.no-border-button {
|
||||
|
@ -46,6 +46,10 @@
|
||||
<view>
|
||||
<text v-if="v.status==3" style="font-size: 28rpx;color: #999999;">未核销</text>
|
||||
<text v-if="v.status==6" style="font-size: 28rpx;color: #FF4810;">已核销</text>
|
||||
|
||||
<text v-if="v.status==-3" style="font-size: 28rpx;color: #FF4810;">已取消</text>
|
||||
<text v-if="v.server_status==3" style="font-size: 28rpx;color: #FF4810;">售后中</text>
|
||||
<text v-if="v.auth_status==1" style="font-size: 28rpx;color: #FF4810;">已退款</text>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="i<item.ordercode.length-1"
|
||||
@ -81,9 +85,9 @@
|
||||
uni.$u.http.get('/api/school.newworker.activity.order/order_list', {
|
||||
params: {
|
||||
activity_id: that.id,
|
||||
status:'2,3,9',
|
||||
page: 1,
|
||||
limit: 1000,
|
||||
status:'0,2,3,4,7,9'
|
||||
},
|
||||
}).then(res => {
|
||||
if (res.code == 1) {
|
||||
|
@ -17,9 +17,9 @@
|
||||
<span style="color:#9C9C9C;margin-left: 10rpx;">{{ detailAny.user.nickname }}</span>
|
||||
<text style="color:#9C9C9C;margin-left: 20rpx;">/</text>
|
||||
<span
|
||||
style="color:#0CA013;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
|
||||
<span style="color:#0CA013;margin-left: 20rpx;"
|
||||
v-for="items_t in detailAny.classes_cate">#{{ items_t }}</span>
|
||||
style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
|
||||
<!-- <span style="color:#0CA013;margin-left: 20rpx;"
|
||||
v-for="items_t in detailAny.classes_cate">#{{ items_t }}</span> -->
|
||||
</view>
|
||||
<view class="flex align-items" style="margin-top: 20rpx;">
|
||||
¥{{detailAny.totalprice}}
|
||||
@ -37,8 +37,8 @@
|
||||
<span class="first-image flex align-items space-between" style="width: 100%;"
|
||||
@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
|
||||
<view>
|
||||
<image src="/static/center/address.png" mode="" class="icon-size"></image>
|
||||
<span>{{detail.address}}{{detail.address_detail}}</span>
|
||||
<image src="/static/center/address.png" mode="" class="icon-size" style="vertical-align: middle;"></image>
|
||||
<span style="vertical-align: middle;">{{detail.address}}{{detail.address_detail}}</span>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/detail/daohang.png" class="icon-size"
|
||||
@ -743,9 +743,10 @@
|
||||
success(res) {
|
||||
if (res.errMsg == "requestPayment:ok") {
|
||||
that.order_no = ''
|
||||
uni.redirectTo({
|
||||
url: "/packageA/my/exercise?status=" + 3
|
||||
})
|
||||
// uni.redirectTo({
|
||||
// url: "/packageA/my/exercise?status=" +'2,3'
|
||||
// })
|
||||
uni.navigateBack();
|
||||
console.log('支付成功', res)
|
||||
} else {
|
||||
that.uloadingShow = false
|
||||
|
@ -117,9 +117,9 @@
|
||||
:safeAreaInsetBottom="false" :closeable="false">
|
||||
<view class="popupBox flex justify-start align-items flex-column">
|
||||
<view class="pop-header flex align-items flex-column flex-start">
|
||||
<span class="name white-space">是否取消参与活动</span>
|
||||
<span class="name white-space">请确认是否取消报名</span>
|
||||
<span class="price">
|
||||
多次取消参与,会限制账号权限请谨慎操作
|
||||
若频繁取消,可能会影响账号部分功能使用。建议您确认行程后再操作。
|
||||
</span>
|
||||
</view>
|
||||
<view
|
||||
|
@ -76,34 +76,34 @@
|
||||
<span>付款方式</span>
|
||||
<span style="color: #323232;">{{detailAny.pay_type == 'wechat' ? '微信支付' : '余额'}}</span>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
|
||||
<view v-if="detailAny.paytime!=null " class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
|
||||
<span>付款时间</span>
|
||||
<span style="color: #323232;">{{ formattime(detailAny.paytime)}}</span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="third flex flex-column" style="justify-content: flex-start;">
|
||||
<view v-if="detailAny.server_status!=0" class="third flex flex-column" style="justify-content: flex-start;padding-bottom: 30rpx;">
|
||||
|
||||
<view class="third-center" v-if="detailAny.auth_reason != '' && detailAny.auth_reason != null">
|
||||
<view class="flex w-100 space-between hui align-items">
|
||||
<text>退款原因</text>
|
||||
<text style="width: 400rpx;">退款原因</text>
|
||||
<text style="color: #323232;">{{ detailAny.auth_reason }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="third-center" v-if="detailAny.auth_status == 2">
|
||||
<view class="third-center" v-if="detailAny.auth_status == 2" style="padding: 0rpx 30rpx;">
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
|
||||
<text>是否同意退款</text>
|
||||
<text style="color: #FF4810;">否</text>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
|
||||
<text>驳回原因</text>
|
||||
<view class="flex w-100 space-between hui" style="margin-top: 40rpx;">
|
||||
<text style="width: 400rpx;">驳回原因</text>
|
||||
<text style="color: #323232;">{{ detailAny.reason }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="third-center" v-if="detailAny.auth_status == 1">
|
||||
<view class="third-center" v-if="detailAny.auth_status == 1" style="padding: 0rpx 30rpx;">
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
|
||||
<text>是否同意退款</text>
|
||||
<text style="color: #323232;">是</text>
|
||||
|
@ -59,7 +59,7 @@
|
||||
<span style="margin-right:20rpx;">{{ dateWeeks(item.start_time) }}</span><span
|
||||
style="width: 1rpx;height: 22rpx;background: #323232;"></span>
|
||||
<span class="white-space"
|
||||
style="margin-left: 20rpx;width: 260rpx;">{{ item.address_detail }}</span>
|
||||
style="margin-left: 20rpx;width: 260rpx;">{{ item.address }}{{ item.address_detail }}</span>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
@ -97,6 +97,7 @@
|
||||
<span style="margin:0 20rpx;">{{ dateWeeks(item.start_time) }}</span><span
|
||||
style="width: 1rpx;height: 22rpx;background: #323232;"></span>
|
||||
<span class="white-space" style="margin-left: 20rpx;width: 260rpx;">{{
|
||||
item.address }}{{
|
||||
item.address_detail }}</span>
|
||||
</view>
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
</span>
|
||||
</view>
|
||||
<view style="padding:60rpx 30rpx 30rpx 30rpx;">
|
||||
<view class='text_fl'>
|
||||
<!-- <view class='text_fl'>
|
||||
<view class="text_lab">
|
||||
类型
|
||||
</view>
|
||||
@ -23,8 +23,7 @@
|
||||
placeholder-class="plasty" />
|
||||
<u-icon name="arrow-right" color="#323232"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
<view class="line-row"></view>
|
||||
</view> -->
|
||||
<view class='text_fl' v-if="formData.type == '机构'">
|
||||
<view class="text_lab">
|
||||
机构名称
|
||||
@ -37,20 +36,20 @@
|
||||
<view class="line-row" v-if="formData.type == '机构'"></view>
|
||||
<view class='text_fl'>
|
||||
<view class="text_lab">
|
||||
联系人
|
||||
机构联系人
|
||||
</view>
|
||||
<view>
|
||||
<input type="text" placeholder="请输入姓名" class="input" v-model="formData.realname"
|
||||
<input type="text" placeholder="请输入机构姓名" class="input" v-model="formData.realname"
|
||||
placeholder-class="plasty" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="line-row"></view>
|
||||
<view class='text_fl'>
|
||||
<view class="text_lab">
|
||||
联系电话
|
||||
机构联系电话
|
||||
</view>
|
||||
<view>
|
||||
<input type="text" placeholder="请输入联系电话" class="input" v-model="formData.mobile"
|
||||
<input type="text" placeholder="请输入机构联系电话" class="input" v-model="formData.mobile"
|
||||
placeholder-class="plasty" />
|
||||
</view>
|
||||
</view>
|
||||
@ -66,7 +65,15 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="line-row"></view>
|
||||
|
||||
<view class='text_fl'>
|
||||
<view class="text_lab">
|
||||
详细地址
|
||||
</view>
|
||||
<view>
|
||||
<input type="text" placeholder="请输入详细地址" class="input" v-model="formData.desc"
|
||||
placeholder-class="plasty" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="btn_1" @click="submitaply()">立即申请</view>
|
||||
</view>
|
||||
@ -96,7 +103,8 @@
|
||||
mobile: '',
|
||||
realname: '',
|
||||
address: '',
|
||||
type: '',
|
||||
type: '机构',
|
||||
desc:'',
|
||||
}
|
||||
};
|
||||
},
|
||||
@ -168,6 +176,16 @@
|
||||
});
|
||||
return;
|
||||
}
|
||||
// 手机号正则
|
||||
const phoneReg = /^1[3-9]\d{9}$/;
|
||||
if (!phoneReg.test(this.formData.mobile)) {
|
||||
uni.showToast({
|
||||
title: '请输入正确的手机号!',
|
||||
icon: "none",
|
||||
})
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.formData.name == '' && this.formData.type == '机构') {
|
||||
uni.showToast({
|
||||
title: '请填写机构名称!',
|
||||
@ -184,12 +202,20 @@
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (this.formData.desc == '') {
|
||||
uni.showToast({
|
||||
title: '请填写详细地址!',
|
||||
icon: "none",
|
||||
duration: 2000,
|
||||
});
|
||||
return;
|
||||
}
|
||||
let formparms = {
|
||||
type: this.formData.type == '个人' ? '1' : '2',
|
||||
name: this.formData.name,
|
||||
realname: this.formData.realname,
|
||||
mobile: this.formData.mobile,
|
||||
address: this.formData.address
|
||||
address: this.formData.address+this.formData.desc
|
||||
};
|
||||
uni.$u.http
|
||||
.post("/api/school/shop/apply", formparms)
|
||||
@ -197,7 +223,7 @@
|
||||
console.log(res);
|
||||
if (res.code == 1) {
|
||||
uni.showToast({
|
||||
title: '提交成功!',
|
||||
title: '提交成功,等待审核!',
|
||||
icon: "none",
|
||||
duration: 2000,
|
||||
});
|
||||
@ -207,9 +233,12 @@
|
||||
mobile: '',
|
||||
realname: '',
|
||||
address: '',
|
||||
type: '',
|
||||
desc:'',
|
||||
type: '机构',
|
||||
};
|
||||
this.gomy();
|
||||
setTimeout(()=>{
|
||||
uni.navigateBack();
|
||||
},1500)
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
@ -331,7 +360,7 @@
|
||||
justify-content: space-between;
|
||||
}
|
||||
.text_lab{
|
||||
color: #3D3D3D;
|
||||
color: #323232;
|
||||
font-weight: 600;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
font-size: 32rpx;
|
||||
@ -347,15 +376,14 @@
|
||||
.input {
|
||||
text-align: right;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
font-size: 26rpx;
|
||||
color: #343434;
|
||||
line-height: 32rpx;
|
||||
font-size: 32rpx;
|
||||
color: #323232;
|
||||
}
|
||||
|
||||
.plasty {
|
||||
color: #9C9C9C;
|
||||
font-weight: 300;
|
||||
font-size: 28rpx;
|
||||
font-size: 32rpx;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
}
|
||||
|
||||
|
@ -163,7 +163,7 @@
|
||||
|
||||
<view class="popup">
|
||||
<img class="img_shouquan" src="https://naweigetetest2.hschool.com.cn/dyqc/shou1.png" alt="" />
|
||||
<text id="txt2">为您授权登陆,授权成功后可参加多种户外活动</text>
|
||||
<text id="txt2">授权成功后即可参加多种户外活动</text>
|
||||
<button class="texbut" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
|
||||
授权登录
|
||||
<!-- <u-icon label="" labelColor="#fff" size="28" name="/static/wechat1.png"></u-icon> -->
|
||||
|
Loading…
x
Reference in New Issue
Block a user