Skip to content

T
take_order
Commit 445c1574 authored by 李俊赕's avatar 李俊赕
Browse files
Options

test

parent afb7a491
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 671 additions and 630 deletions
take-order/App.vue
View file @ 445c1574
...@@ -93,8 +93,8 @@ ...@@ -93,8 +93,8 @@
//工单完工 //工单完工
configCompletion:'', configCompletion:'',
protocolContent:'' protocolContent:'',
settledInfo:null,
}, },
...@@ -135,7 +135,27 @@ ...@@ -135,7 +135,27 @@
}, },
methods: { methods: {
async getBaseInfo(vm,callBack){
console.log('getbaseifno')
uni.showLoading({
title:'加载中……'
})
console.log(vm.$u.api,'this.$u.api')
const res = await vm.$u.api.getSettleBaseInfo()
if (!res.status) {
uni.showToast({
title: res.message,
icon: 'none'
});
return false;
}
this.globalData.settledInfo = res.data
console.log(res.data,'res.data')
callBack(vm,res.data)
uni.hideLoading()
return res.data
},
initAPIneedToken: function() { initAPIneedToken: function() {
......
take-order/common/api/settled.js
View file @ 445c1574
...@@ -7,7 +7,7 @@ let settledApiFun = function(vm){ ...@@ -7,7 +7,7 @@ let settledApiFun = function(vm){
/* 获取认证区域信息 */ /* 获取认证区域信息 */
let getSettleArea = async (params = {}) => await vm.$u.get(ucenterApiUrl + '/v1/settled/area', params); let getSettleArea = async (params = {}) => await vm.$u.get(ucenterApiUrl + '/v1/settled/area', params);
/* 提交用户基本信息 */ /* 提交用户基本信息 */
let submitSettleBaseInfo = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/settled/save-info', params); let submitSettleBaseInfo = async (params = {}) => await vm.$u.post(ucenterApiUrl+'/v1/settled/save-info', params);
/* 校验身份证正面 */ /* 校验身份证正面 */
let checkSettleIDCardFront = async (params = {}) => await vm.$u.post(ucenterApiUrl+'/v1/settled/card-front', params); let checkSettleIDCardFront = async (params = {}) => await vm.$u.post(ucenterApiUrl+'/v1/settled/card-front', params);
...@@ -15,6 +15,9 @@ let settledApiFun = function(vm){ ...@@ -15,6 +15,9 @@ let settledApiFun = function(vm){
/* 校验身份证反面 */ /* 校验身份证反面 */
let checkSettleIDCardBack = async (params = {}) => await vm.$u.post(ucenterApiUrl+'/v1/settled/card-back', params); let checkSettleIDCardBack = async (params = {}) => await vm.$u.post(ucenterApiUrl+'/v1/settled/card-back', params);
/* 提交用户资料 */
let submitSettleFileInfo = async (params = {}) => await vm.$u.post(ucenterApiUrl+'/v1/settled/submit-info', params);
/* 缴纳保证金 */ /* 缴纳保证金 */
let paySettleDeposit = async (params = {}) => await vm.$u.post(ucenterApiUrl + '/v1/settled/pay-deposit' , params,{'content-type': 'application/x-www-form-urlencoded'}); let paySettleDeposit = async (params = {}) => await vm.$u.post(ucenterApiUrl + '/v1/settled/pay-deposit' , params,{'content-type': 'application/x-www-form-urlencoded'});
...@@ -35,6 +38,7 @@ let settledApiFun = function(vm){ ...@@ -35,6 +38,7 @@ let settledApiFun = function(vm){
submitSettleBaseInfo, submitSettleBaseInfo,
checkSettleIDCardFront, checkSettleIDCardFront,
checkSettleIDCardBack, checkSettleIDCardBack,
submitSettleFileInfo,
paySettleDeposit, paySettleDeposit,
getSettleDepositResult, getSettleDepositResult,
// checkSettleBank, // checkSettleBank,
......
take-order/common/base_url.js
View file @ 445c1574
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
// fileUrl: 'https://s-fa.banshouhui.com', // fileUrl: 'https://s-fa.banshouhui.com',
// } // }
let ucenterUrl = { let ucenterUrl = {
apiUrl: 'https://u.banshouhui.com', //php端域名请求头 apiUrl: 'https://rest-u.banshouhui.com', //php端域名请求头
xueUrl:'https://xue.banshouhui.com', //学院
banshou:'https://m.banshou.com' ,//扳手app
} }
let systemUrl = { let systemUrl = {
apiUrl:'https://system.banshouhui.com', //java端域名请求头 apiUrl:'https://system.banshouhui.com', //java端域名请求头
...@@ -23,7 +25,10 @@ let systemUrl = { ...@@ -23,7 +25,10 @@ let systemUrl = {
/* --------------------------- test begin --------------------------- */ /* --------------------------- test begin --------------------------- */
ucenterUrl = { ucenterUrl = {
apiUrl: 'https://u.yunya.com' apiUrl: 'https://rest-u.test.ibanshou.cn',
xueUrl:'https://xue.test.ibanshou.cn', //学院
banshou:'https://m.test.ibanshou.cn/', //扳手app
} }
systemUrl = { systemUrl = {
apiUrl:'https://system.dev.banshouhui.com' apiUrl:'https://system.dev.banshouhui.com'
...@@ -52,13 +57,17 @@ systemUrl = { ...@@ -52,13 +57,17 @@ systemUrl = {
/* --------------------------- dev begin --------------------------- */ /* --------------------------- dev begin --------------------------- */
ucenterUrl = { // ucenterUrl = {
apiUrl: 'http://rest-u.yunya.com' // apiUrl: 'http://rest-u.yunya.com',
} // xueUrl:'http://rest-xue.yunya.com', //学院
systemUrl = { // banshou:'https://m.test.ibanshou.cn/', //扳手app
// apiUrl:'https://192.168.1.22' // }
apiUrl:'http://192.168.0.208:8192' //郭小青电脑 // systemUrl = {
} // // apiUrl:'https://192.168.1.22'
// // apiUrl:'http://192.168.0.208:37080' //郭小青电脑
// apiUrl:'http://192.168.0.208:8192'
// }
/* --------------------------- test end --------------------------- */ /* --------------------------- test end --------------------------- */
......
take-order/common/http.interceptor.js
View file @ 445c1574
...@@ -154,13 +154,24 @@ const install = (Vue, vm) => { ...@@ -154,13 +154,24 @@ const install = (Vue, vm) => {
return result; return result;
default: default:
if (res.statusCode == 200) { if (res.statusCode == 200) {
if(!result.data){
return {
data:res.data,
code:res.statusCode,
message:res.message || res.errMsg || ''
};
}
return res.data; return res.data;
} else { } else if(res.statusCode == 401){
vm.$u.route('/pages/login/wxlogin');
} else{
vm.$u.toast('网络请求错误！'); vm.$u.toast('网络请求错误！');
} }
} }
} }
} }
// 将返回值统一封装为直接返回对象的统一封装{data:data,code:200,message:message}形式
export default { export default {
install install
......
take-order/components/upload/upload.js
View file @ 445c1574
...@@ -6,7 +6,7 @@ export default { ...@@ -6,7 +6,7 @@ export default {
data() { data() {
return { return {
domain: 'http://upload.qiniup.com', domain: 'http://upload.qiniup.com',
uptokenURL: globalUrl.codeUrl.apiUrl + '/v1/tokens', uptokenURL: globalUrl.ucenterUrl.apiUrl + '/v1/tokens',
imgList: [], imgList: [],
imgs:[], imgs:[],
uploadToken: '' uploadToken: ''
......
take-order/pages.json
View file @ 445c1574
{ {
"easycom": { "easycom": {
"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
}, },
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
{ "path": "pages/settle/index",
"path": "pages/exam/start", "style": {
"style": { "navigationBarTitleText": "充电桩安装招募"
"navigationBarTitleText": "考试" }
}
},{
}, "path": "pages/index/index",
"style": {
{ "navigationBarTitleText": "下单"
"path": "pages/exam/index", }
"style": {
"navigationBarTitleText": "入驻考试" },
} {
"path": "pages/exam/start",
}, "style": {
"navigationBarTitleText": "考试"
{ }
"path": "pages/settle/file",
"style": { },
"navigationBarTitleText": "入驻资料"
} {
"path": "pages/exam/index",
}, "style": {
{ "navigationBarTitleText": "入驻考试"
"path": "pages/index/index", }
"style": {
"navigationBarTitleText": "下单" },
}
{
}, "path": "pages/settle/file",
"style": {
"navigationBarTitleText": "入驻资料"
}
{
"path": "pages/settle/index", },
"style": {
"navigationBarTitleText": "充电桩安装招募" {
} "path": "pages/video/index",
"style": {
}, "navigationBarTitleText": "培训&考试"
}
{
"path": "pages/video/index", },
"style": {
"navigationBarTitleText": "培训&考试"
}
{
}, "path": "pages/settle/base",
"style": {
"navigationBarTitleText": "入驻信息"
}
{
"path": "pages/settle/base",
"style": {
"navigationBarTitleText": "入驻信息"
}
}, },
{ {
"path": "pages/settle/select", "path": "pages/settle/select",
"style": { "style": {
"navigationBarTitleText": "选择可服务的城市" "navigationBarTitleText": "选择可服务的城市"
} }
},
{
"path": "pages/settle/file-upload",
"style": {
"navigationBarTitleText": "图片上传"
}
}, },
{
"path": "pages/settle/file-upload",
"style": {
"navigationBarTitleText": "图片上传"
}
},
{ {
"path": "pages/settle/pay-ensure", "path": "pages/settle/pay-ensure",
"style": { "style": {
"navigationBarTitleText": "缴纳保证金" "navigationBarTitleText": "缴纳保证金"
} }
}, },
{ {
"path": "pages/settle/prompt", "path": "pages/settle/prompt",
"style": { "style": {
"navigationBarTitleText": "入驻提示" "navigationBarTitleText": "入驻提示"
} }
},{ }, {
"path": "pages/settle/sign-contract", "path": "pages/settle/sign-contract",
"style": { "style": {
"navigationBarTitleText": "签约页面" "navigationBarTitleText": "签约页面"
} }
},{ }, {
"path": "pages/settle/web", "path": "pages/settle/web",
"style": { "style": {
"navigationBarTitleText": "签约页面" "navigationBarTitleText": "签约页面"
} }
}, },
{ {
"path": "pages/sign/index", "path": "pages/sign/index",
"style": { "style": {
"navigationBarTitleText": "入驻签约" "navigationBarTitleText": "入驻签约"
} }
},
{
"path": "pages/photo/product",
"style": {
"navigationBarTitleText": "扳手会工单规范"
}
},
{
"path": "pages/take/detail",
"style": {
"navigationBarTitleText": "工单详情"
}
}, },
{
"path": "pages/photo/product",
"style": {
"navigationBarTitleText": "扳手会工单规范"
}
},
{
"path": "pages/take/detail",
"style": {
"navigationBarTitleText": "工单详情"
}
},
{ {
"path": "pages/photo/try", "path": "pages/photo/try",
"style": { "style": {
"navigationBarTitleText": "拍照", "navigationBarTitleText": "拍照",
"navigationBarBackgroundColor":"#333333", "navigationBarBackgroundColor": "#333333",
"navigationBarTextStyle":"#FFFFFF", "navigationBarTextStyle": "#FFFFFF",
"disableScroll":true "disableScroll": true
} }
}, },
{ {
"path": "pages/photo/detail", "path": "pages/photo/detail",
"style": { "style": {
"navigationBarTitleText": "图片展示", "navigationBarTitleText": "图片展示",
"navigationBarBackgroundColor":"#333333", "navigationBarBackgroundColor": "#333333",
"navigationBarTextStyle":"#FFFFFF", "navigationBarTextStyle": "#FFFFFF",
"disableScroll":true "disableScroll": true
} }
}, },
...@@ -186,7 +168,7 @@ ...@@ -186,7 +168,7 @@
{ {
...@@ -198,8 +180,8 @@ ...@@ -198,8 +180,8 @@
{ {
"path": "pages/photo/take", "path": "pages/photo/take",
"style": { "style": {
"navigationBarTitleText": "拍照-ljd", "navigationBarTitleText": "拍照-ljd",
"disableScroll":true "disableScroll": true
} }
}, },
...@@ -230,13 +212,13 @@ ...@@ -230,13 +212,13 @@
"navigationBarTitleText": "下载APP" "navigationBarTitleText": "下载APP"
} }
}, },
{ {
"path": "pages/take/index", "path": "pages/take/index",
"style": { "style": {
"navigationBarTitleText": "接单" "navigationBarTitleText": "接单"
} }
}, },
{ {
...@@ -271,7 +253,7 @@ ...@@ -271,7 +253,7 @@
} }
}, },
{ {
"path": "pages/take/rob", "path": "pages/take/rob",
...@@ -302,13 +284,13 @@ ...@@ -302,13 +284,13 @@
"condition": { //模式配置，仅开发期间生效 "condition": { //模式配置，仅开发期间生效
"current": 0, //当前激活的模式(list 的索引项) "current": 0, //当前激活的模式(list 的索引项)
"list": [{ "list": [{
"name": "考试模块", //模式名称 "name": "观看视频", //模式名称
"path": "pages/video/index", //启动页面，必选 "path": "pages/video/index", //启动页面，必选
"query": "" //启动参数，在页面的onLoad函数里面得到 "query": "" //启动参数，在页面的onLoad函数里面得到
},{ // },{
"name": "基本信息", //模式名称 // "name": "基本信息", //模式名称
"path": "pages/settle/base", //启动页面，必选 // "path": "pages/settle/base", //启动页面，必选
"query": "" //启动参数，在页面的onLoad函数里面得到 // "query": "" //启动参数，在页面的onLoad函数里面得到
},{ },{
"name": "资料信息", //模式名称 "name": "资料信息", //模式名称
"path": "pages/settle/file", //启动页面，必选 "path": "pages/settle/file", //启动页面，必选
......
take-order/pages/exam/index.vue
View file @ 445c1574
...@@ -38,13 +38,16 @@ ...@@ -38,13 +38,16 @@
</template> </template>
<script> <script>
import globalData from '@/common/base_url.js'
const systemApiUrl = globalData.systemUrl.apiUrl
export default { export default {
data() { data() {
return { return {
examId:2, examId:2,
userExamId:0, userExamId:0,
userAnswerIds:'', userAnswerIds:'',
isStart:true, isStart:false,
currentNumber:1, currentNumber:1,
currentItem:null, currentItem:null,
isSelect:false, isSelect:false,
...@@ -81,7 +84,7 @@ ...@@ -81,7 +84,7 @@
let that = this let that = this
uni.request({ uni.request({
url: getApp().globalData.domain_Name url:systemApiUrl
+'/wxh-worker-rest/rest/exam' +'/wxh-worker-rest/rest/exam'
+'/serviceRule/userExamInfo/' +'/serviceRule/userExamInfo/'
+getApp().globalData.token +getApp().globalData.token
...@@ -95,10 +98,10 @@ ...@@ -95,10 +98,10 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('获取考试信息 成功') if(!res.data){
console.log(res) return
}
if(res.statusCode==401 || res.statusCode==403 ){ if(res.data.code==401 || res.data.code==403 ){
uni.navigateTo({ uni.navigateTo({
url:'/pages/login/wxlogin' url:'/pages/login/wxlogin'
}) })
...@@ -151,7 +154,7 @@ ...@@ -151,7 +154,7 @@
let that = this let that = this
uni.request({ uni.request({
url: getApp().globalData.domain_Name url: systemApiUrl
+'/wxh-worker-rest/rest/exam' +'/wxh-worker-rest/rest/exam'
+'/serviceRule/' +'/serviceRule/'
+getApp().globalData.token +getApp().globalData.token
...@@ -223,7 +226,7 @@ ...@@ -223,7 +226,7 @@
let that = this let that = this
uni.request({ uni.request({
url: getApp().globalData.domain_Name url: systemApiUrl
+'/wxh-worker-rest/rest/exam' +'/wxh-worker-rest/rest/exam'
+'/serviceRule/next/' +'/serviceRule/next/'
+getApp().globalData.token +getApp().globalData.token
...@@ -369,7 +372,7 @@ ...@@ -369,7 +372,7 @@
if(this.bottomTitle == '完成考试，现在签约'){ if(this.bottomTitle == '完成考试，现在签约'){
uni.navigateTo({ uni.navigateTo({
url:'/pages/sign/index' url:'/pages/settle/sign-contract'
}) })
return return
} }
......
take-order/pages/settle/base.vue
View file @ 445c1574
...@@ -287,8 +287,8 @@ ...@@ -287,8 +287,8 @@
}, },
submitBaseInfo() { submitBaseInfo() {
this.newSubmitBaseInfo() // this.newSubmitBaseInfo()
return // return
const baseInfo = this.baseInfo; const baseInfo = this.baseInfo;
if (!this.checkBaseInfo()) { if (!this.checkBaseInfo()) {
...@@ -305,17 +305,12 @@ ...@@ -305,17 +305,12 @@
const res = this.$u.api.submitSettleBaseInfo(params) const res = this.$u.api.submitSettleBaseInfo(params)
this.saving = false; this.saving = false;
uni.hideLoading() uni.hideLoading()
if (res.status != 200) { if (res) {
uni.showToast({ uni.showToast({
title: res.message, title: '入驻基本信息提交成功',
icon: 'none' icon: 'success'
}); });
return;
} }
uni.showToast({
title: '入驻基本信息提交成功',
icon: 'success'
});
let timer = setTimeout(() => { let timer = setTimeout(() => {
clearTimeout(timer) clearTimeout(timer)
uni.navigateTo({ uni.navigateTo({
...@@ -325,84 +320,84 @@ ...@@ -325,84 +320,84 @@
}, },
newSubmitBaseInfo: function(){ // newSubmitBaseInfo: function(){
const baseInfo = this.baseInfo; // const baseInfo = this.baseInfo;
if (!this.checkBaseInfo()) { // if (!this.checkBaseInfo()) {
return; // return;
} // }
this.saving = true; // this.saving = true;
uni.showLoading({ // uni.showLoading({
title: '加载中' // title: '加载中'
}); // });
const params = { // const params = {
...baseInfo, // ...baseInfo,
} // }
params.service_area = baseInfo.service_area.join(',') // params.service_area = baseInfo.service_area.join(',')
let that = this // let that = this
uni.request({ // uni.request({
url: 'http://rest-u.yunya.com/v1/settled/save-info', // url: 'http://rest-u.yunya.com/v1/settled/save-info',
method: 'POST', // method: 'POST',
data: { // data: {
name: params.name, // name: params.name,
mobile: params.mobile, // mobile: params.mobile,
service_area: params.service_area, // service_area: params.service_area,
working_age: params.working_age, // working_age: params.working_age,
worker_num:params.worker_num, // worker_num:params.worker_num,
address:params.address, // address:params.address,
access_token:getApp().globalData.token // access_token:getApp().globalData.token
}, // },
success: (res) => { // success: (res) => {
uni.hideLoading() // uni.hideLoading()
console.log('提交 入驻信息 成功') // console.log('提交 入驻信息 成功')
console.log(res) // console.log(res)
if(res.statusCode==401){ // if(res.statusCode==401){
uni.navigateTo({ // uni.navigateTo({
url:'/pages/login/wxlogin' // url:'/pages/login/wxlogin'
}) // })
return // return
} // }
if(res.statusCode==200){ // if(res.statusCode==200){
console.log('提交 入驻信息 成功 200') // console.log('提交 入驻信息 成功 200')
uni.showToast({ // uni.showToast({
title: '入驻基本信息提交成功', // title: '入驻基本信息提交成功',
icon: 'success' // icon: 'success'
}); // });
let timer = setTimeout(() => { // let timer = setTimeout(() => {
clearTimeout(timer) // clearTimeout(timer)
uni.navigateTo({ // uni.navigateTo({
url:'/pages/settle/file' // url:'/pages/settle/file'
}) // })
}, 2000) // }, 2000)
}else{ // }else{
uni.showToast({ // uni.showToast({
icon:'none', // icon:'none',
title:res.data.message // title:res.data.message
}) // })
} // }
}, // },
fail: (e) => { // fail: (e) => {
uni.hideLoading() // uni.hideLoading()
uni.showToast({ // uni.showToast({
icon:'none', // icon:'none',
title:'提交入驻信息失败' // title:'提交入驻信息失败'
}) // })
console.log('提交 入驻信息 失败') // console.log('提交 入驻信息 失败')
console.log(e) // console.log(e)
} // }
}) // })
}, // },
}, },
} }
......
take-order/pages/settle/file.vue
View file @ 445c1574
This diff is collapsed.
take-order/pages/settle/index.vue
View file @ 445c1574
...@@ -19,14 +19,25 @@ ...@@ -19,14 +19,25 @@
theme_url:'https://qn-static.banshouhui.com/settle_theme.png', theme_url:'https://qn-static.banshouhui.com/settle_theme.png',
count:8, count:8,
isStop:false, isStop:false,
settledInfo:null,
status:'',
} }
}, },
onLoad(e) { onLoad(e) {
this.startCounting() this.startCounting()
this.getBaseInfo()
}, },
methods: { methods: {
async getBaseInfo(){
const app = getApp()
const callBack = (vm,result)=>{
vm.settledInfo = result
vm.status = result.record.status
}
let settledInfo = await app.getBaseInfo(this,callBack)
this.settledInfo = settledInfo
this.status = settledInfo.record.status
},
startCounting : function () { startCounting : function () {
if(this.isStop){ if(this.isStop){
...@@ -50,6 +61,12 @@ ...@@ -50,6 +61,12 @@
if(!this.isStop){ if(!this.isStop){
return return
} }
if(this.status>=1){
uni.navigateTo({
url:'/pages/settle/prompt'
})
return
}
uni.navigateTo({ uni.navigateTo({
url:'/pages/settle/base' url:'/pages/settle/base'
......
take-order/pages/settle/pay-ensure.vue
View file @ 445c1574
<template> <template>
<view class="content"> <view class="content">
<view class="base-list"> <view class="base-list">
<view class="tips">充电桩安装需缴纳保证金：1000元</view> <view class="title">充电桩安装需缴纳保证金</view>
<view class="tips">你已缴纳金额：0元</view> <view class="price"><text>¥</text>{{settledInfo.record.deposit}}</view>
<view class="tips">充电桩安装需缴纳保证金：1000元待缴金额：1000元</view> <view class="list">
<view class="item u-flex u-row-between">
<view class="txt">您已缴纳金额</view>
<view class="txt">¥ 0.00</view>
</view>
<view class="item u-flex u-row-between">
<view class="txt">待缴纳金额</view>
<view class="txt">¥ {{settledInfo.record.deposit}}</view>
</view>
</view>
<!-- <view class="tips">你已缴纳金额：1000.00元</view>
<view class="tips">充电桩安装需缴纳保证金：1000元待缴金额：1000元</view> -->
</view> </view>
<view class="seat"></view> <view class="seat"></view>
<view class="btn-wrap flex-xc"> <view class="btn-wrap flex-xc">
...@@ -22,10 +33,14 @@ ...@@ -22,10 +33,14 @@
return { return {
saving: false, saving: false,
paySuccess:false, paySuccess:false,
payResult:{
oid:''
},
settledInfo:null,
} }
}, },
onLoad(e) { onLoad(e) {
this.getBaseInfo()
}, },
computed: {}, computed: {},
components: { components: {
...@@ -39,52 +54,82 @@ ...@@ -39,52 +54,82 @@
}) })
}) })
}, },
pending(){ async getBaseInfo(){
const timer = setTimeout(async ()=>{ const app = getApp()
clearTimeout(timer) const callBack = (vm,result)=>{
vm.settledInfo = result
}
let settledInfo = app.globalData.settledInfo
if(settledInfo){
callBack(this,settledInfo)
return
}
await app.getBaseInfo(this,callBack)
},
async pending(){
// const timer = setTimeout(async ()=>{
// clearTimeout(timer)
const params = { const params = {
oid:'2021022310015040247154' ...this.payResult
} }
const res = await this.$u.api.getSettleDepositResult(params); const res = await this.$u.api.getSettleDepositResult(params);
if(!res.status){ if(res.code !== 200){
return return
} }
const payStatus = res.data.status uni.showToast({
switch (parseInt(payStatus)) { title:'支付成功'
case 0: })
this.pending(); let timer = setTimeout(()=>{
break; this.successCallback()
case 1: },3000)
this.paySuccess = true
uni.showToast({ // const payStatus = res.data.status
title:'支付成功', // switch (parseInt(payStatus)) {
icon:'none' // case 0:
}) // this.pending();
this.successCallback() // break;
break; // case 1:
default: // this.paySuccess = true
this.paySuccess = false // uni.showToast({
} // title:'支付成功',
clearTimeout(timer) // icon:'none'
},1000) // })
// this.successCallback()
// break;
// default:
// this.paySuccess = false
// }
// },1000)
}, },
async paySubmit() { async paySubmit() {
codeApiUrl const self = this
this.saving = true this.saving = true
uni.showLoading({ uni.showLoading({
title:'支付中……' title:'支付中……'
}) })
// 提交支付订单 // 提交支付订单
const params = { const params = {
oid: 2, oid: this.settledInfo.record.id,
type: 'wx', type: 'wx',
} }
// const codeApiUrl = globalUrl.codeUrl.apiUrl; // const codeApiUrl = globalUrl.codeUrl.apiUrl;
const res = await this.$u.api.paySettleDeposit(params) const response = await this.$u.api.paySettleDeposit(params)
// const url = codeApiUrl+'/v1/settled/pay-deposit'; uni.showModal({
// const res = await this.$u.post(url, params,{'content-type': 'application/x-www-form-urlencoded'}) title: '提示',
this.pending() content: '支付成功',
if (!res.status) { confirmText:'成功',
cancelText:'失败',
success: function (res) {
if (res.confirm) {
console.log(res.confirm,'res.confirm')
self.pending()
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
if (!response.status) {
uni.showToast({ uni.showToast({
title: '支付调用失败，请稍后重试', title: '支付调用失败，请稍后重试',
icon:'none' icon:'none'
...@@ -92,8 +137,10 @@ ...@@ -92,8 +137,10 @@
return return
} }
const { const {
charge charge,
} = res.data; oid
} = response.data;
this.payResult.oid = oid
//Web 与微信内支付 //Web 与微信内支付
pingpp.createPayment(charge, (result, err) => { pingpp.createPayment(charge, (result, err) => {
if (result == "success") { if (result == "success") {
...@@ -125,7 +172,43 @@ ...@@ -125,7 +172,43 @@
<style lang="scss"> <style lang="scss">
.base-list { .base-list {
text-align: center;
.txt{
line-height: 50rpx;
font-size:36rpx;
color: #333;
}
.title{
margin-top:120rpx;
font-weight: bold;
line-height: 50rpx;
font-size:36rpx;
color: #333;
}
.price{
margin-top:120rpx;
font-weight: bold;
line-height: 90rpx;
font-size:64rpx;
color: #333;
text{
font-size:32rpx;
}
}
.list{
margin-top:200rpx;
padding:0 50rpx;
.item{
padding:28rpx 0;
border-bottom: 1rpx solid #FDFDFD;
}
.txt{
line-height: 44rpx;
font-size:32rpx;
color: #333;
}
}
.tips { .tips {
margin-top: 20rpx; margin-top: 20rpx;
padding: 0 30rpx; padding: 0 30rpx;
...@@ -151,6 +234,7 @@ ...@@ -151,6 +234,7 @@
.btn-submit { .btn-submit {
width: 600rpx; width: 600rpx;
border-radius: 52rpx;
// left: 5%; // left: 5%;
// bottom: px2rem(36); // bottom: px2rem(36);
height: 104rpx; height: 104rpx;
......
take-order/pages/settle/prompt.vue
View file @ 445c1574
<template> <template>
<view class="container u-row-between" v-if="info"> <view class="container u-row-between" v-if="info">
<view class="u-flex u-row-center">
<image class="icon" src="@/static/settle/icon-prompt.png"></image>
</view>
<view class="txt-box"> <view class="txt-box">
<text class="title" v-for="txt in info.txtArr">{{txt}}</text> <text :class="['title',index ? 'active' : '']" v-for="(txt,index) in info.txtArr">{{txt}}</text>
</view>
<view class="tips-box" v-if="info.tipsArr">
<text :class="['tips',info.tipsArr.length>1 && index===0 ? 'red' : '']" v-for="(txt,index) in info.tipsArr">{{txt}}</text>
</view> </view>
<button class="btn-submit" @click="goPage(info.url)">{{info.btnTxt}}</button> <button class="btn-submit" @click="goPage(info.url)">{{info.btnTxt}}</button>
</view> </view>
...@@ -11,42 +17,62 @@ ...@@ -11,42 +17,62 @@
export default { export default {
data() { data() {
return { return {
settledInfo:null,
promptList:[{ promptList:[{
stepName:'step1', status:1,
txtArr:['你已通过充电桩安装入驻审核！','在培训学习后，可以正式签约了！'], statusName:'待审核',
txtArr:['你已成功提交资料','正在审核中'],
btnTxt:'去接单广场逛逛',
url:'/pages/exam/index'
},{
status:2,
statusName:'已通过',
txtArr:['你已通过','“充电桩安装入驻审核”'],
btnTxt:'去培训学习', btnTxt:'去培训学习',
url:'/pages/exam/index' url:'/pages/exam/index'
},{ },{
stepName:'step2', status:3,
txtArr:['你已成为充电桩安装备选服务商！','后续如有业务，请留意通知！'], statusName:'备选',
txtArr:['你已成为',"“充电桩安装备选服务商”"],
tipsArr:['后续如有业务，请留意通知！'],
btnTxt:'去接单广场逛逛', btnTxt:'去接单广场逛逛',
url:'/pages/take/index' url:'/pages/take/index'
},{ },{
stepName:'step3', status:4,
txtArr:['你的入驻资料已被驳回！可重新提交资料！','理由：图片不够清晰！'], statusName:'已驳回',
txtArr:['你的入驻资料已被驳回！','可重新提交资料！'],
tipsArr:['原因：','图片不够清楚'],
btnTxt:'重新提交', btnTxt:'重新提交',
url:'/pages/settle/file' url:'/pages/settle/file'
},{ },{
stepName:'step4', status:5,
txtArr:['你已通过充电桩安装入驻审核！','可以正式签约了！'], statusName:'step4',
txtArr:['你已通过','“充电桩安装入驻考试”'],
tipsArr:['可以正式签约了'],
btnTxt:'去签约', btnTxt:'去签约',
url:'/pages/settle/file' url:'/pages/settle/sign-contract'
},{ },{
stepName:'step5', status:6,
txtArr:['你已成为充电桩安装签约服务商！','请缴纳1000元质保金'], statusName:'未支付保证金',
txtArr:['你已成为',"充电桩安装的签约服务商"],
tipsArr:['请缴纳1000元质保金'],
btnTxt:'去缴纳保证金', btnTxt:'去缴纳保证金',
url:'/pages/settle/pay-ensure' url:'/pages/settle/pay-ensure'
},{ },{
stepName:'step6', status:7,
txtArr:['你已成为充电桩安装的正式服务商！'], statusName:'已支付保证金',
txtArr:['你已成为',"充电桩安装的正式服务商"],
btnTxt:'去接单广场逛逛', btnTxt:'去接单广场逛逛',
url:'/pages/take/index' url:'/pages/take/index'
}], }],
info:null // 入驻状态:1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金'
status:'',
info:null,
} }
}, },
onLoad(e) { onLoad(e) {
this.initInfo(e) this.getBaseInfo()
}, },
computed: { computed: {
}, },
...@@ -54,19 +80,35 @@ ...@@ -54,19 +80,35 @@
}, },
methods: { methods: {
initInfo(option){ async getBaseInfo(){
let info const app = getApp()
if(option.promptType){ const callBack = (vm,result)=>{
const infoArr = this.promptList.filter(item=>{ vm.settledInfo = result
item.stepName===option.promptType vm.status = result.record.status
}) }
info = infoArr.length>0 && infoArr[0] let settledInfo = await app.getBaseInfo(this,callBack)
}else{ this.settledInfo = settledInfo
info = this.promptList[0] this.status = settledInfo.record.status
uni.hideLoading()
console.log(settledInfo,'settledInfo')
this.initInfo(settledInfo.record)
},
initInfo(record){
if(!record){
this.info = this.promptList[0]
return
}
const status = record.status
const infoArr = this.promptList.filter(item=>{
return parseInt(item.status)===status
})
const info = infoArr.length>0 && infoArr[0]
if(status===6){
info.txtArr[1] = '请缴纳'+ this.settledInfo.record.deposit +'元质保金'
} }
this.info = info this.info = info
}, },
gopage(url) { goPage(url) {
uni.navigateTo({ uni.navigateTo({
url, url,
}); });
...@@ -77,27 +119,53 @@ ...@@ -77,27 +119,53 @@
<style lang="scss"> <style lang="scss">
.container{ .container{
display: flex;
width:750rpx; width:750rpx;
height:500rpx; // height:500rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.icon{
margin-top:180rpx;
width:316rpx;
height:312rpx
}
.txt-box{ .txt-box{
margin-top:100rpx; margin-top:112rpx;
} }
.title{ .title{
display: block; display: block;
font-weight: bold;
margin-top: 20rpx; margin-top: 20rpx;
padding: 0 30rpx; // padding: 0 30rpx;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
line-height: 40rpx; line-height: 66rpx;
font-size: 28rpx; font-size: 48rpx;
color: #333;
&.active{
color:#2272FF
}
}
.tips-box{
margin-top:32rpx;
text-align: center;
}
.tips{
text-align: center;
line-height: 44rpx;
font-size: 32rpx;
color: #666; color: #666;
&.red{
color:red;
}
} }
.btn-submit { .btn-submit {
margin-top:112rpx;
width: 600rpx; width: 600rpx;
height: 104rpx; height: 104rpx;
line-height: 104rpx; line-height: 104rpx;
border-radius: 52rpx;
background: #2272ff; background: #2272ff;
font-size: 32rpx; font-size: 32rpx;
color: #fff; color: #fff;
......
take-order/pages/settle/select.vue
View file @ 445c1574
...@@ -272,32 +272,28 @@ ...@@ -272,32 +272,28 @@
code: code code: code
} }
const res = await this.$u.api.getSettleArea(params) const res = await this.$u.api.getSettleArea(params)
console.log('res:')
console.log(res)
console.log('res.statusCode:')
console.log(res.statusCode)
console.log('level:')
console.log(level)
uni.hideLoading() uni.hideLoading()
// if (res.status != 200) { if (res.code != 200) {
// return; uni.showToast({
// } title:res.message,
icon:'none'
})
return;
}
if (!res) { if (!res) {
return; return;
} }
if (!level) { if (!level) {
console.log('res.data:')
console.log(res.data)
// this.areaList = res.data // this.areaList = res.data
// const parmas = [res.data[0].id, 1] // const parmas = [res.data[0].id, 1]
this.areaList = res this.areaList = res.data
const parmas = [res[0].id, 1] const parmas = [res.data[0].id, 1]
this.getareaList(...parmas) this.getareaList(...parmas)
} else { } else {
// this.$set(areaList[provinceIndex], 'children', res.data) // this.$set(areaList[provinceIndex], 'children', res.data)
this.$set(areaList[provinceIndex], 'children', res) this.$set(areaList[provinceIndex], 'children', res.data)
} }
}, },
......
take-order/pages/settle/sign-contract.vue
View file @ 445c1574
<template> <template>
<view class="content"> <view class="content">
<view class="title">入驻基本信息</view> <view class="title">签约页面</view>
<view class="base-list"> <view class="base-list">
<view class="item item-input flex-yc"> <view class="item item-input flex-yc">
<label class="label">签约人</label> <label class="label">签约人</label>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
name:'支付宝', name:'支付宝',
value:'alipay' value:'alipay'
}], }],
info:{}, settledInfo:{},
saving: false, saving: false,
} }
}, },
...@@ -212,36 +212,21 @@ ...@@ -212,36 +212,21 @@
// return true // return true
// }, // },
async getBaseInfo(){ async getBaseInfo(){
// uni.request({ const app = getApp()
// url: codeApiurl + '/v1/settled/get-settled-info?access-token='+this.token, const callBack = (vm,result)=>{
// method: 'GET', vm.settledInfo = result
// data: {}, const record = result.record
// success: (res) => {
// console.log(res,'res') vm.baseInfo.name = record.id_card_name
// if (res.status != 200) { vm.baseInfo.id = record.id
// uni.showToast({
// title: res.message,
// icon: 'none'
// });
// return;
// }
// console.log(res,'res')
// }
// })
const res = await this.$u.api.getSettleBaseInfo()
console.log(res,'res')
if (!res.status) {
uni.showToast({
title: res.message,
icon: 'none'
});
return;
} }
this.info = res.data.record let settledInfo = app.globalData.settledInfo
// this.baseInfo.name = this.info.name if(settledInfo){
this.baseInfo.id = this.info.id callBack(this,settledInfo)
console.log(this.info,'res') return
return true }
await app.getBaseInfo(this,callBack)
}, },
async submitInfo(){ async submitInfo(){
// checkSettleSignInfo // checkSettleSignInfo
...@@ -249,17 +234,17 @@ ...@@ -249,17 +234,17 @@
const params = { const params = {
...baseInfo, ...baseInfo,
} }
console.log(params.pay_type,'params.pay_type')
if(params.pay_type==='alipay'){ if(params.pay_type==='alipay'){
params.bank_site = '支付宝' params.bank_site = '支付宝'
} }
const res = this.$u.api.checkSettleSignInfo(params) const res = await this.$u.api.checkSettleSignInfo(params)
if (res.status != 200) { console.log(res,'res')
if (res.code != 200) {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
icon: 'none' icon: 'none'
}); });
return; return false;
} }
return true return true
}, },
...@@ -289,7 +274,11 @@ ...@@ -289,7 +274,11 @@
title: '加载中' title: '加载中'
}); });
const result = await this.submitInfo() const result = await this.submitInfo()
console.log(result) if(!result){
this.saving = false;
return
}
this.goSign()
// const requestArr = ['submitBaseInfo','jumpSign'] // const requestArr = ['submitBaseInfo','jumpSign']
// for(let i=0;i<requestArr.length;i++){ // for(let i=0;i<requestArr.length;i++){
// const result = await this[requestArr[i]]() // const result = await this[requestArr[i]]()
...@@ -298,27 +287,26 @@ ...@@ -298,27 +287,26 @@
// break; // break;
// } // }
// } // }
this.saving = false;
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
title: '入驻基本信息提交成功', title: '入驻基本信息提交成功',
icon: 'success' icon: 'success'
}); });
let timer = setTimeout(() => { // let timer = setTimeout(() => {
clearTimeout(timer) // clearTimeout(timer)
uni.navigateTo({ // uni.navigateTo({
url:'/pages/settle/file' // url:'/pages/settle/file'
}) // })
}, 2000) // }, 2000)
}, },
async goSign(){ async goSign(){
const token = 'RTOKEN49eac6c2979528824a4d5a7b09c221fa954c70ce'; const token = app.globalData.token;
const info = this.info const settledInfo = this.settledInfo
const params = { const params = {
namePsn:'郭小清', namePsn:settledInfo.record.id_card_name,
idNumberPsn:'43072219800123456', idNumberPsn:settledInfo.record.id_card_number,
province:'湖南省', province:settledInfo.provinceList.join(','),
city:'长沙市' city:settledInfo.cityList.join(','),
} }
// const params = { // const params = {
// namePsn:info.id_card_name, // namePsn:info.id_card_name,
...@@ -327,6 +315,7 @@ ...@@ -327,6 +315,7 @@
// city:'长沙市' // city:'长沙市'
// } // }
const res = await this.$u.post(globalUrl.systemUrl.apiUrl + '/wxh-worker-rest/rest/third/'+token+'/wuKong/sign',params,{'content-type': 'application/x-www-form-urlencoded'}) const res = await this.$u.post(globalUrl.systemUrl.apiUrl + '/wxh-worker-rest/rest/third/'+token+'/wuKong/sign',params,{'content-type': 'application/x-www-form-urlencoded'})
console.log(res,'res')
if(res.code!==200){ if(res.code!==200){
uni.showToast({ uni.showToast({
title:'跳转签约失败', title:'跳转签约失败',
...@@ -334,6 +323,7 @@ ...@@ -334,6 +323,7 @@
}) })
return return
} }
this.saving = false;
const url = res.data const url = res.data
uni.navigateTo({ uni.navigateTo({
url:'/pages/settle/web?url='+url url:'/pages/settle/web?url='+url
......
take-order/pages/video/index.vue
View file @ 445c1574
...@@ -27,12 +27,14 @@ ...@@ -27,12 +27,14 @@
</template> </template>
<script> <script>
import globalData from '@/common/base_url.js'
const xueApiUrl = globalData.ucenterUrl.xueUrl
export default { export default {
data() { data() {
return { return {
icon_arrow_right:'', icon_arrow_right:'',
dataList:[], dataList:[],
course_id:172, course_id:281,
section_id:0, section_id:0,
jumpUrl:'https://m.banshouhui.com/xue/course/section/', jumpUrl:'https://m.banshouhui.com/xue/course/section/',
} }
...@@ -72,7 +74,7 @@ ...@@ -72,7 +74,7 @@
let that = this let that = this
uni.request({ uni.request({
url: 'http://rest-xue.yunya.com/v1/chapter-sections' url: xueApiUrl + '/v1/chapter-sections'
+'?course_id=' + this.course_id, +'?course_id=' + this.course_id,
method: 'GET', method: 'GET',
data: { data: {
......
take-order/pages/video/section.vue
View file @ 445c1574
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
</template> </template>
<script> <script>
import globalData from '@/common/base_url.js'
const xueApiUrl = globalData.ucenterUrl.xueUrl
export default { export default {
data() { data() {
return { return {
......
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