theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdpao

Browse Source
This commit is contained in:
Gdpao
2020-08-07 19:56:47 +08:00
parent 71e984b2ed
commit 502e020000
17 changed files with 238 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
components/logininput/identifying.vue
View File

@@ -44,49 +44,57 @@
this.$emit('tochange');
let member_mobile = this.member_mobile;
// 校验手机号
let type_phone = this.$u.test.mobile(member_mobile)
console.log(member_mobile)
console.log(this.smslog_type)
let type_phone = this.$u.test.mobile(member_mobile);
// console.log(member_mobile);
// console.log(this.smslog_type);
// 判断是否有手机号为空
if (type_phone == false) {
this.$refs.uToast.show({
title: '手机号格式不正确',
type: 'error'
})
this.$refs.uToast.show({
title: "手机号格式不正确"
})
} else {
// 验证码倒计时
if (this.$refs.uCode.canGetCode) {
// 模拟向后端请求验证码
uni.showLoading({
title: '正在获取验证码'
})
setTimeout(() => {
uni.hideLoading();
// 这里此提示会被this.start()方法中的提示覆盖
this.$u.toast('验证码已发送');
// 通知验证码组件内部开始倒计时
this.$refs.uCode.start();
}, 2000);
uni.showLoading({
title: '正在获取验证码'
})
// 请求接口
this.$u.api.sendSmsCode({
member_mobile: this.member_mobile,
smslog_type: this.smslog_type
}).then((res) => {
if (res.errCode == 0) {
console.log(res);
this.$refs.uToast.show({
title: res.message,
})
setTimeout(() => {
uni.hideLoading();
// 这里此提示会被this.start()方法中的提示覆盖
// this.$u.toast('验证码已发送');
// 通知验证码组件内部开始倒计时
this.$refs.uCode.start();
}, 100);
} else {
this.$refs.uToast.show({
title: res.message,
})
}
})
} else {
// this.$u.toast('倒计时结束后再发送');
console.log("倒计时结束后再发送");
// console.log("倒计时结束后再发送");
}
}
},
end() {
this.$u.toast('倒计时结束');
// this.$u.toast('倒计时结束');
},
start() {
// this.$u.toast('倒计时开始');
console.log(this.smslog_type)
// console.log(this.smslog_type)
// 倒计时请求
this.$u.api.sendSmsCode({
member_mobile: this.member_mobile,
smslog_type: this.smslog_type
}).then((res) => {
console.log(res)
})
}
}
}

11
components/remaining/remaining.vue
View File

@@ -297,17 +297,18 @@
height: 560rpx;
.protocol_content {
display: block;
width: 494rpx;
height: 528rpx;
margin: 10rpx auto 30rpx;
font-size: 24rpx;
font-weight: 400;
color: rgba(51, 51, 51, 1);
display: block;
text-align: left;
margin: 80rpx auto 33rpx;
letter-spacing: 1rpx;
text-align: justify;
line-height: 36rpx;
text-align: justify;
letter-spacing: 1rpx;
text-indent: 2rem;
color: rgba(51, 51, 51, 1);
}
}

2
components/shop/list/index.vue
View File

@@ -95,7 +95,7 @@ export default {
},
setSwiperHeight() {
// height: 230px, margin-bottom: 13
const height = Math.ceil(this.goodsList.length / 2) * (540 + 26);
const height = Math.ceil(this.goodsList.length / 2) * (500 + 26);
this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
// this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (270 + 13) + 'px';
},

11
components/shop/list/item.vue
View File

