Skip to content

C
CFFP-HB
Commit 657746c1 by sunchao
Options

Merge branch 'apply' into dev

parents 2b75b344 5c60d0f3
Showing with 57 additions and 35 deletions
components/search/search.vue
<template> <template>
<view class="search"> <view class="search">
<input class="searchInput" type="text" name="" id="" v-model="queryName"/> <form action="" style="width: 98%;" @submit="searchBtn()">
<text class="iconfont icon-sousuo" @click="searchBtn()"></text> <input class="searchInput" type="text" name="" id="" v-model="queryName" />
<text class="iconfont icon-sousuo" @click="searchBtn()"></text>
</form>
<text class="iconfont icon-xiaoxi"></text> <text class="iconfont icon-xiaoxi"></text>
<text class="system_msg" @click="jumpToSystemMsg()">{{messageUnreadCount}}</text> <text class="system_msg" @click="jumpToSystemMsg()">{{messageUnreadCount}}</text>
</view> </view>
...@@ -74,11 +76,13 @@ ...@@ -74,11 +76,13 @@
display: flex; display: flex;
margin: 30rpx auto; margin: 30rpx auto;
align-items: center; align-items: center;
form{
width: 95%;
margin-right: 20rpx;
}
.searchInput{ .searchInput{
border-radius: 60rpx; border-radius: 60rpx;
width: 95%;
background: linear-gradient(to right,#E6F5FC,#FDE9F2); background: linear-gradient(to right,#E6F5FC,#FDE9F2);
margin-right: 20rpx;
padding: 15rpx; padding: 15rpx;
} }
.icon-sousuo{ .icon-sousuo{
......
manifest.json
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,8 @@
"sdkConfigs" : { "sdkConfigs" : {
"share" : { "share" : {
"weixin" : { "weixin" : {
"appid" : "wxec09b9be6cff4eb3", "appid" : "wxb591d0034cdcf0cd",
"UniversalLinks" : "https://mcffp.anjibao.cn/uni-universallinks/__UNI__ED34740/" "UniversalLinks" : "https://mcffp.anjibao.cn/app/"
} }
}, },
"ad" : {}, "ad" : {},
...@@ -75,14 +75,14 @@ ...@@ -75,14 +75,14 @@
}, },
"weixin" : { "weixin" : {
"__platform__" : [ "ios", "android" ], "__platform__" : [ "ios", "android" ],
"appid" : "wxec09b9be6cff4eb3", "appid" : "wxb591d0034cdcf0cd",
"UniversalLinks" : "https://mcffp.anjibao.cn/uni-universallinks/__UNI__ED34740/" "UniversalLinks" : "https://mcffp.anjibao.cn/app/"
} }
}, },
"oauth" : { "oauth" : {
"weixin" : { "weixin" : {
"appid" : "wxec09b9be6cff4eb3", "appid" : "wxb591d0034cdcf0cd",
"UniversalLinks" : "https://mcffp.anjibao.cn/uni-universallinks/__UNI__ED34740/" "UniversalLinks" : "https://mcffp.anjibao.cn/app/"
} }
} }
}, },
......
pages/application-process/basic-info.vue
...@@ -268,6 +268,14 @@ ...@@ -268,6 +268,14 @@
}, },
saveInfo(){ saveInfo(){
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){ if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
if(!this.applyParam.areaId){
uni.showToast({
title: '请选择所属组织',
duration: 2000,
icon: 'none'
})
return;
}
if(!this.applyParam.name){ if(!this.applyParam.name){
uni.showToast({ uni.showToast({
title: '请输入姓名', title: '请输入姓名',
......
pages/applyDropClass/applyDropClass.vue
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
</view> </view>
</view> </view>
<!-- 提交申请 --> <!-- 提交申请 -->
<view class="submitApply" @click="submit()"> <view class="submitApply" @click="submit()" >
<text>提交申请</text> <text :class="{'gray':readonlyFlag}" >提交申请</text>
</view> </view>
<!-- 弹窗 --> <!-- 弹窗 -->
<uni-popup ref="popup" type="bottom" background-color="#fff"> <uni-popup ref="popup" type="bottom" background-color="#fff">
...@@ -85,7 +85,8 @@ ...@@ -85,7 +85,8 @@
userId: uni.getStorageSync('cffp_userId'), userId: uni.getStorageSync('cffp_userId'),
dropInfo:{}, dropInfo:{},
dropIndex:0, dropIndex:0,
dropReasons:[''] dropReasons:[''],
readonlyFlag:false
}; };
}, },
methods:{ methods:{
...@@ -117,28 +118,33 @@ ...@@ -117,28 +118,33 @@
}, },
// 提交申请 // 提交申请
submit(){ submit(){
const param = { if(!this.readonlyFlag){
orderNo:this.dropInfo.orderNo, //提交按钮置灰
paymentMethod:this.dropInfo.paymentMethod, this.readonlyFlag = true;
userId:this.userId, const param = {
totalFee:this.dropInfo.orderPrice, orderNo:this.dropInfo.orderNo,
refundFee:this.dropInfo.refundFee, paymentMethod:this.dropInfo.paymentMethod,
integralExchange:this.dropInfo.integralExchange, userId:this.userId,
refundIntegralExchange:this.dropInfo.refundIntegralExchange, totalFee:this.dropInfo.orderPrice,
refundReason:this.dropReasons[this.dropIndex]['dropOptionName'] refundFee:this.dropInfo.refundFee,
} integralExchange:this.dropInfo.integralExchange,
api.unifiedRefund(param).then(res=>{ refundIntegralExchange:this.dropInfo.refundIntegralExchange,
if(res['success']){ refundReason:this.dropReasons[this.dropIndex]['dropOptionName']
uni.navigateTo({
url:`/pages/afterSaleDetail/afterSaleDetail?orderNo=${this.dropInfo.orderNo}&afterSalesFlag=3`
})
}else{
uni.showToast({
title: res['message'],
duration: 2000
});
} }
}) api.unifiedRefund(param).then(res=>{
if(res['success']){
uni.navigateTo({
url:`/pages/afterSaleDetail/afterSaleDetail?orderNo=${this.dropInfo.orderNo}&afterSalesFlag=3`
})
}else{
uni.showToast({
title: res['message'],
duration: 2000
});
}
this.readonlyFlag = false;
})
}
}, },
// 退款原因 // 退款原因
dropOptionsQuery(){ dropOptionsQuery(){
...@@ -202,7 +208,11 @@ ...@@ -202,7 +208,11 @@
margin: 0 auto; margin: 0 auto;
} }
text.gray{
background: #666;
}
} }
.popup-content{ .popup-content{
view{ view{
font-size: 30rpx; font-size: 30rpx;
......
pages/systemMsg/system_msg.vue
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
}) })
return false return false
} }
api.oneKeyRead({systemType:1,userId:2}).then((res)=>{ api.oneKeyRead({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
if(res['success']){ if(res['success']){
uni.showToast({ uni.showToast({
title: '已清除所有未读信息', title: '已清除所有未读信息',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment