Skip to content

S
self-support
Commit 456bf7a5 authored by 李超鹏's avatar 李超鹏
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 20b7781b 45422886
Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 207 deletions
src/App.vue
View file @ 456bf7a5
......@@ -118,7 +118,7 @@ export default {
return false;
}
vm.$u.vuex('vuex_settled', res.data && res.data.record || null);
vm.$u.vuex('vuex_settled', res.data || null);
if (!res.data) {
return;
}
......
src/common/api/order.js
View file @ 456bf7a5
......@@ -8,8 +8,6 @@ let orderApiFun = function(vm){
let order = '/wxh-worker-rest/rest/order/'
let settle = '/wxh-worker-rest/rest/settle/'
let token = vm.vuex_token
let listByRecommendOrder = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/recommend/order', params);
/**
* 工单数量查询接口
......@@ -158,12 +156,12 @@ let orderApiFun = function(vm){
// 获取我的钱包-资产信息
let getAssets = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/v2/total', params);
// 获取我的钱包-结算明细
// 获取我的钱包-收入流水
let listStatement = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/v2/statement', params);
// 获取我的钱包-支付单一览
let payableRecord = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/payable/v2/queryPayableRecord', params);
// 获取我的钱包-师傅提现
let workerApplyPay = async (params = {}, payableRecordId) => await vm.$u.post(`/wxh-worker-rest/rest/${token}/applypay/${payableRecordId}/workerApplyPay`, params);
let workerApplyPay = async (payableId) => await vm.$u.post(`/wxh-worker-rest/rest/${vm.vuex_token}/applypay/${payableId}/workerApplyPay`);
const orderApi = {
listByRecommendOrder,
......
src/components/mine/statement.vue
View file @ 456bf7a5
......@@ -13,8 +13,8 @@
</view>
</view>
<view class="right-view">
<view :class="['statement-status-view', statementTypeClass]">{{data.payableRecordStatusText}}</view>
<view class="statement-amount-view">+{{data.payableAmount}}</view>
<view :class="['statement-status-view', statementTypeClass]">{{data.status}}</view>
<view class="statement-amount-view">+{{data.amount}}</view>
</view>
</view>
<view class="line-view"></view>
......@@ -29,11 +29,11 @@
default () {
return {
paymentTime: new Date().getTime(),
payableRecordStatusText: '预结',
status: '预结',
orderNumber: 'EE999777',
orderServiceType: '安装',
orderServiceTypeText: '安装',
inGuaranteePeriod: false, // true 保内；false 保外
payableAmount: 9899
amount: 9899
}
}
}
......@@ -45,18 +45,21 @@
},
computed: {
statementTypeClass() {
switch (this.data.payableRecordStatusText) {
switch (this.data.status) {
case '预结':
return 'statement-type-y'
case '已确认':
return 'statement-type-h'
}
},
isWarranty() {
return this.data.inGuaranteePeriod ? '保内' : '保外'
},
typeText() {
return (this.data.inGuaranteePeriod ? '保内' : '保外') + '-' + this.data.orderServiceType
return this.isWarranty + '-' + this.data.orderServiceTypeText
},
timeText() {
return this.$u.timeFormat(this.data.paymentTime, 'mm.dd')
return this.$u.timeFormat(this.data.updateDatetime, 'mm.dd')
}
},
methods:{
......
src/pages/index/mine.vue
View file @ 456bf7a5
......@@ -35,6 +35,7 @@
</template>
<script>
const app = getApp();
import takePhoto from '@/components/take/index.vue'
export default {
components: {
......@@ -47,15 +48,18 @@
}
},
computed: {
settled() {
return this.vuex_settled && this.vuex_settled.record || null
},
avatar() {
return this.vuex_settled && this.vuex_settled.avatar || ''
},
name() {
return this.vuex_settled && this.vuex_settled.id_card_name
|| this.vuex_settled.nickname || this.vuex_settled.name || ''
return this.settled && this.settled.id_card_name
|| this.settled.nickname || this.settled.name || ''
},
mobile() {
return this.vuex_settled && this.vuex_settled.mobile || ''
return this.settled && this.settled.mobile || ''
},
items() {
return [{
......@@ -122,22 +126,32 @@
}
},
onLoad() {
if(this.vuex_token && !this.settled) {
this.getData()
}
},
methods: {
handleClick(index) {
uni.navigateTo({
url: 'pages/mine/' + this.pages[index] + '/index'
})
getData() {
let self = this
app.getBaseInfo(self);
},
handleClick(index) {
if(this.vuex_token) {
this.$u.route({
url: 'pages/mine/' + this.pages[index] + '/index'
})
} else {
this.$u.route({url: "pages/login/index"})
}
},
handleClickName() {
if(this.vuex_token && this.vuex_settled) {
if(this.vuex_token && this.settled) {
return false
}
this.$u.route({url: "pages/login/index"})
},
handleClickTel() {
if(this.vuex_token && this.vuex_settled && this.mobile) {
if(this.vuex_token && this.settled && this.mobile) {
return false
}
this.$u.route({url: "pages/login/index"})
......
src/pages/learn/answer.vue
View file @ 456bf7a5
......@@ -75,7 +75,7 @@ export default {
timeDefine: {
"time-id-2": 1800,
"time-id-3": 900,
"time-id-4": 360,
"time-id-4": 450,
},
endTime: 0,
currentTime: 100,
......@@ -407,6 +407,11 @@ export default {
if (this.everyTime > 0) {
this.timer = setTimeout(this.startCounting, 1000);
console.log(
"endTime:" + this.endTime,
"everyTime:" + this.everyTime,
"currentTime:" + this.currentTime
);
} else {
clearTimeout(this.timer);
this.everyTime = 90;
......
src/pages/learn/assessment.vue
View file @ 456bf7a5
<template>
<view class="content">
<u-navbar
back-icon-color="#FFFFFF"
:background="background"
title-color="#fff"
:border-bottom="false"
></u-navbar>
<u-navbar back-icon-color="#FFFFFF" :background="background" title-color="#fff" :border-bottom="false"></u-navbar>
<view class="title">考试规则</view>
<view class="test">
<view class="slogan">
这是一场严肃的考试，请认真查看 规则，预祝您顺利通过考试！
</view>
<view class="text">
<text class="left">考试科目:</text
><text style="color: #007aff">{{ desc.title }}</text>
<text class="left">考试科目:</text><text style="color: #007aff">{{ desc.title }}</text>
</view>
<view class="text">
<text class="left">合格条件:</text><text>{{ desc.score }}</text>
......@@ -22,7 +16,7 @@
<text class="left">考试时间:</text><text>{{ desc.time }}</text>
</view>
<view class="text">
<text class="left">题目来源:</text><text>系统随机{{ desc.number }}题</text>
<text class="left">题目来源:</text><text>{{ ruleDisc }}</text>
</view>
<button @click="getUserExamId()">开始考试</button>
</view>
......@@ -31,66 +25,66 @@
<script>
let condition = {
"dev": {
dev: {
"id-2": {
"score": "60分",
"time": "30分钟",
"number": "20",
"title": "服务规范"
score: "60分",
time: "30分钟",
number: "20",
title: "服务规范",
},
"id-3": {
"score": "30分",
"time": "15分钟",
"number": "10",
"title": "服务规范"
score: "30分",
time: "15分钟",
number: "10",
title: "服务规范",
},
"id-4": {
"score": "15分",
"time": "6分钟",
"number": "4",
"title": "交付规范"
}
score: "15分",
time: "6分钟",
number: "4",
title: "交付规范",
},
},
"test": {
test: {
"id-2": {
"score": "60分",
"time": "30分钟",
"number": "20",
"title": "服务规范"
score: "60分",
time: "30分钟",
number: "20",
title: "服务规范",
},
"id-3": {
"score": "30分",
"time": "15分钟",
"number": "10",
"title": "服务规范"
score: "30分",
time: "15分钟",
number: "10",
title: "服务规范",
},
"id-4": {
"score": "15分",
"time": "6分钟",
"number": "4",
"title": "交付规范"
}
score: "15分",
time: "6分钟",
number: "4",
title: "交付规范",
},
},
"prod": {
prod: {
"id-2": {
"score": "60分",
"time": "30分钟",
"number": "20",
"title": "服务规范"
score: "60分",
time: "30分钟",
number: "20",
title: "服务规范",
},
"id-3": {
"score": "30分",
"time": "15分钟",
"number": "10",
"title": "服务规范"
score: "30分",
time: "15分钟",
number: "10",
title: "服务规范",
},
"id-4": {
"score": "15分",
"time": "6分钟",
"number": "4",
"title": "交付规范"
}
}
score: "15分",
time: "6分钟",
number: "4",
title: "交付规范",
},
},
};
let env = process.uniEnv.node_env;
let desc = condition[env];
......@@ -102,11 +96,13 @@ export default {
examId: null,
exam: null,
userExamId: null,
ruleDisc: "",
};
},
onLoad(param) {
this.examId = param.examId
this.desc = desc["id-" + this.examId]
this.examId = param.examId;
this.desc = desc["id-" + this.examId];
this.getExamResult();
// this.getUserExamInfo();
},
methods: {
......@@ -119,33 +115,58 @@ export default {
},
getUserExamInfo() {
uni.request({
url:
process.uniEnv.systemUrl.apiUrl +
"/wxh-worker-rest/rest/exam/serviceRule/" +
this.vuex_token +
"?examId=" +
this.examId,
method: "POST",
header: {
"Content-Type": "application/x-www-from-urlencoded",
},
url:
process.uniEnv.systemUrl.apiUrl +
"/wxh-worker-rest/rest/exam/serviceRule/" +
this.vuex_token +
"?examId=" +
this.examId,
method: "POST",
header: {
"Content-Type": "application/x-www-from-urlencoded",
},
success: (res) => {
console.log("标识符1", res.data);
uni.hideLoading();
if (res.data.code == 200) {
if (res.data.data.userExamId) {
this.userExamId = res.data.data.userExamId;
console.log("这个是个标识符", this.userExamId);
}
}
},
success: (res) => {
console.log("标识符1", res.data);
uni.hideLoading();
if (res.data.code == 200) {
if (res.data.data.userExamId) {
this.userExamId = res.data.data.userExamId;
console.log("这个是个标识符", this.userExamId);
}
}
},
});
setTimeout(() => {
wx.navigateTo({
url: "/pages/learn/answer?userExamId=" + this.userExamId,
});
}, 1000);
wx.navigateTo({
url: "/pages/learn/answer?userExamId=" + this.userExamId,
});
}, 1000);
},
getExamResult() {
uni.request({
url:
process.uniEnv.systemUrl.apiUrl +
"/wxh-worker-rest/rest/exam/serviceRule/userExamInfo/" +
this.vuex_token +
"?examId=" +
this.examId,
method: "POST",
header: {
"Content-Type": "application/x-www-from-urlencoded",
},
success: (res) => {
uni.hideLoading();
if (res.data.code == 200) {
if (res.data.data.ruleDisc) {
console.log(res.data.data.ruleDisc);
var str = res.data.data.ruleDisc;
console.log(str.substring(0, 11));
this.ruleDisc = str.substring(0, 11);
}
}
},
});
},
},
};
......
src/pages/mine/address/addSite.vue
View file @ 456bf7a5
......@@ -78,37 +78,39 @@ export default {
return {
title: '新增地址',
show: false,
type: '充电桩安装',
name: '',
mobile: '',
address: '',
location: '',
};
},
computed: {
settled() {
return this.vuex_settled && this.vuex_settled.record || null
},
type() {
return this.settled.type || '充电桩安装'
},
name() {
return this.settled.id_card_name || this.settled.nickname || this.settled.name || '--'
},
mobile() {
return this.settled.mobile
},
address() {
return this.settled.address
},
},
async onLoad(e) {
if(e && e.title) {
this.title = decodeURIComponent(e.title)
}
if(this.vuex_token && this.vuex_settled) {
const settled = this.vuex_settled
this.name = settled.id_card_name || settled.nickname || settled.name || '--'
this.mobile = settled.mobile
this.address = settled.address
this.type = settled.type
} else {
this.$u.route({
type: 'redirect',
url: "pages/mine/address/index",
params: {
sync: true
}
})
if(!this.vuex_token) {
this.$u.route({url: 'pages/login/index'})
} else if(!this.settled) {
this.getData();
}
await this.setDefault()
},
methods: {
async setDefault() {
async getData() {
getApp().getBaseInfo(this);
this.initLocation()
},
/**
......
src/pages/mine/address/index.vue
View file @ 456bf7a5
......@@ -31,36 +31,30 @@ export default {
background: {
backgroundColor: 'none'
},
settledInfo: null,
siteList: []
};
},
onLoad(e) {
if(e && e.sync) {
this.getData();
} else {
if(this.vuex_token && this.vuex_settled) {
this.settledInfo = this.vuex_settled
} else {
this.getData();
}
}
},
computed: {
editPen() {
return process.uniEnv.qn_base_url + 'icon/edit-pen.png'
},
settled() {
return this.vuex_settled && this.vuex_settled.record || null
},
},
onLoad(e) {
if(!this.vuex_token) {
this.$u.route({url: 'pages/login/index'})
} else if (e && e.sync) {
this.getData();
} else if(!this.settled) {
this.getData();
}
},
methods: {
getData() {
let self = this
const callBack = (vm, result) => {
// 后台自动判断入驻流程是否完成，前台通过status确定状态
if (result && result.record) {
self.settledInfo = result.record
}
};
app.getBaseInfo(self, callBack);
app.getBaseInfo(self);
},
toAddSite(title){
this.$u.route({
......
src/pages/mine/deposit/index.vue
View file @ 456bf7a5
......@@ -31,7 +31,6 @@
export default {
data() {
return {
settled: null,
rules: [
{
question: '为什么缴纳设备押金？',
......@@ -51,24 +50,21 @@
amount() {
return this.settled && this.settled.deposit || '0.00';
},
settled() {
return this.vuex_settled && this.vuex_settled.record || null
},
},
onLoad() {
if(this.vuex_token && this.vuex_settled) {
this.settled = this.vuex_settled
} else {
if(!this.vuex_token) {
this.$u.route({url: 'pages/login/index'})
} else if(!this.settled) {
this.getData();
}
},
methods: {
getData() {
let self = this
const callBack = (vm, result) => {
// 后台自动判断入驻流程是否完成，前台通过status确定状态
if (result && result.record) {
self.settled = result.record
}
};
app.getBaseInfo(self, callBack);
getApp().getBaseInfo(self);
},
refund() {
this.$u.route({
......
src/pages/mine/wallet/index.vue
View file @ 456bf7a5
......@@ -40,6 +40,9 @@
</view>
<view class="line-view"></view>
<view class="list-view">
<view class="u-flex u-row-center" v-if="loading">
<u-loading color="#2272FF" :show="loading"></u-loading>
</view>
<view v-for="(item, index) in statementList" :key="index">
<Statement :data="item" @click="handleClickCell"></Statement>
</view>
......@@ -63,10 +66,19 @@
totalPayAmount: 0, // 总共收入
saveAndApplyAmount: 0, // 预计待入账
},
statementList: []
loading: true,
statementList: [],
settledAmount: 0,
}
},
computed: {
statementContent() {
if(this.loading) {
return '当前展示最近5条，点击查看全部'
}
return this.statementList && this.statementList.length
&& '当前展示最近5条，点击查看全部' || '暂无流水'
},
lists() {
return [{
title: '结算账单',
......@@ -74,7 +86,7 @@
icon: this.imageUrl + 'jiesuan.png'
}, {
title: '收入流水',
content: '当前展示最近5条，点击查看全部',
content: this.statementContent,
icon: this.imageUrl + 'liushui.png'
}]
},
......@@ -105,19 +117,8 @@
return ['settlement','statement']
}
},
created() {
// var item = {
// paymentTime: new Date().getTime(),
// payableRecordStatusText: '预结',
// orderNumber: 'EE999777',
// orderServiceType: '安装',
// inGuaranteePeriod: false, // true 保内；false 保外
// payableAmount: 9899,
// orderId: 12313,
// }
// this.statementList = [item, item, item, item, item]
},
onLoad() {
// 未登录，先跳转登录
if(!this.vuex_token) {
this.$u.route({url: 'pages/login/index'})
}
......@@ -127,18 +128,21 @@
methods: {
// 提现
handleClickWithdraw() {
uni.navigateTo({
url: 'pages/mine/wallet/' + 'withdraw'
this.$u.route({
url: 'pages/mine/wallet/withdraw'
})
},
handleClick(index) {
uni.navigateTo({
this.$u.route({
url: 'pages/mine/wallet/' + this.pages[index]
})
},
handleClickCell(orderId) {
uni.navigateTo({
url: 'pages/order/detail?id=' + orderId
this.$u.route({
url: 'pages/order/detail',
params: {
id: orderId
}
})
},
async loadAssets() {
......@@ -150,18 +154,19 @@
},
async loadStatement() {
let self = this
self.loading = true
let res = await self.$u.api.listStatement()
self.loading = false
if(res && res.code == 200) {
self.statementList = res.data && res.data.orderList || []
let data = res.data && res.data.orderList || []
self.settledAmount = res.data && res.data.settledAmount || 0
if (data.length < 6) {
self.statementList = data
} else {
self.statementList = data.slice(0, 5)
}
}
},
async loadPayRecord() {
let self = this
let res = await self.$u.api.payableRecord()
// if(res && res.code == 200) {
// self.info = res.data || self.info
// }
},
}
}
</script>
......
src/pages/mine/wallet/settlement.vue
View file @ 456bf7a5
......@@ -32,6 +32,7 @@
</template>
<script>
let now = new Date(new Date().toLocaleDateString()).getTime();
import Settlement from "@/components/mine/settlement.vue"
export default {
components: {
......@@ -43,8 +44,12 @@
totalAmount: 0,
payableRecordExtendDtos: []
},
date: '2021-05'
date: '2021-05',
params: {
payableRecordStatus: null,
starDate: null,
endDate: null,
},
}
},
computed: {
......@@ -63,10 +68,25 @@
settlementAmount: 9899
}
this.info.payableRecordExtendDtos = [item, item, item, item, item]
},
onLoad() {
this.loadPayRecord()
},
methods: {
methods: {
async loadPayRecord() {
let self = this
let startTime = self.moment(self.date).format('YYYY-MM-DD')
let endTime = self.moment(self.date).endOf('month').format('YYYY-MM-DD')
self.params.starDate = startTime
self.params.endDate = endTime
let res = await self.$u.api.payableRecord(self.params)
if(res && res.code == 200) {
self.info = res.data && res.data[self.date] || self.info
}
},
bindDateChange: function(e) {
this.date = e.target.value
this.date = e.target.value
this.loadPayRecord()
},
handleClickCell(orderId) {
uni.navigateTo({
......
src/pages/mine/wallet/statement.vue
View file @ 456bf7a5
......@@ -79,6 +79,9 @@
payableAmount: 9899
}
this.data.statementList = [item, item, item, item, item]
},
onLoad() {
},
methods: {
bindDateChange: function(e) {
......
src/pages/mine/wallet/withdraw.vue
View file @ 456bf7a5
......@@ -18,10 +18,10 @@
<script>
export default {
data() {
return {
amount: 0
amount: 0,
payableId: 0,
}
},
computed: {
......@@ -34,11 +34,27 @@
};
},
},
onLoad() {
this.loadAssets()
},
methods: {
handleClick() {
async handleClick() {
let self = this
self.$u.api.workerApplyPay()
}
self.payableId = 666
let res = await self.$u.api.workerApplyPay(self.payableId)
if(res && res.code == 200) {
self.$u.ruote({type: 'redirect', url: 'pages/wallet/index'})
} else {
self.$u.toast(res.message || '系统异常，提现失败！');
}
},
async loadAssets() {
let self = this
let res = await self.$u.api.getAssets()
if(res && res.code == 200) {
self.amount = res.data && res.data.canApplyAmount
}
},
}
}
</script>
......
src/pages/settle/file.vue
View file @ 456bf7a5
......@@ -249,7 +249,10 @@ export default {
'font-size': '32rpx',
'font-weight': 'bold'
}
}
},
settled() {
return this.vuex_settled && this.vuex_settled.record || null
},
},
components: {
......@@ -258,16 +261,14 @@ export default {
// 初始化入驻信息
async initSettledInfo() {
let self = this
let settledInfo = self.vuex_settled
if(settledInfo && settledInfo.length) {
self.fileInfo.id = settledInfo.id
const callBack = (vm, result) => {
vm.settledInfo = result.record
vm.fileInfo.id = result.record.id
}
if(self.settled && self.settled.length) {
callBack(self, self.vuex_settled)
} else {
const app = getApp()
const callBack = (vm, result) => {
vm.settledInfo = result.record
vm.fileInfo.id = result.record.id
}
settledInfo = await app.getBaseInfo(self, callBack)
await getApp().getBaseInfo(self, callBack)
uni.hideLoading()
}
},
......
src/pages/settle/pay-ensure.vue
View file @ 456bf7a5
......@@ -66,7 +66,10 @@
computed: {
weixinImage() {
return process.uniEnv.qn_base_url + 'weixin.png'
}
},
settled() {
return this.vuex_settled && this.vuex_settled.record || null
},
},
watch: {
isRefresh(val) {
......@@ -88,9 +91,8 @@
const callBack = (vm, result) => {
vm.settledInfo = result
}
let settledInfo = self.vuex_settled
if (settledInfo) {
callBack(self, settledInfo)
if (self.settled) {
callBack(self, self.vuex_settled)
return
}
await app.getBaseInfo(self, callBack)
......
src/pages/settle/sign-contract.vue
View file @ 456bf7a5
......@@ -150,7 +150,10 @@
'font-size': '32rpx',
'font-weight': 'bold'
}
}
},
settled() {
return this.vuex_settled && this.vuex_settled.record || null
},
},
components: {
......@@ -299,9 +302,8 @@
vm.baseInfo.name = record.id_card_name
vm.baseInfo.id = record.id
}
let settledInfo = self.vuex_settled
if (settledInfo) {
callBack(self, settledInfo)
if (self.settled) {
callBack(self, self.vuex_settled)
return
}
await app.getBaseInfo(self, callBack)
......
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