@@ -3,7 +3,7 @@
<image :src="info.goods_image" mode="aspectFill" class="img"></image>
<view class="info">
<text class="title u-line-2">{{ info.goods_name }}</text>
<text class="jianjie u-line-1">{{ info.goods_advword }}</text>
<!-- <text class="jianjie u-line-1">{{ info.goods_advword }}</text> -->
<text class="price">￥{{ info.goods_price }}</text>
</view>
</view>
@@ -44,7 +44,7 @@ export default {
<style lang="scss" scoped>
.item{
width: 330rpx;
height: 520rpx;
height: 480rpx;
margin-bottom: 26rpx;
background-color: #f8f8f8;
border-radius: 10rpx 10rpx 0rpx 0rpx;
@@ -62,10 +62,11 @@ export default {
flex-direction: column;
justify-content: space-around;
.title{
line-height: 40rpx;
font-size: 30rpx;
margin-bottom: 16rpx;
font-size: 26rpx;
font-weight: 600;
line-height: 30rpx;
color: #333;
margin-bottom: 13rpx;
}
.jianjie{
font-size: 26rpx;

3
components/shop/recommend/index.vue
View File

@@ -3,7 +3,7 @@
<view class="top">
<text>今日秒杀推荐</text>
<view class="more" @click="toOthersPage">
<text>点击查看更多</text>
<text>查看更多</text>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
</view>
</view>
@@ -68,6 +68,7 @@ export default {
display: flex;
align-items: center;
color: #999;
font-size: 20rpx;
}
}
.connect{

11
components/shop/recommend/pintuan.vue
View File

@@ -3,7 +3,7 @@
<view class="top">
<text>今日拼团推荐</text>
<view class="more" @click="toDetailsPage">
<text>点击查看详情</text>
<text>查看详情</text>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
</view>
</view>
@@ -23,7 +23,7 @@
<text>￥{{ info.goods_price }}</text>
</view>
</view>
<image class="img" :src="info.pintuan_image" @click="toDetailsPage"></image>
<image class="img" :src="info.pintuan_image" @click="toDetailsPage" mode="aspectFill"></image>
</view>
</view>
</template>
@@ -158,10 +158,11 @@ export default {
}
}
.img{
width: 213rpx;
height: 160rpx;
flex-shrink: 0;
margin-left: 13rpx;
width: 210rpx;
height: 200rpx;
margin-left: 10rpx;
border-radius: 4rpx;
background-color: antiquewhite;
}
}

26
components/shop/seckill/index.vue
View File

@@ -9,7 +9,7 @@
<text class="num">00</text>
<text class="mah">:</text>
<text class="num">00</text>
<text>-</text>
<text class="heng">-</text>
<text class="num">{{ time.bigHour }}</text>
<text class="mah">:</text>
<text class="num">00</text>
@@ -47,10 +47,10 @@ export default {
<style lang="scss" scoped>
.seckill{
background-color: #fff;
padding: 30rpx;
padding: 0 30rpx 30rpx;
margin-bottom: 20rpx;
.top{
height: 60rpx;
height: 90rpx;
display: flex;
align-items: center;
justify-content: space-between;
@@ -66,13 +66,23 @@ export default {
display: flex;
align-items: center;
font-size: 20rpx;
.heng {
margin: 0 6rpx;
}
.num{
box-sizing: content-box;
width: 25rpx;
height: 25rpx;
background-color: #bfbfbf;
margin: 0 10rpx;
padding: 2rpx;
padding: 2rpx 4rpx;
margin: 0 6rpx;
color: #fff;
text-align: center;
line-height: 25rpx;
border-radius: 4rpx;
box-sizing: content-box;
background-color: #000;
}
.mah {
vertical-align: text-top;
}
}
}
@@ -85,7 +95,7 @@ export default {
}
.list{
display: flex;
justify-content: space-between;
// justify-content: space-between;
}
}
</style>

21
components/shop/seckill/item.vue
View File

@@ -1,12 +1,12 @@
<template>
<view class="item" @click="spikeGoods">
<image class="head" :src="item.groupbuy_image1"></image>
<image class="head" :src="item.groupbuy_image1" mode="aspectFill"></image>
<text class="title u-line-2">{{ item.goods_name }}</text>
<view class="price">
<text>￥{{ item.groupbuy_price }}</text>
<text class="origin">￥{{ item.goods_price }}</text>
</view>
<view class="info">
<view class="info" v-if="0">
<text>剩余{{ item.inventory | formatValue }}件</text>
<text>立即购买</text>
</view>
@@ -55,23 +55,28 @@ export default {
</script>
<style lang="scss" scoped>
.item{
width: 220rpx;
width: 30%;
margin-right: 50rpx;
.head{
width: 210rpx;
height: 131rpx;
width: 100%;
height: 210rpx;
border-radius: 6rpx;
background-color: antiquewhite;
}
.title{
width: 200rpx;
height: 30rpx;
margin-top: 6rpx;
font-size: 26rpx;
line-height: 30rpx;
color: #333;
margin-top: 16rpx;
-webkit-line-clamp: 1 !important;
}
.price{
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 19rpx;
margin-top: 10rpx;
>text:first-child{
font-size: 26rpx;
color: #FF3131;
@@ -88,7 +93,7 @@ export default {
align-items: center;
justify-content: space-between;
font-size: 20rpx;
margin-top: 19rpx;
margin-top: 10rpx;
>text:first-child{
color: #666;
}

25
components/shop/youhq/index.vue
View File

@@ -6,7 +6,7 @@
</view>
<u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="60" ></u-tabs-swiper>
<!-- :style="{ height: swiperHeight }" -->
<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
<swiper class="box" :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
<!-- 最多显示四个 -->
<view v-for="(coupon, index) in couponList.slice(0, 4)" :key="index" class="coupon-item">
@@ -107,18 +107,21 @@ export default {
color: rgba(51,51,51,1);
}
.view-more {
font-size: 18rpx;
font-size: 20rpx;
color: rgba(153,153,153,1);
}
}
.swiper-coupon-item {
padding: 0 30rpx;
box-sizing: border-box;
background-color: #ffffff;
.coupon-item {
height: 200rpx;
margin-bottom: 20rpx;
}
}
.box {
padding-top: 20rpx;
.swiper-coupon-item {
padding: 0 30rpx;
box-sizing: border-box;
background-color: #ffffff;
.coupon-item {
height: 200rpx;
margin-bottom: 20rpx;
}
}
}
}
</style>