Commit 5649153d authored by 刘用法's avatar 刘用法
parents 761f1819 62dc9d8c
...@@ -162,7 +162,7 @@ let orderApiFun = function(vm){ ...@@ -162,7 +162,7 @@ let orderApiFun = function(vm){
// 获取我的钱包-支付单一览 // 获取我的钱包-支付单一览
let payableRecord = async (params = {}) => await vm.$u.post(settle + vm.vuex_token + '/payable/v2/queryPayableRecord', params, formType); let payableRecord = async (params = {}) => await vm.$u.post(settle + vm.vuex_token + '/payable/v2/queryPayableRecord', params, formType);
// 获取我的钱包-师傅提现 // 获取我的钱包-师傅提现
let workerApplyPay = async (payableId) => await vm.$u.post(`/wxh-worker-rest/rest/${vm.vuex_token}/applypay/${payableId}/workerApplyPay`, {}, dataType); let workerApplyPay = async () => await vm.$u.get(prefix + vm.vuex_token + '/applypay/batch/workerApplyPay');
const orderApi = { const orderApi = {
listByRecommendOrder, listByRecommendOrder,
......
...@@ -657,6 +657,15 @@ export default { ...@@ -657,6 +657,15 @@ export default {
let examResult = res.data.examLevelResult; let examResult = res.data.examLevelResult;
this.examList[i].status = this.examList[i].status =
examResult != "" ? examResult : "未通过"; examResult != "" ? examResult : "未通过";
//动态获取条件
let ruleDisc = res.data.ruleDisc;
let targetIndex = ruleDisc.indexOf('(');
if(targetIndex){
this.examList[i].condition = ruleDisc.substr(targetIndex + 1).replace(')', '');
}
// examStatus 用户考试状态 0考试中 1考试完成 2未参与 // examStatus 用户考试状态 0考试中 1考试完成 2未参与
that.exam = res.data; that.exam = res.data;
console.log(that.exam); console.log(that.exam);
...@@ -695,13 +704,11 @@ export default { ...@@ -695,13 +704,11 @@ export default {
].questionTime; ].questionTime;
var examInfo = this.examList[index]; var examInfo = this.examList[index];
if (examInfo.examStatus == 0) { if (examInfo.examStatus == 0) {
console.log("这是试卷id", examInfo.id);
wx.navigateTo({ wx.navigateTo({
url: "/pages/learn/answer?examId=" + examInfo.id, // url: "/pages/learn/answer?examId=" + examInfo.id,
url: "/pages/learn/assessment?examId=" + examInfo.id,
}); });
} else if (examInfo.examStatus == 1) { } else if (examInfo.examStatus == 1) {
// examInfo.status = '通过';
if (examInfo.status == "已通过") { if (examInfo.status == "已通过") {
wx.navigateTo({ wx.navigateTo({
url: url:
......
...@@ -266,6 +266,8 @@ ...@@ -266,6 +266,8 @@
param.status = this.status = 1 param.status = this.status = 1
}else if(nowTime % this.howTimeToUpdateLearnedStatus != 0){ }else if(nowTime % this.howTimeToUpdateLearnedStatus != 0){
return return
}else{
param.status = 0;
} }
this.$u.api.updateLearnCourses(param).then((res) => {}).catch((err) => { this.$u.api.updateLearnCourses(param).then((res) => {}).catch((err) => {
console.log(err) console.log(err)
...@@ -470,7 +472,7 @@ ...@@ -470,7 +472,7 @@
width: 280rpx; width: 280rpx;
height: 150rpx; height: 150rpx;
margin-right: 23rpx; margin-right: 23rpx;
display: inline-block; display: inline-grid;
background-color: #F4F5F7; background-color: #F4F5F7;
border-radius: 12rpx; border-radius: 12rpx;
padding: 20rpx; padding: 20rpx;
......
...@@ -67,7 +67,6 @@ export default { ...@@ -67,7 +67,6 @@ export default {
methods: { methods: {
// 微信授权用户信息 // 微信授权用户信息
getUserProfile() { getUserProfile() {
debugger
var that = this var that = this
if(uni.getUserProfile) { if(uni.getUserProfile) {
// 每次触发 uni.getUserProfile 均会弹出授权窗口,用户授权后可成功获取用户信息 // 每次触发 uni.getUserProfile 均会弹出授权窗口,用户授权后可成功获取用户信息
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
data() { data() {
return { return {
amount: 0, amount: 0,
payableId: 0,
} }
}, },
computed: { computed: {
...@@ -40,13 +39,14 @@ ...@@ -40,13 +39,14 @@
methods: { methods: {
async handleClick() { async handleClick() {
let self = this let self = this
self.payableId = 666 if(self.amount) {
let res = await self.$u.api.workerApplyPay(self.payableId) let res = await self.$u.api.workerApplyPay()
if(res && res.code == 200) { if(res && res.code == 200) {
self.$u.ruote({type: 'redirect', url: 'pages/wallet/index'}) self.$u.route({type: 'redirect', url: 'pages/mine/wallet/index'})
} else { } else {
self.$u.toast(res.message || '系统异常,提现失败!'); self.$u.toast(res.message || '系统异常,提现失败!');
} }
}
}, },
async loadAssets() { async loadAssets() {
let self = this let self = this
......
...@@ -651,6 +651,7 @@ ...@@ -651,6 +651,7 @@
if (res.code === 200 ) { if (res.code === 200 ) {
if( res.data && res.data.rejectable){ if( res.data && res.data.rejectable){
this.$u.route({ this.$u.route({
type: 'redirect',
url: 'pages/order/refuse', url: 'pages/order/refuse',
params: { params: {
orderId: this.order.orderId, orderId: this.order.orderId,
......
...@@ -116,9 +116,8 @@ ...@@ -116,9 +116,8 @@
let res = await self.$u.api.rejectOrder(self.formData, self.orderId) let res = await self.$u.api.rejectOrder(self.formData, self.orderId)
self.submiting = false self.submiting = false
if(res && res.code == 200) { if(res && res.code == 200) {
uni.showToast({ self.$u.toast({title: res.message || res.data || '拒单成功'})
title: res.message || res.data || '拒单成功', self.$u.route({type: 'reLaunch', url: 'pages/index/index'})
})
} }
}, },
} }
......
...@@ -61,11 +61,20 @@ ...@@ -61,11 +61,20 @@
}, },
orderList: [], orderList: [],
loaded: false, loaded: false,
total: 10,
loadStaus: 'loadmore',
}; };
}, },
onLoad() { onLoad() {
// this.searchOrder() // this.searchOrder()
}, },
onReachBottom() {
let len = this.orderList && this.orderList.length || 0
if(!this.loaded || len >= this.total) return;
this.loadStaus = 'loading';
this.search.pageNumber = ++ this.search.pageNumber;
this.getOrderList('onReachBottom')
},
computed: { computed: {
searchEmpty() { searchEmpty() {
return process.uniEnv.qn_base_url + 'SearchEmpty.png' return process.uniEnv.qn_base_url + 'SearchEmpty.png'
...@@ -73,23 +82,29 @@ ...@@ -73,23 +82,29 @@
}, },
methods: { methods: {
searchOrder(index) { searchOrder(index) {
this.search.pageNumber = 0 this.search.pageNumber = 1
this.loadStaus = 'loading';
this.getOrderList() this.getOrderList()
}, },
// 页面数据 // 页面数据
getOrderList() { getOrderList(event) {
let self = this; let self = this;
if(!self.search.keyword) { if(!self.search.keyword) {
return false return false
} }
// 状态处理 // 状态处理
self.search.pageNumber += 1
self.loaded = false self.loaded = false
self.$u.api.listOrder(self.search).then((res) => { self.$u.api.listOrder(self.search).then((res) => {
if (res.code == 200) { if (res.code == 200) {
if (res.data) { if (res.data) {
self.orderList = res.data.list || [] let list = res.data.list || []
self.total = res.data.total || 0
if(event == 'onReachBottom') {
self.orderList.push(...list)
} else {
self.orderList = list
}
self.loadStatus = res.data.total > self.orderList.length ? 'loadmore' : 'nomore' self.loadStatus = res.data.total > self.orderList.length ? 'loadmore' : 'nomore'
} }
} else { } else {
...@@ -97,7 +112,6 @@ ...@@ -97,7 +112,6 @@
} }
self.loaded = true self.loaded = true
}); });
}, },
viewOderItem(orderId) { // 跳转工单详情页面 viewOderItem(orderId) { // 跳转工单详情页面
uni.navigateTo({ uni.navigateTo({
......
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