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

gdpaoup #114

Merged
gyh merged 2 commits from gyh into master 2020-08-04 13:50:40 +00:00
Conversation 0 Commits 2 Files Changed 10 +49 -22
10 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/informations/notice/notice.vue
View File

@ -7,7 +7,7 @@
<view class="text_view">{{item.content}}</view>
<view class="notice_list">
<text>查看详情</text>
<view> > </view>
<u-icon name="arrow-right" color="#666"></u-icon>
</view>
</view>
</view>
@ -15,7 +15,6 @@
</template>
<style lang="scss" scoped>
.notice {
background: #ECECEC;
.notice_view{
width: 690rpx;
height: 489rpx;

3
components/logininput/identifying.vue
View File

@ -68,7 +68,8 @@
this.$refs.uCode.start();
}, 2000);
} else {
this.$u.toast('倒计时结束后再发送');
// this.$u.toast('倒计时结束后再发送');
console.log("倒计时结束后再发送");
}
}

5
components/mine/order-item/index.vue
View File

@ -31,7 +31,7 @@
<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
<view class="cancel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view>
<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount)">立即支付</view>
<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount,order.order_id)">立即支付</view>
<view class="service" v-if="order.view_type == 8">联系官方客服</view>
<view class="submit" v-if="order.view_type == 8">提交官方审核</view>
</view>
@ -109,10 +109,11 @@ export default {
oid: this.order.order_id,
});
},
payNow(pay_sn, order_amount) {
payNow(pay_sn, order_amount, id) {
this.$u.route('/pageC/cart/cashier', {
pay_sn: pay_sn,
price: order_amount,
order_id: id
});
},
},

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

@ -4,7 +4,7 @@
<view>
<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60" ></u-tabs-swiper>
</view>
<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
<view class="goods-item">
<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
@ -129,11 +129,20 @@ export default {
text-align: center;
color: #333;
}
.goods-item {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
margin-top: 20rpx;
}
.swiper-box {
height: 100%;
margin-bottom: 10rpx;
.swiper-item {
height: 100%;
.goods-item {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
width: 100%;
height: 100%;
overflow-y: scroll;
}
}
}
}
</style>

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

@ -44,7 +44,7 @@ export default {
<style lang="scss" scoped>
.item{
width: 330rpx;
height: 510rpx;
height: 510rpx;
margin-bottom: 26rpx;
background-color: #f8f8f8;
border-radius: 10rpx 10rpx 0rpx 0rpx;

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

@ -78,7 +78,7 @@ export default {
num = this.couponList.length
? this.couponList.length > 4 ? 4 : this.couponList.length
: 1
this.swiperHeight = (97 + 10) * num + 'px';
this.swiperHeight = (200 + 20) * num + 'rpx';
},
toCouponPage() {
this.$u.route({
@ -116,6 +116,7 @@ export default {
box-sizing: border-box;
background-color: #ffffff;
.coupon-item {
height: 200rpx;
margin-bottom: 20rpx;
}
}

20
pageA/register/register.vue
View File

@ -71,6 +71,7 @@
value: '',
login: '注册',
show: false,
is_check: null,
member_mobile: '', //手机号
smslog_type : '1',//状态
sms_code : '', //验证码
@ -107,25 +108,32 @@
let type_phone = this.$u.test.mobile( this.member_mobile)
if( this.member_mobile == ''){
this.$refs.uToast.show({
title: '手机号不能为空',
title: '手机号不能为空！',
type: 'error'
})
return false;
}
if (type_phone == false) {
this.$refs.uToast.show({
title: '手机号格式不正确',
title: '手机号格式不正确！',
type: 'error'
});
return false;
}
if( this.sms_code == ''){
this.$refs.uToast.show({
title: '验证码不能为空',
title: '验证码不能为空！',
type: 'error'
})
return false;
}
if (this.is_check) {
this.$refs.uToast.show({
title: '请同意协议！',
type: 'error'
})
return false;
}
this.$u.api.phoneRegister({
member_mobile: this.member_mobile,
sms_code: this.sms_code
@ -169,11 +177,13 @@
},
// 选中某个复选框时，由checkbox时触发
checkboxChange(e) {
//console.log(e);
// console.log(e,1);
this.is_check = e.value;
console.log(this.is_check);
},
// 选中任一checkbox时，由checkbox-group触发
checkboxGroupChange(e) {
// console.log(e);
// console.log(e,2);
},
mask_u() {
this.show = !this.show

8
pageB/photo/index.vue
View File

@ -10,7 +10,7 @@
</swiper-item>
</swiper>
<view class="bottom">
<view class="item">
<view class="item" :style="{ width: photo_len * 20 + 100 + 'rpx' }">
<text>图片</text>
<view v-for="(item,index) in list.photo" :key="index" :style="{'background-color':index == swiper_id ? '#fff' : '#ede8e8'}"></view>
</view>
@ -46,7 +46,7 @@
<view>
</view>
<view class="more-reply" v-if="item.reply_count">展开更多回复<u-icon name="arrow-down"></u-icon></view>
<!-- <view class="more-reply" v-if="item.reply_count">展开更多回复<u-icon name="arrow-down"></u-icon></view> -->
</view>
</block>
<view class="no-data" v-else>111</view>
@ -120,7 +120,6 @@
.item{
display: flex;
align-items: center;
width: 50%;
padding: 8rpx 16rpx;
font-size: 24rpx;
color: #fff;
@ -349,6 +348,7 @@
.content {
height: 60rpx;
margin: 10rpx 0;
line-height: 30rpx;
font-size: 24rpx;
}
.price {
@ -379,6 +379,7 @@ export default {
send_value: "", // 输入的值
cartList: [],
cart_len: 0,
photo_len: 0,
edit_text: "有爱评论，说点好听的 ~",
edit_text_other: "有爱评论，说点好听的 ~",
commentList: [], // 评论
@ -408,6 +409,7 @@ export default {
this.$u.api.articleInfo({article_id}).then((res)=>{
this.list = res.data.info;
this.cart_len = res.data.info.goods.length;
this.photo_len = res.data.info.photo.length;
})
},
// 改变swiper

3
pageD/notice/notice.vue
View File

@ -32,6 +32,9 @@
</script>
<style lang="scss" scoped>
page {
background-color: #ECECEC;
}
.sousuo {
height: 113rpx;
border: 1px #f00 solid;

1
pageE/order/Details.vue
View File

@ -252,6 +252,7 @@ export default {
this.$u.route('/pageC/cart/cashier', {
pay_sn: this.orderInfo.pay_sn,
price: this.orderInfo.order_amount,
order_id: this.orderInfo.order_id,
});
},
toOtherPage(url) {