diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 9d294c0..e4f5899 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -19,8 +19,8 @@ const install = (Vue, vm) => {
// },
// });
Vue.prototype.$u.http.setConfig({
- baseUrl: 'http://192.168.2.15:10002',
- // baseUrl: 'https://kg.chuangtewl.com/prod-api',
+ // baseUrl: 'http://192.168.2.15:10002',
+ baseUrl: 'https://kg.chuangtewl.com/prod-api',
// loadingText: '加载中...',
// loadingTime: 1000,
// 设置自定义头部content-type
diff --git a/page_components/shiming.vue b/page_components/shiming.vue
index 6d03d62..b5fb0d5 100644
--- a/page_components/shiming.vue
+++ b/page_components/shiming.vue
@@ -3,10 +3,10 @@
<u-navbar :custom-back="btnback" title="实名认证" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff'
title-size='36' height='44'></u-navbar>
<!-- 未有实名认证 -->
- <view class="">
+ <view class="" v-if="flags">
<view class="listval">
<view class="tit"> 真实姓名</view>
- <view class="but"> <input type="text" placeholder="请输入真实姓名" v-model="name" /> </view>
+ <view class="but"> <input type="text" placeholder="请输入真实姓名" v-model="name"/> </view>
</view>
<view class="listval">
<view class="tit"> 身份证号</view>
@@ -22,10 +22,29 @@
提现需实名认证，请输入真实有效实名信息！
</view>
</view>
+ <view class="" v-else>
+ <view class="listval">
+ <view class="tit"> 真实姓名</view>
+ <view class="but"> <input type="text" placeholder="请输入真实姓名" disabled="true" v-model="name"/> </view>
+ </view>
+ <view class="listval">
+ <view class="tit"> 身份证号</view>
+ <view class="but"> <input type="text" placeholder="请输入身份证号" disabled="true" v-model="names" /> </view>
+ </view>
+ <view class="listval">
+ <view class="yz" v-if="yzflag">
+ </view>
+ <view class="yz" v-else>
+ </view>
+ </view>
+ <view class="" style="width: 100%;margin-top: 50rpx;color: red;text-align: center;">
+ 提现需实名认证，请输入真实有效实名信息！
+ </view>
+ </view>
<!-- 已有实名认证 -->
- <view class="baocun" v-if="flag">
+ <view class="baocun" @click="btnyanz" v-if="flag">
进行人脸验证
</view>
<view class="baocun" @click="btnyz" v-else>
@@ -48,11 +67,15 @@
names: '',
tel: '',
flag: false,
- yzflag: true
+ yzflag: true,
+ type:'',
+ user:{},
+ flags:false
}
},
- onLoad() {
-
+ onLoad(option) {
+ this.type = option.type
+ this.getuserinfo()
},
// 分享到好友（会话）
onShareAppMessage: function() {
@@ -71,23 +94,54 @@
}
},
methods: {
- btnback(){
- uni.reLaunch({
- url:'/page_user/yetx'
+ getuserinfo() {
+ this.$u.get("/app/user/userInfo").then((res) => {
+ if (res.code == 200) {
+ this.name = res.data.realName
+ this.names = res.data.realIdCard
+ if(res.data.isReal == true){
+ this.flags = false
+ this.flag = true
+ }else{
+ this.flags = true
+ this.flag = false
+ }
+ }
})
},
- btnyz() {
- this.flag = true
- let data = {
- realName: this.name,
- realIdCard: this.names,
- // realPhone: this.tel
- }
- this.$u.put('/app/user/realName', data).then(res => {
+
+ // 直接进行验证
+ btnyanz(){
+ this.$u.put("/app/user/riskRealName").then((res) => {
+ if (res.code == 200) {
+ let https = encodeURIComponent(res.data.jumpUrl)
+ uni.navigateTo({
+ url: '/pages/sjshiming?https=' + https
+ })
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ },
+
+ btnback(){
+ uni.reLaunch({
+ url:'/page_user/yetx'
+ })
+ },
+ btnyz() {
+ let data = {
+ realName: this.name,
+ realIdCard: this.names,
+ type:this.type
+ }
+ this.$u.put('/app/user/realName', data).then(res => {
if (res.code == 200) {
- this.flag = false
let https = encodeURIComponent(res.data.jumpUrl)
- console.log(https);
uni.navigateTo({
url: '/pages/sjshiming?https=' + https
})
@@ -97,7 +151,6 @@
icon: 'none',
duration: 2000
})
- this.flag = false
}
})
}
diff --git a/page_fenbao/statulist/taocanlist/addtaocan/index.vue b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
index a656359..b84c59a 100644
--- a/page_fenbao/statulist/taocanlist/addtaocan/index.vue
+++ b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
@@ -84,20 +84,13 @@
</view>
</view>
- <view class="" style="display: flex;justify-content: space-between;margin-bottom: 20rpx;">
- <view class="feems" v-if="jeflag" style="display: block;">
- <view class="feelt" style="margin-bottom: 10rpx;">
- 单价
+ <view class="" style="display: flex;margin-bottom: 20rpx;width: 100%;">
+ <view class="feemss" v-if="gmsjflag" style="max-width: 380rpx;box-sizing: border-box;margin-top: 6rpx;">
+ <view class="feelt" style="display: block;display: flex;align-items: center;">
+ <!-- <text class="txt" style="width: 60rpx;margin-bottom: 10rpx;">时间</text> -->
+ <text style="margin-right: 20rpx;">单价</text> <text style="margin-right: 10rpx;">每</text> <input style="display: inline-block;" type="number" v-model="duvalue" /> <text>{{timetxt}}</text>
</view>
- <view class="feert" style="width: 100%;">
- <input type="text" class="yj" v-model="qianvalue" /> <text>元</text>
- </view>
- </view>
- <view class="feemss" v-if="gmsjflag" style="max-width: 430rpx;padding-left: 50rpx;box-sizing: border-box;">
- <view class="feelt" style="display: block;">
- <text class="txt" style="width: 60rpx;margin-bottom: 10rpx;">时间</text> <input type="number" v-model="duvalue" />
- </view>
- <view class="feert" style="margin-top: 80rpx;margin-left: 0;">
+ <view class="feert" style="margin-left: 0;padding-left: 80rpx;">
<view class="">
<u-radio-group v-model="valuethr" @change="radioGroupChangetime">
<u-radio @change="radioChangetime" v-for="(item, index) in gmsj" :key="index"
@@ -108,17 +101,27 @@
</view>
</view>
</view>
- <view class="feems" v-if="duflag" style="display: block;padding-left: 50rpx;box-sizing: border-box;">
- <view class="feelt" style="margin-bottom: 10rpx;">
+ <view class="feems" v-if="duflag" style="display: block;box-sizing: border-box;width: 360rpx;">
+ <!-- <view class="feelt" style="margin-bottom: 10rpx;">
购买度数
- </view>
+ </view> -->
<view class="feert">
- <input type="text" class="yj" v-model="duvalue" /> <text>度</text>
+ <text style="margin-right: 20rpx;">单价</text> <text style="margin-right: 10rpx;">每</text> <input type="text" class="yj" v-model="duvalue" /> <text>度</text>
</view>
</view>
+ <view class="feems" v-if="jeflag" style="display: block;">
+ <!-- <view class="feelt" style="margin-bottom: 10rpx;">
+ 单价
+ </view> -->
+ <view class="feert" style="width: 100%;">
+ <input type="text" class="yj" v-model="qianvalue" /> <text>元</text>
+ </view>
+ </view>
+
+
</view>
- <text style="font-size: 24rpx;color: #999;">消费金额为单价的倍数，结束订单后将返回剩余预存款</text>
+ <text style="font-size: 24rpx;color: red;">消费金额为单价的倍数，结束订单后将返回剩余预存款</text>
</view>
<view class="batterybox" v-if="djflag">
<view class="dianj">
@@ -405,6 +408,7 @@
}
],
index: 2,
+ timetxt:'',
timewz: '',
arrflag: false,
bgc: {
@@ -746,10 +750,13 @@
radioChangetime(e) {
if (e == '时') {
this.timeUnit = 2
+ this.timetxt = '时'
} else if (e == '分') {
this.timeUnit = 3
+ this.timetxt = '分'
} else {
this.timeUnit = 4
+ this.timetxt = '秒'
}
},
// 选中任一radio时，由radio-group触发
diff --git a/page_user/mapditu/orderxq.vue b/page_user/mapditu/orderxq.vue
index a45d0fb..4fda70b 100644
--- a/page_user/mapditu/orderxq.vue
+++ b/page_user/mapditu/orderxq.vue
@@ -199,7 +199,18 @@
setTimeout(()=>{
this.getlist()
},1000)
- }else{
+ }else if(res.code == 102002){
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ setTimeout(()=>{
+ uni.navigateTo({
+ url: '/page_components/shiming?type=' + 2
+ })
+ },1000)
+ } else{
uni.showToast({
title: res.msg,
icon: 'none',
diff --git a/page_user/yetx.vue b/page_user/yetx.vue
index c4da119..f39b698 100644
--- a/page_user/yetx.vue
+++ b/page_user/yetx.vue
@@ -20,7 +20,7 @@
</view>
</view>
<view class="input_box">
- <view class="yuan">
+ <view class="yuan">
￥
</view>
<view class="ipt">
@@ -256,8 +256,19 @@
this.btnmsk = false
}else if(res.code == 10001){
uni.navigateTo({
- url: '/page_components/shiming'
+ url: '/page_components/shiming?type=' + 1
})
+ }else if(res.code == 102001){
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ setTimeout(()=>{
+ uni.navigateTo({
+ url: '/page_components/shiming?type=' + 2
+ })
+ },1000)
}else {
uni.showToast({
title: res.msg,