From 70e848cbbbc860a8013f86273e35159c06fd471d Mon Sep 17 00:00:00 2001
From: cmxdd <86407334@qq.com>
Date: Thu, 30 Jul 2020 09:41:08 +0800
Subject: [PATCH 1/3] update api abput mine
---
common/http.api.js | 33 +++----
components/order-item/index.vue | 5 +-
components/order-item/testlist.vue | 84 ++++++++++++++++++
pages/index/index.vue | 49 ++++++++---
pages/user/content.vue | 136 ++++++++++++++++-------------
pages/user/fans.vue | 4 +-
pages/user/info.vue | 4 +-
7 files changed, 221 insertions(+), 94 deletions(-)
create mode 100644 components/order-item/testlist.vue
diff --git a/common/http.api.js b/common/http.api.js
index 7c56209..92f03f8 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -26,35 +26,38 @@ const install = (Vue, vm) => {
getorderlist(){
return vm.$u.get("/Order/orderList")
},
+ // 获取试穿订单列表
+ getshiftlist(){
+ return vm.$u.get("/order/goodsTryOrderList")
+ },
// 获取轮播图列表
getswiper(){
return vm.$u.get("/Order/orderList")
},
// 商家登陆
- shoplogin(obj){
- return vm.$u.get("/Login/storeLogin",obj)
+ shoplogin({member_name,member_password}){
+ return vm.$u.get("/Login/storeLogin",{member_name,member_password})
},
// 获取个人信息
- getshopinfo(obj){
- return vm.$u.post("/member/memberInfo",obj)
+ getshopinfo(){
+ return vm.$u.post("/member/memberInfo")
},
// 获取粉丝列表
- myfanlist(obj){
- return vm.$u.post("/member/myFansList",obj)
- },
- // 商家登陆
- getshopinfo(obj){
- return vm.$u.post("/member/memberInfo",obj)
+ myfanlist(){
+ return vm.$u.post("/member/myFansList")
},
// 修改个人信息
- changeinfo(obj){
- return vm.$u.post("/Member/changeMemberInfo",obj)
+ changeinfo({nickname,avatar,signature}){
+ return vm.$u.post("/Member/changeMemberInfo",{nickname,avatar,signature})
},
// 获取内容列表
- articlelist(obj){
- return vm.$u.post("/Article/articleList",obj)
+ articlelist({type,page}){
+ return vm.$u.post("/Article/articleList",{type,page})
+ },
+ // 骑手列表
+ takeawayerlist(){
+ return vm.$u.get("/Order/getTakeawayerList")
},
-
}
// 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下
vm.$u.api = api;
diff --git a/components/order-item/index.vue b/components/order-item/index.vue
index eedfb24..1b57ef1 100644
--- a/components/order-item/index.vue
+++ b/components/order-item/index.vue
@@ -1,6 +1,6 @@
-
+
@@ -28,9 +28,8 @@ export default {
},
methods: {
toDetailsPage() {
- console.log(this.info)
uni.navigateTo({
- url: '/pages/index/details?current=' + this.cur
+ url: '/pages/index/details?id=' + this.info.order_id
});
},
},
diff --git a/components/order-item/testlist.vue b/components/order-item/testlist.vue
new file mode 100644
index 0000000..0318e96
--- /dev/null
+++ b/components/order-item/testlist.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+ 待处理订单
+
+
+ {{info.extend_order_goods[0].goods_name}}
+
+ 共{{info.extend_order_goods[0].goods_num}}件商品
+ 实付¥{{info.extend_order_goods[0].goods_pay_price}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c253bef..1f3300d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -26,7 +26,9 @@
-
+
+
+
@@ -105,8 +107,13 @@
\ No newline at end of file
+
diff --git a/pages/user/fans.vue b/pages/user/fans.vue
index c14f4fd..a87fbfb 100644
--- a/pages/user/fans.vue
+++ b/pages/user/fans.vue
@@ -3,7 +3,7 @@
最新
-
+
@@ -11,7 +11,7 @@
早前
-
+
diff --git a/pages/user/info.vue b/pages/user/info.vue
index a9c8eb7..4a9f6c2 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -6,11 +6,11 @@
用户名
-
+
个性签名
-
+
修改密码
From 5094efd41eb665b38266b2dd17f8c44c3a7643e5 Mon Sep 17 00:00:00 2001
From: cmxdd <86407334@qq.com>
Date: Thu, 30 Jul 2020 10:12:27 +0800
Subject: [PATCH 2/3] fixed v-toast
---
common/http.api.js | 4 ++
components/content-item/index.vue | 4 +-
pages/index/details.vue | 1 +
pages/index/index.vue | 3 +-
pages/messages/messagesList.vue | 1 +
pages/user/complaint.vue | 1 +
pages/user/complaintDetails.vue | 1 +
pages/user/content.vue | 108 ++++++++++++++++++------------
pages/user/contentDetails.vue | 1 +
pages/user/fans.vue | 1 +
pages/user/index.vue | 1 +
pages/user/myinfo.vue | 1 +
12 files changed, 80 insertions(+), 47 deletions(-)
diff --git a/common/http.api.js b/common/http.api.js
index 92f03f8..87b1614 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -54,6 +54,10 @@ const install = (Vue, vm) => {
articlelist({type,page}){
return vm.$u.post("/Article/articleList",{type,page})
},
+ // 删除文章
+ delarticle({article_id}){
+ return vm.$u.post("/article/articleDelete",{article_id})
+ },
// 骑手列表
takeawayerlist(){
return vm.$u.get("/Order/getTakeawayerList")
diff --git a/components/content-item/index.vue b/components/content-item/index.vue
index 967a5c5..f8e94b8 100644
--- a/components/content-item/index.vue
+++ b/components/content-item/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -69,7 +69,7 @@ export default {
width: 160rpx;
height: 160rpx;
border-radius: 10rpx;
- background-color: aqua;
+ // background-color: aqua;
flex-shrink: 0;
}
.play-icon {
diff --git a/pages/index/details.vue b/pages/index/details.vue
index 4a3d061..56f7486 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -81,6 +81,7 @@
确定
+
diff --git a/pages/release/index.vue b/pages/release/index.vue
index 5895586..202437e 100644
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -1,370 +1,357 @@
-
-
-
+
图片
标签
+ 新建标签
- {{item}}
+ {{ item }}
简介
-
-
-
+
-
- 选择商品
-
+ 选择商品
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ item.goods_name }}
-
-
-
- {{item.content}}
-
+
+
确定
- 选择商品
+
+ 选择商品
-
-
-
-
- 木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子
-
-
-
-
+
+ 木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子
+
发表
-
-
- 创建属于你的标签吧
-
-
-
-
+ 创建属于你的标签吧
+
确定
diff --git a/pages/release/video.vue b/pages/release/video.vue
index c7e4abb..3d326c2 100644
--- a/pages/release/video.vue
+++ b/pages/release/video.vue
@@ -15,6 +15,37 @@
正文
+
+
+ 选择商品
+
+
+
+
+
+
+
+
+
+ {{ item.goods_name }}
+
+
+
+
+ 确定
+
+
+
+ 选择商品
+
+
+
+
+
+ 木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子
+
+
+
发表
@@ -44,17 +75,65 @@
action: 'http://www.example.com/upload',
fileList: [],
fileListes:["美妆","博主穿搭","美妆","美妆","美妆","美妆","美妆","博主穿搭"],
- show: false
+ show: false,
+ show_two: false,
+ arres_list: [],
+ list: [],
+ scrollTop: 0
}
},
+ onLoad() {
+ // 定义删除数组的方法
+ Array.prototype.remove = function(val) {
+ var index = this.indexOf(val);
+ if (index > -1) {
+ this.splice(index, 1);
+ }
+ };
+ },
methods:{
show_add(){
console.log(this.show)
this.show = !this.show
- }
+ },
+ // 选择直播商品点击确定
+ changes() {
+ let that = this;
+ that.show_two = false;
+ console.log(that.arres_list);
+ },
+ // 选中某个复选框时,由checkbox时触发
+ checkboxChange(e) {
+ let id = e.name;
+ if (e.value == true) {
+ this.pushes(id);
+ }else{
+ this.delarr(id)
+ }
+ console.log(this.arres_list)
+
+ },
+ // 删除直播商品
+ delarr(id) {
+ var that = this;
+ if (id == '') {
+ console.log('为空');
+ } else {
+ that.arres_list.remove(id);
+ }
+ },
+ // 增加直播商品
+ pushes(id) {
+ var that = this;
+ if (id == '') {
+ console.log('为空');
+ } else {
+ that.arres_list.push(id);
+ }
+ },
},
components: {
- }
+ }
}
@@ -62,6 +141,125 @@
#release{
width: 690rpx;
margin: 0 auto;
+ .show_two {
+ padding: 30rpx 0 70rpx 0;
+ }
+ .scroll {
+ width: 100%;
+ height: 400px;
+ }
+ .u-button {
+ background: #ff780f;
+ width: 690rpx;
+ height: 98rpx;
+ line-height: 98rpx;
+ background: rgba(255, 120, 15, 1);
+ border-radius: 49px;
+ font-size: 36rpx;
+ color: #ffffff;
+ text-align: center;
+ margin: 0 auto 20rpx;
+ }
+ .show_two .title {
+ width: 100%;
+ border-bottom: solid 1px #ececec;
+ margin-bottom: 30rpx;
+ }
+
+ .show_two .title > text {
+ font-size: 30rpx;
+ padding: 30rpx;
+ display: block;
+ }
+ .show_two > view {
+ font-size: 30rpx;
+ font-weight: 400;
+ color: rgba(51, 51, 51, 1);
+ }
+
+ .show_two .images {
+ width: 22rpx;
+ height: 12rpx;
+ float: right;
+ top: 14rpx;
+ }
+ .List_tosign {
+ overflow: hidden;
+ zoom: 1;
+ margin-top: 21rpx;
+ position: relative;
+ }
+ .List_tosign > view {
+ float: left;
+ }
+ .List_tosign > view:nth-child(1) {
+ width: 180rpx;
+ height: 160rpx;
+ margin-bottom: 30rpx;
+ image {
+ border-radius: 15rpx;
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .List_tosign > view:nth-child(2) {
+ width: 420rpx;
+ height: 76rpx;
+ margin: 43rpx 43rpx 0 21rpx;
+ }
+ .List_tosign > view:nth-child(3) {
+ width: 26rpx;
+ height: 27rpx;
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ margin: auto;
+ image {
+ width: 100%;
+ height: 100%;
+ display: block;
+ }
+ }
+ .listes_shoping {
+ overflow: hidden;
+ zoom: 1;
+ margin-bottom: 30rpx;
+ height: 160rpx;
+ position: relative;
+ }
+
+ .listes_shoping > view {
+ float: left;
+ }
+
+ .listes_shoping > view:nth-child(1) {
+ width: 36rpx;
+ height: 36rpx;
+ margin-top: 62rpx;
+ margin-left: 30rpx;
+ }
+
+ .listes_shoping > view:nth-child(2) {
+ width: 180rpx;
+ height: 160rpx;
+ margin: 0 31rpx 0 19rpx;
+ }
+
+ .listes_shoping > view:nth-child(2) image {
+ width: 100%;
+ }
+
+ .listes_shoping > view:nth-child(3) {
+ width: 425rpx;
+ margin-top: 43rpx;
+ overflow: hidden;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ }
.form-view{
background:rgba(255,120,15,1);
border-radius:6rpx;
diff --git a/pages/user/complaint.vue b/pages/user/complaint.vue
index 552d829..57a2b87 100644
--- a/pages/user/complaint.vue
+++ b/pages/user/complaint.vue
@@ -1,7 +1,7 @@
-
-
+
+
@@ -10,15 +10,38 @@
import ComplaintItem from '@/components/complaint-item/index'
export default {
data() {
- return {}
+ return {
+ list:[]
+ }
},
components: {
ComplaintItem
},
+ onLoad() {
+ this.getlist()
+ },
methods: {
- toDetailsPage() {
+ // 获取投诉列表
+ getlist(){
+ this.$u.api.reportlist({}).then(res => {
+ console.log(res)
+ if (res.errCode != 0) {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: 'error'
+ });
+ } else {
+ let arr = res.data.dataList
+ for(let index in arr){
+ this.list.push(arr[index])
+ }
+
+ }
+ });
+ },
+ toDetailsPage(id) {
uni.navigateTo({
- url: '/pages/user/complaintDetails'
+ url: '/pages/user/complaintDetails?id='+id
});
}
},
diff --git a/pages/user/complaintDetails.vue b/pages/user/complaintDetails.vue
index 0cca0c8..3278cb6 100644
--- a/pages/user/complaintDetails.vue
+++ b/pages/user/complaintDetails.vue
@@ -1,10 +1,10 @@
-
+
- 心机小黑裙连衣裙赫本风夏季爆款dlk...
- 共一件商品
+ {{info.complain_goods_name}}
+ 共{{info.complain_goods_num}}件商品
@@ -12,21 +12,21 @@
姓名
- 李先生
+ {{info.takeawayer_name}}
手机号
- 1561
+ {{info.takeawayer_mobile}}
公司名称
- 申通快递公司
+ {{info.company}}
投诉原因
- 太慢了太慢了!!!!
+ {{info.complain_desc}}
@@ -34,7 +34,29 @@
diff --git a/pages/user/content.vue b/pages/user/content.vue
index cedf756..6d3cb46 100644
--- a/pages/user/content.vue
+++ b/pages/user/content.vue
@@ -70,8 +70,7 @@ export default {
this.$u.api.articlelist({
type: that.type,
page: that.num
- })
- .then(res => {
+ }).then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
@@ -101,8 +100,7 @@ export default {
that.show = false;
this.$u.api.delarticle({
article_id: that.delid
- })
- .then(res => {
+ }).then(res => {
console.log(res)
if (res.errCode != 0) {
this.$refs.uToast.show({
@@ -115,6 +113,7 @@ export default {
type: 'success'
});
// 删除后更新页面
+ this.delid = null
this.newlist = [];
that.num=1
that.getlist()
diff --git a/pages/user/contentDetails.vue b/pages/user/contentDetails.vue
index d64645e..8a63c24 100644
--- a/pages/user/contentDetails.vue
+++ b/pages/user/contentDetails.vue
@@ -1,41 +1,51 @@
-
-
+
+ {{ info.article_title }}
+ {{ info.article_content }}
+
+
+
+
+
+
+
+
+
- 2.5w
+ {{ info.comment_num }}
- 2.5w
+ {{ info.collect_num }}
- 2.5w
+ {{ info.like_num }}