From 234f11eeeff6c57778104caca8a54aafb9f55781 Mon Sep 17 00:00:00 2001 From: Gdpao <1341331954@qq.com> Date: Sun, 9 Aug 2020 19:08:12 +0800 Subject: [PATCH] gdpao --- App.vue | 6 + components/remaining/remaining.vue | 2 +- pageA/register/register.vue | 15 +- pageB/components/nuserinfo/nuserinfo.nvue | 22 -- pageB/components/userinfo/index.vue | 349 +++++++++++++--------- pageB/photo/index.vue | 4 +- pageB/sdetails/index.vue | 12 +- pageB/video/video.nvue | 89 ++++-- pageE/setting/Index.vue | 13 +- pageE/tool/WashOrder.vue | 8 +- pages.json | 4 - pages/index/index.vue | 5 +- static/image/userinfo/dianzan.png | Bin 0 -> 2722 bytes static/image/userinfo/dianzan1.png | Bin 0 -> 3913 bytes static/image/userinfo/gouwuche.png | Bin 0 -> 3443 bytes static/image/userinfo/gouwuche1.png | Bin 0 -> 5014 bytes static/image/userinfo/pinglun.png | Bin 0 -> 3114 bytes static/image/userinfo/pinglun1.png | Bin 0 -> 3658 bytes static/image/userinfo/shoucang.png | Bin 0 -> 3325 bytes static/image/userinfo/shoucang1.png | Bin 0 -> 4955 bytes static/videoIcon.png | Bin 0 -> 2345 bytes static/videoPlay.png | Bin 2345 -> 4833 bytes 22 files changed, 306 insertions(+), 223 deletions(-) delete mode 100644 pageB/components/nuserinfo/nuserinfo.nvue create mode 100644 static/image/userinfo/dianzan.png create mode 100644 static/image/userinfo/dianzan1.png create mode 100644 static/image/userinfo/gouwuche.png create mode 100644 static/image/userinfo/gouwuche1.png create mode 100644 static/image/userinfo/pinglun.png create mode 100644 static/image/userinfo/pinglun1.png create mode 100644 static/image/userinfo/shoucang.png create mode 100644 static/image/userinfo/shoucang1.png create mode 100644 static/videoIcon.png diff --git a/App.vue b/App.vue index a4f19e5..4ad52c3 100644 --- a/App.vue +++ b/App.vue @@ -43,6 +43,12 @@ .status_bar { width: 100%; height: var(--status-bar-height); + } + /* 自定义下拉 */ + .load-size { + ::v-deep.u-more-text { + font-size: 20rpx !important; + } } /* #endif */ diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue index 215766f..c0dd56b 100644 --- a/components/remaining/remaining.vue +++ b/components/remaining/remaining.vue @@ -177,7 +177,7 @@ console.log('视频错误信息:',e); }, timeupdate(e) { - console.log(e); + console.log(e); }, getRandomColor: function() { const rgb = [] diff --git a/pageA/register/register.vue b/pageA/register/register.vue index dac3e13..2b567ab 100644 --- a/pageA/register/register.vue +++ b/pageA/register/register.vue @@ -71,7 +71,7 @@ value: '', login: '注册', show: false, - is_check: null, + is_check: true, member_mobile: '', //手机号 smslog_type : '1',//状态 sms_code : '', //验证码 @@ -104,9 +104,10 @@ }, // 用户注册 loginIns(){ + console.log(this.is_check); let me = this; - let type_phone = this.$u.test.mobile( this.member_mobile) - if( this.member_mobile == ''){ + let type_phone = this.$u.test.mobile(this.member_mobile) + if(this.member_mobile == ''){ this.$refs.uToast.show({ title: '手机号不能为空！', }) @@ -118,13 +119,13 @@ }); return false; } - if( this.sms_code == ''){ + if(this.sms_code == ''){ this.$refs.uToast.show({ title: '验证码不能为空！', }) return false; } - if (this.is_check) { + if (!this.is_check) { this.$refs.uToast.show({ title: '请同意协议！', }) @@ -446,10 +447,6 @@ .pact { position: relative; padding-left: 40rpx; - overflow: hidden; - // overflow: hidden; //超出的文本隐藏 - // text-overflow: ellipsis; //溢出用省略号显示 - // white-space: nowrap; //溢出不换行 } .phones{ margin-bottom: 90rpx!important; diff --git a/pageB/components/nuserinfo/nuserinfo.nvue b/pageB/components/nuserinfo/nuserinfo.nvue deleted file mode 100644 index 8183fd0..0000000 --- a/pageB/components/nuserinfo/nuserinfo.nvue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/pageB/components/userinfo/index.vue b/pageB/components/userinfo/index.vue index 42f1164..1e4607d 100644 --- a/pageB/components/userinfo/index.vue +++ b/pageB/components/userinfo/index.vue @@ -1,162 +1,231 @@ \ No newline at end of file + watch: { + list(newValue, old) { + console.log(newValue); + this.item = newValue || {}; + this.is_follow = this.list.is_attention || false; + this.is_like = this.list.is_like || false; + this.is_collect = this.list.is_collect || false; + this.comment_num = this.list.comment_num || 0; + }, + cart(newValue, old) { + // console.log(newValue); + this.is_cart = newValue; + }, + comment(newValue, old) { + // console.log(newValue,old); + this.is_content = newValue; + }, + num(newVal, old) { + // console.log(newVal); + this.comment_num = newVal; + // this.item.comment_num = newVal; + }, + deep: true + }, + methods: { + // 关注 + following(id) { + uni.request({ + url: "https://dmmall.sdbairui.com/api/member/attentionMember", + method: "POST", + data: { + member_id: id + }, + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, + success: (res) => { + if (res.data.errCode == 0) { + this.is_follow = !this.is_follow; + console.log(this.is_follow); + uni.showToast({ + title: res.data.data.message, + icon: "none" + }) + } + } + }) + }, + // 点赞 + likeType(id) { + // console.log(id); + uni.request({ + url: "https://dmmall.sdbairui.com/api/article/articleLike", + method: "POST", + data: { + article_id: id + }, + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, + success: (res) => { + console.log(res); + if (res.data.errCode == 0) { + // console.log(res); + this.is_like = !this.is_like; + this.list.like_num = res.data.data.num; + } else { + uni.showToast({ + title: res.data.message, + icon: "none" + }) + } + } + }) + }, + // 收藏 + collecting(id) { + uni.request({ + url: "https://dmmall.sdbairui.com/api/article/articleCollect", + method: "POST", + data: { + article_id: id + }, + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, + success: (res) => { + console.log(res); + if (res.data.errCode == 0) { + console.log(res.data.num); + this.is_collect = !this.is_collect; + this.list.collect_num = res.data.data.num; + } else { + uni.showToast({ + title: res.data.message, + icon: "none" + }) + } + } + }) + }, + // 评论 + editing() { + this.is_content = !this.is_content; + // console.log(this.is_content); + this.$emit("openCart", { + comment: this.is_content, + cart: this.is_cart + }); + }, + // 购物车 + carting() { + this.is_cart = !this.is_cart; + // console.log(this.is_cart); + this.$emit("openCart", { + comment: this.is_content, + cart: this.is_cart + }); + }, + } + } + diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue index 7a9d331..0980a0c 100644 --- a/pageB/photo/index.vue +++ b/pageB/photo/index.vue @@ -56,7 +56,7 @@ 还没有评论，快来评论吧！ - + @@ -392,7 +392,7 @@