Commit 0d98c893 authored by 罗林杰's avatar 罗林杰

修改bug

parent ddcb3313
{ {
"name" : "OUJILI", "name" : "SSS",
"appid" : "__UNI__54B4AA0", "appid" : "__UNI__54B4AA0",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</view> </view>
</view> </view>
</u-popup> </u-popup>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM> <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" confirmName="认证" @confirm="confirm"></ELM>
</z-paging-swiper> </z-paging-swiper>
</template> </template>
......
...@@ -349,7 +349,7 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article"; ...@@ -349,7 +349,7 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article";
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: '获取手机号失败', title: '获取手机号失败',
icon: 'error' icon: 'none'
}) })
return; return;
} }
...@@ -538,7 +538,7 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article"; ...@@ -538,7 +538,7 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article";
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
title: '授权成功', title: '授权成功',
icon: 'success' icon: 'none'
}); });
}).catch(err => { }).catch(err => {
console.log('err:',err) console.log('err:',err)
......
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
</view> </view>
</view> </view>
</view> </view>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" confirmName="认证" @confirm="confirm"></ELM>
</view> </view>
</template> </template>
...@@ -116,9 +117,11 @@ ...@@ -116,9 +117,11 @@
import UText from "../../uni_modules/uview-ui/components/u--text/u--text"; import UText from "../../uni_modules/uview-ui/components/u--text/u--text";
import {rankList} from "../../api/user"; import {rankList} from "../../api/user";
import {getOssUrl} from "../../api/article"; import {getOssUrl} from "../../api/article";
import ELM from '@/components/elm-toast/index.vue';
export default { export default {
components: { components: {
UText, UText,
ELM
}, },
data() { data() {
return { return {
...@@ -147,6 +150,8 @@ export default { ...@@ -147,6 +150,8 @@ export default {
key:1, key:1,
bgColor: '#F4F5F9', bgColor: '#F4F5F9',
rankList: [], rankList: [],
tipMsg: '',
isConfirm: false,
} }
}, },
onShow() { onShow() {
...@@ -208,16 +213,21 @@ export default { ...@@ -208,16 +213,21 @@ export default {
//跳转用户详情 //跳转用户详情
gotoDetail(item){ gotoDetail(item){
if (uni.getStorageSync('userInfo').memRealAuthen != '1'){ if (uni.getStorageSync('userInfo').memRealAuthen != '1'){
uni.showToast({ this.tipMsg = '当前用户未实名,请先实名认证';
title: '请先认证', this.isConfirm = true;
icon: 'none' this.$refs.elm.showDialog();
})
return return
} }
uni.navigateTo({ uni.navigateTo({
url: '/pagesUser/userInfo?memberId='+item.businessId url: '/pagesUser/userInfo?memberId='+item.businessId
}) })
} },
confirm() {
this.isConfirm = false;
uni.navigateTo({
url: "/pagesme/me/doubleauth"
})
},
} }
} }
</script> </script>
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</view> </view>
</view> </view>
</u-popup> </u-popup>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM> <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" confirmName="认证" @confirm="confirm"></ELM>
</view> </view>
</template> </template>
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
</view> </view>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM> <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" confirmName="认证" @confirm="confirm"></ELM>
<ELM ref="elmReject" :msg="tipMsg" :isConfirm="isRejectConfirm" :isCancel="false" @confirm="rejectConfirm"></ELM> <ELM ref="elmReject" :msg="tipMsg" :isConfirm="isRejectConfirm" :isCancel="false" @confirm="rejectConfirm"></ELM>
</view> </view>
</template> </template>
......
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
if (res.data.code == 200){ if (res.data.code == 200){
uni.showToast({ uni.showToast({
title: '发表成功', title: '发表成功',
icon: 'success' icon: 'none'
}) })
uni.setStorageSync("isRefresh", true) uni.setStorageSync("isRefresh", true)
setTimeout(() => { setTimeout(() => {
......
...@@ -120,6 +120,23 @@ export default { ...@@ -120,6 +120,23 @@ export default {
} }
}) })
} }
//处理动态照片
if (item.pictureId != null){
const urlArray = JSON.parse(item.pictureId)
console.log('urlArray.id:',urlArray.id)
if (urlArray.id.length>0){
let arr = []
urlArray.id.forEach(item => {
getOssUrl(item).then(imgRes => {
if (imgRes.data.data != null) {
imgRes.data.data = imgRes.data.data.replace(/\\/g, "/");
arr.push(imgRes.data.data)
}
})
})
item.url = arr
}
}
//处理性别 //处理性别
if (item.memSex !== null && item.memSex !== ''){ if (item.memSex !== null && item.memSex !== ''){
item.memSex = getValue('sex',item.memSex) item.memSex = getValue('sex',item.memSex)
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</view> </view>
</view> </view>
</z-paging> </z-paging>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM> <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" confirmName="认证" @confirm="confirm"></ELM>
</view> </view>
</template> </template>
......
...@@ -149,12 +149,12 @@ import {addFeedBack, updateUser} from "../../api/user"; ...@@ -149,12 +149,12 @@ import {addFeedBack, updateUser} from "../../api/user";
if (res.data.code === 200){ if (res.data.code === 200){
uni.showToast({ uni.showToast({
title: '提交成功', title: '提交成功',
icon: 'success' icon: 'none'
}) })
} else{ } else{
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
icon: 'info' icon: 'none'
}) })
} }
//延迟1s //延迟1s
......
...@@ -39,34 +39,32 @@ ...@@ -39,34 +39,32 @@
<image class="pop-bgc" :src="baseUrl + '/common/home-pop-bg.png'"></image> <image class="pop-bgc" :src="baseUrl + '/common/home-pop-bg.png'"></image>
<view class="divss"> <view class="divss">
<view class="namne">提示</view> <view class="namne">提示</view>
<view class="namnes">充值成功,请等待倒计时结束确认是否到账</view> <view class="namnes">充值成功,预计10秒钟后到账</view>
<u-count-down <u-count-down
:time="60000" :time="10000"
format="mm:ss" format="mm:ss"
:auto-start="true" :auto-start="true"
@finish="finish"
@change="updateTimeData" @change="updateTimeData"
> >
<view class="time"> <view class="time">
<view class="time__custom"> <text class="time__doc"></text>
<text class="time__custom__item">{{ showMinutes }}</text>
</view>
<text class="time__doc">:</text>
<view class="time__custom"> <view class="time__custom">
<text class="time__custom__item">{{ showSeconds }}</text> <text class="time__custom__item">{{ showSeconds }}</text>
</view> </view>
</view> </view>
</u-count-down> </u-count-down>
<view class="button" v-if="timeFinish" @click="confirm">确认</view> <view class="button" @click="confirm">确认</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" confirmName="认证" @confirm="leauthConfirm"></ELM>
</view> </view>
</template> </template>
<script> <script>
import {getBalance, payGoldCoins} from "../../api/user"; import {getBalance, payGoldCoins} from "../../api/user";
import {addApplication, pay} from "../../api/activity"; import {addApplication, pay} from "../../api/activity";
import ELM from '@/components/elm-toast/index.vue';
let iapChannel = null // 苹果内部支付渠道 let iapChannel = null // 苹果内部支付渠道
export default { export default {
...@@ -95,18 +93,17 @@ export default { ...@@ -95,18 +93,17 @@ export default {
//图片路径 //图片路径
baseUrl: this.$IMG_URL, baseUrl: this.$IMG_URL,
timeData: { // 时间数据对象 timeData: { // 时间数据对象
minutes: '00',
seconds: '00' seconds: '00'
}, },
show:false, show:false,
timeFinish: false, tipMsg: '',
isConfirm: false,
} }
}, },
computed: { components: {
// 格式化分钟显示(补零) ELM
showMinutes() {
return String(this.timeData.minutes).padStart(2, '0')
}, },
computed: {
// 格式化秒数显示(补零) // 格式化秒数显示(补零)
showSeconds() { showSeconds() {
return String(this.timeData.seconds).padStart(2, '0') return String(this.timeData.seconds).padStart(2, '0')
...@@ -172,7 +169,7 @@ export default { ...@@ -172,7 +169,7 @@ export default {
success(res) { success(res) {
uni.showToast({ uni.showToast({
title: '支付成功', title: '支付成功',
icon: 'success' icon: 'none'
}) })
this.show = false this.show = false
uni.navigateTo({ uni.navigateTo({
...@@ -202,10 +199,9 @@ export default { ...@@ -202,10 +199,9 @@ export default {
this.show = true this.show = true
} }
} else if(res.data.code !== 200){ } else if(res.data.code !== 200){
uni.showToast({ this.tipMsg = '当前用户未实名,请先实名认证';
title: res.data.message, this.isConfirm = true;
icon: 'none' this.$refs.elm.showDialog();
})
} }
}) })
}, },
...@@ -218,13 +214,15 @@ export default { ...@@ -218,13 +214,15 @@ export default {
updateTimeData(time) { updateTimeData(time) {
this.timeData = time this.timeData = time
}, },
finish(){
this.timeFinish = true
this.getCoinBalance()
},
confirm(){ confirm(){
this.show = false this.show = false
} },
leauthConfirm() {
this.isConfirm = false;
uni.navigateTo({
url: "/pagesme/me/doubleauth"
})
},
} }
} }
</script> </script>
...@@ -464,7 +462,6 @@ export default { ...@@ -464,7 +462,6 @@ export default {
margin-top: 4px; margin-top: 4px;
width: 22px; width: 22px;
height: 22px; height: 22px;
background-color: $u-primary;
border-radius: 4px; border-radius: 4px;
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
display: flex; display: flex;
...@@ -473,8 +470,8 @@ export default { ...@@ -473,8 +470,8 @@ export default {
align-items: center; align-items: center;
&__item { &__item {
color: #fff; color: #2f3031;
font-size: 12px; font-size: 18px;
text-align: center; text-align: center;
} }
} }
......
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
if (event.detail.data[0] === 'T'){ if (event.detail.data[0] === 'T'){
uni.showToast({ uni.showToast({
title: '认证成功', title: '认证成功',
icon: 'success' icon: 'none'
}) })
} else { } else {
//认证不通过 //认证不通过
......
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