wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复以及页面调整

Browse Source
version/0412
shuxiaoquan 9 months ago
parent a62a964b98
commit 12ea9433a9
4 changed files with 48 additions and 33 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 27
      pages/login/index.vue
  2. 19
      pages/news/recycling/order.vue
  3. 18
      pages/news/recycling/orderDetail.vue
  4. 17
      pages/user/index.vue

27
pages/login/index.vue
Unescape View File

@ -18,7 +18,7 @@
<view class="b"> <view class="b">
<input v-model="semCode" placeholder="请输入验证码" /> <input v-model="semCode" placeholder="请输入验证码" />
<text @click="getCode" v-if="!showCountDown">获取验证码</text> <text @click="getCode" v-if="!showCountDown">获取验证码</text>
<text v-if="showCountDown">{{ countdown }}</text> <text v-if="showCountDown">{{ countdown }}s</text>
</view> </view>
<view class="c" style="display: flex; align-items: center"> <view class="c" style="display: flex; align-items: center">
<u-checkbox <u-checkbox
@ -101,6 +101,10 @@ export default {
getCode() { getCode() {
// 获取验证码 // 获取验证码
const that = this; const that = this;
if (that.isCheckout == false) {
that.$toast("请勾选用户协议");
return;
}
if (!that.validatePhoneNumber(that.phoneNum)) { if (!that.validatePhoneNumber(that.phoneNum)) {
uni.showToast({ uni.showToast({
title: "请输入正确的手机号", title: "请输入正确的手机号",
@ -108,26 +112,29 @@ export default {
return; return;
} }
that.showCountDown = !that.showCountDown; that.showCountDown = !that.showCountDown;
that.countDownFun = setInterval(() => {
if (that.countdown >= 1) {
that.countdown = that.countdown - 1;
} else {
that.showCountDown = false;
that.countdown = 60;
clearInterval(that.countDownFun);
}
}, 1000);
CaptchaApi.sendSmsCaptcha({ CaptchaApi.sendSmsCaptcha({
form: { form: {
mobile: that.phoneNum, mobile: that.phoneNum,
}, },
}).then((res) => { }).then((res) => {
if (res.status == 200) { if (res.status == 200) {
that.countDownFun = setInterval(() => {
if (that.countdown >= 1) {
that.countdown = that.countdown - 1;
} else {
that.showCountDown = false;
that.countdown = 60;
clearInterval(that.countDownFun);
}
}, 1000);
uni.showToast({ uni.showToast({
icon:"none",
title: res.message, title: res.message,
}); });
} else { } else {
uni.showToast({ uni.showToast({
icon:"none",
title: res.message, title: res.message,
}); });
} }

19
pages/news/recycling/order.vue
Unescape View File

@ -11,8 +11,10 @@
{{infor.username}} {{infor.username}}
<text>{{infor.mobile}}</text> <text>{{infor.mobile}}</text>
</view> </view>
<image @click="copyOrderNumber(infor.mobile)" class="copy"
:src="$picUrl+'/static/news/icon-recycling-order-02.png'"></image> <view class="address" v-if="infor &&infor.shipping_address">{{infor.shipping_address+infor.house_number}}</view>
<!-- <image @click="copyOrderNumber(infor.mobile)" class="copy"
:src="$picUrl+'/static/news/icon-recycling-order-02.png'"></image> -->
</view> </view>
<view class="b"> <view class="b">
<image class="pic" :src="$picUrl+'/static/home/phone.jpg'"></image> <image class="pic" :src="$picUrl+'/static/home/phone.jpg'"></image>
@ -301,7 +303,7 @@
.l { .l {
width: 694rpx; width: 694rpx;
height: 276rpx; min-height: 276rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 10rpx; border-radius: 10rpx;
padding: 30rpx; padding: 30rpx;
@ -310,10 +312,13 @@
margin-top: 30rpx; margin-top: 30rpx;
.a { .a {
display: flex; overflow: hidden;
align-items: center; .address{
justify-content: space-between; margin-left: 40rpx;
margin-top: 10rpx;
font-size: 26rpx;
color: #666;
}
.name { .name {
display: flex; display: flex;
align-items: center; align-items: center;

18
pages/news/recycling/orderDetail.vue
Unescape View File

@ -9,8 +9,10 @@
<view class="name"> <view class="name">
<image class="user" :src="$picUrl+'/static/news/icon-recycling-order-01.png'"></image>{{info.username}} <image class="user" :src="$picUrl+'/static/news/icon-recycling-order-01.png'"></image>{{info.username}}
<text>{{info.mobile}}</text> <text>{{info.mobile}}</text>
</view> </view>
<image class="copy" @click="openPage(1,info.mobile)" :src="$picUrl+'/static/news/icon-recycling-order-02.png'"></image>
<view class="address" v-if="info &&info.shipping_address">{{info.shipping_address+info.house_number}}</view>
<!-- <image class="copy" @click="openPage(1,info.mobile)" :src="$picUrl+'/static/news/icon-recycling-order-02.png'"></image> -->
</view> </view>
<view class="b"> <view class="b">
<image class="pic" :src="info.server_image"></image> <image class="pic" :src="info.server_image"></image>
@ -253,7 +255,7 @@
&-hd{ &-hd{
.l{ .l{
width: 694rpx; width: 694rpx;
height: 276rpx; min-height: 276rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 10rpx; border-radius: 10rpx;
padding: 30rpx; padding: 30rpx;
@ -261,9 +263,13 @@
margin: 0 auto; margin: 0 auto;
margin-top: 30rpx; margin-top: 30rpx;
.a{ .a{
display: flex; overflow: hidden;
align-items: center; .address{
justify-content: space-between; margin-left: 40rpx;
margin-top: 10rpx;
font-size: 26rpx;
color: #666;
}
.name{ .name{
display: flex; display: flex;
align-items: center; align-items: center;

17
pages/user/index.vue
Unescape View File

@ -203,8 +203,8 @@
<view class="image-text_21" @click="goGoodsOrder('complete')"> <view class="image-text_21" @click="goGoodsOrder('complete')">
<image :src="$picUrl+'/static/user/over.png'" class="label_11"></image> <image :src="$picUrl+'/static/user/over.png'" class="label_11"></image>
<view class="text-group_21"> <view class="text-group_21">
<text class="text_71" <!-- <text class="text_71"
v-if="orderTodoInfo.goods_order.finish_number">{{orderTodoInfo.goods_order.finish_number>=100?"99+":orderTodoInfo.goods_order.finish_number}}</text> v-if="orderTodoInfo.goods_order.finish_number">{{orderTodoInfo.goods_order.finish_number>=100?"99+":orderTodoInfo.goods_order.finish_number}}</text>-->
<text class="text_81">已完成</text> <text class="text_81">已完成</text>
</view> </view>
</view> </view>
@ -244,8 +244,8 @@
<view class="image-text_21" @click="toFuwu(4)"> <view class="image-text_21" @click="toFuwu(4)">
<image :src="$picUrl+'/static/user/detail.png'" class="label_11"></image> <image :src="$picUrl+'/static/user/detail.png'" class="label_11"></image>
<view class="text-group_21"> <view class="text-group_21">
<text class="text_71" <!-- <text class="text_71"
v-if="orderTodoInfo.service_order.check_number">{{orderTodoInfo.service_order.check_number}}</text> v-if="orderTodoInfo.service_order.check_number">{{orderTodoInfo.service_order.check_number}}</text>-->
<text class="text_81">已完成</text> <text class="text_81">已完成</text>
</view> </view>
</view> </view>
@ -277,16 +277,14 @@
<view class="image-text_21" @click="toRecovery(3)"> <view class="image-text_21" @click="toRecovery(3)">
<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image> <image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
<view class="text-group_21"> <view class="text-group_21">
<text class="text_71" <!-- <text class="text_71" v-if="orderTodoInfo.recovery_order.cancel_number">{{orderTodoInfo.recovery_order.cancel_number>=100?"99+":orderTodoInfo.recovery_order.cancel_number}}</text> -->
v-if="orderTodoInfo.recovery_order.cancel_number">{{orderTodoInfo.recovery_order.cancel_number>=100?"99+":orderTodoInfo.recovery_order.cancel_number}}</text>
<text class="text_81">已取消</text> <text class="text_81">已取消</text>
</view> </view>
</view> </view>
<view class="image-text_21" @click="toRecovery(2)"> <view class="image-text_21" @click="toRecovery(2)">
<image :src="$picUrl+'/static/user/detail.png'" class="label_11"></image> <image :src="$picUrl+'/static/user/detail.png'" class="label_11"></image>
<view class="text-group_21"> <view class="text-group_21">
<text class="text_71" <!-- <text class="text_71" v-if="orderTodoInfo.recovery_order.finish_number">{{orderTodoInfo.recovery_order.finish_number>=100?"99+":orderTodoInfo.recovery_order.finish_number}}</text> -->
v-if="orderTodoInfo.recovery_order.finish_number">{{orderTodoInfo.recovery_order.finish_number>=100?"99+":orderTodoInfo.recovery_order.finish_number}}</text>
<text class="text_81">已完成</text> <text class="text_81">已完成</text>
</view> </view>
</view> </view>
@ -329,8 +327,7 @@
<view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=complete')"> <view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=complete')">
<image :src="$picUrl+'/static/user/over.png'" class="label_11"></image> <image :src="$picUrl+'/static/user/over.png'" class="label_11"></image>
<view class="text-group_21"> <view class="text-group_21">
<text lines="1" class="text_7" <!-- <text lines="1" class="text_7" v-if="orderTodoInfo.distribution_order.finish_number">{{orderTodoInfo.distribution_order.finish_number}}</text> -->
v-if="orderTodoInfo.distribution_order.finish_number">{{orderTodoInfo.distribution_order.finish_number}}</text>
<text lines="1" class="text_8">已完成</text> <text lines="1" class="text_8">已完成</text>
</view> </view>
</view> </view>

Write Preview
Loading…
Cancel
Save