From e67e2fe70105a9e59eb14612e5efd5d4056cb7cb Mon Sep 17 00:00:00 2001
From: cmxdd <86407334@qq.com>
Date: Thu, 6 Aug 2020 10:04:38 +0800
Subject: [PATCH 1/6] update code adout order
---
components/order-item/index.vue | 4 +-
pages/index/details.vue | 48 +++++++-----
pages/index/index.vue | 1 +
pages/index/otherdetails.vue | 125 +++++++++++++++++++++-----------
4 files changed, 116 insertions(+), 62 deletions(-)
diff --git a/components/order-item/index.vue b/components/order-item/index.vue
index 2192fd1..78bc509 100644
--- a/components/order-item/index.vue
+++ b/components/order-item/index.vue
@@ -10,9 +10,9 @@
待处理订单
已发货订单
已完成订单
- 申请退款订单
+ 申请退款
已退款订单
- 拒绝退款订单
+ 拒绝退款
{{info.extend_order_goods[0].goods_name}}
diff --git a/pages/index/details.vue b/pages/index/details.vue
index e9d40da..a73bfca 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -13,20 +13,7 @@
-
-
-
- {{ info.extend_order_common.reciver_name }}
-
-
-
- {{ info.extend_order_common.reciver_info.mob_phone }}
-
-
-
- {{ info.extend_order_common.reciver_info.address }}
-
-
+
收件人信息
@@ -44,6 +31,22 @@
+
+
+
+
+ {{ info.extend_order_common.reciver_name }}
+
+
+
+ {{ info.extend_order_common.reciver_info.mob_phone }}
+
+
+
+ {{ info.extend_order_common.reciver_info.address }}
+
+
+
派送方式
@@ -52,6 +55,7 @@
确认
+
物流信息
订单单号:{{ info.order_sn }}
@@ -60,11 +64,14 @@
{{list.kd_time}}
+
+
不处理
确定处理
- 退款状态:{{ type == 5 ? '同意退款，请注意查收' : '拒绝退款，请等待客服联系' }}
+
+ 退款状态:{{ type == 5 ? '同意退款，请注意查收！' : '拒绝退款，请等待客服联系！' }}
-->
+
+
+ 配送信息
+ 提示信息
+
+
+
+ {{ info.takeawayer_name }}
+
+
+
+ {{ info.takeawayer_mobile }}
+
+
+
+
+
+
+
+ 抱歉，商家正忙无法接单，期待下次为您服务！
+
+
+
+
+
+ 订单配送完成，期待下次为您服务！
+
+
-
-
@@ -135,6 +153,13 @@ export default {
type: 'error'
});
} else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: 'success'
+ });
+ uni.navigateBack({
+ delta: 1
+ });
}
});
} else {
@@ -150,6 +175,13 @@ export default {
type: 'error'
});
} else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: 'success'
+ });
+ uni.navigateBack({
+ delta: 1
+ });
}
});
}
@@ -234,6 +266,13 @@ export default {
}
}
}
+ .refunds-title{
+ padding: 25rpx 30rpx;
+ font-weight: 500;
+ color: #333333;
+ background-color: #ffffff;
+ border-bottom: 2rpx solid #ececec;
+ }
.refunds-user {
padding: 25rpx 30rpx;
background-color: #ffffff;
@@ -290,7 +329,7 @@ export default {
border-bottom: 2rpx solid #ececec;
}
.title {
- width: 150rpx;
+ width: 170rpx;
font-size: 30rpx;
margin-right: 10rpx;
}
--
2.47.2
From 04a4ed523f3372285bda02de3d43cd75b265ade6 Mon Sep 17 00:00:00 2001
From: cmxdd <86407334@qq.com>
Date: Thu, 6 Aug 2020 11:48:45 +0800
Subject: [PATCH 2/6] update bug
---
pages/index/details.vue | 82 +++++++++++++++++++++++++++-------
pages/user/contentDetails.vue | 4 +-
static/image/home/chat.png | Bin 0 -> 723 bytes
3 files changed, 70 insertions(+), 16 deletions(-)
create mode 100644 static/image/home/chat.png
diff --git a/pages/index/details.vue b/pages/index/details.vue
index a73bfca..d7fcbf9 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -1,18 +1,37 @@
-
-
-
- {{ info.extend_order_goods[0].goods_name }}
-
- 共{{ info.extend_order_goods[0].goods_num }}件商品
-
- 实付
- ￥{{ info.extend_order_goods[0].goods_pay_price }}
+
+
+
+
+ {{ list.goods_name }}
+
+ 共{{ list.goods_num }}件商品
+
+ 实付
+ ￥{{ list.goods_pay_price }}
+
-
+
+
+
+
+
+ {{ list.goods_name }}
+
+ 共{{ list.goods_num }}件商品
+
+ 实付
+ ￥{{ list.refund_amount }}
+
+
+
+
+
+
+
收件人信息
@@ -32,10 +51,12 @@
+ 收件人信息
{{ info.extend_order_common.reciver_name }}
+
@@ -135,29 +156,51 @@ export default {
express: '',
type: '',
orderid: 0,
- info: {},
+ info: {
+ extend_order_goods:[{}],
+ extend_order_common:{
+ reciver_info:{
+ mob_phone:"",
+ address:""
+ },
+ receive_name:""
+ }
+ },
list: [],
pushid: null,
pushstate: false, //显示物流单号
selctcar: null, //骑手信息
companyidA: null, //物流派送公司id
- companyidB: null //骑手派送公司id
+ companyidB: null, //骑手派送公司id
+ value:"",
+ refundid:null
};
},
onLoad(option) {
this.type = option.type;
+ console.log(this.type)
this.orderid = option.id;
this.resetinfo();
if (this.type == 1) {
+ // 获取快递公司
this.getcompanyinfo();
}
if (this.type == 2) {
+ // 获取物流信息
this.getcarinfo();
}
-
// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
},
methods: {
+ // 跳转详情页面
+ tochat(ID){
+ console.log(ID)
+ },
+ // 退款单选
+ radioGroupChange(e) {
+ this.refundid = e
+ console.log(e);
+ },
// 人工配送
pushstyleA() {
this.cur = 0;
@@ -189,7 +232,7 @@ export default {
if (this.cur == 0) {
// 确定退款
this.$u.api.refund({
- refund_id: this.orderid,
+ refund_id: this.refundid,
seller_state:2,
seller_message:""
}).then(res => {
@@ -212,7 +255,7 @@ export default {
} else {
// 不进行退款
this.$u.api.refund({
- refund_id: this.orderid,
+ refund_id: this.refundid,
seller_state:3,
seller_message:""
}).then(res => {
@@ -395,6 +438,13 @@ export default {
}
}
}
+ .refunds-title{
+ padding: 25rpx 30rpx;
+ font-weight: 500;
+ color: #333333;
+ background-color: #ffffff;
+ border-bottom: 2rpx solid #ececec;
+ }
.refunds-user {
padding: 25rpx 30rpx;
background-color: #ffffff;
@@ -402,6 +452,7 @@ export default {
> view {
display: flex;
align-items: center;
+ justify-content: space-between;
margin-bottom: 30rpx;
@mixin image-class($width, $right) {
> image {
@@ -423,6 +474,7 @@ export default {
@include image-class($width: 36rpx, $right: 22rpx);
}
> view {
+ flex: 1;
font-size: 26rpx;
color: rgba(51, 51, 51, 1);
}
diff --git a/pages/user/contentDetails.vue b/pages/user/contentDetails.vue
index 8a63c24..530b757 100644
--- a/pages/user/contentDetails.vue
+++ b/pages/user/contentDetails.vue
@@ -33,7 +33,7 @@
- {{item.member_nickname}}
+ {{item.member_nickname}}回复了{{info.reply_member_nickname}}
{{item.create_time}}
回复
@@ -101,6 +101,8 @@ export default {
} else {
this.pid = "";
this.content = "";
+ this.getdetail();
+ this.showChat = false
this.$refs.uToast.show({
title: res.message,
type: 'success'
diff --git a/static/image/home/chat.png b/static/image/home/chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..15e0ca68d913e3b0976a56c76e4bb54ac6b17ce8
GIT binary patch
literal 723
zcmV;^0xbQBP)lIGYrGoYH)2B1>h2j
zM>W9fnfwOG`dJD73g~mpMyMrMXklCxYPr}B5U`$)Nd107mBGeIl7kxN|NOiTvR;^F9P9^o5ow#OSa;ft_l;gpst?wG7UyasNPLVP$+Sjb~fcifNQ*eolDeaIan
zjoUTEn}vYvFpFsQcQEd${<%W`C#YMe5FdwPHj_O@l1&JlGVe9nw%T_73E`1$V`Dh@Sue002ovPDHLk
FV1flsPX_=1
literal 0
HcmV?d00001
--
2.47.2
From 6ec2318d0c3dc11e2f6238e76e5644eed19e8975 Mon Sep 17 00:00:00 2001
From: cmxdd <86407334@qq.com>
Date: Thu, 6 Aug 2020 14:40:11 +0800
Subject: [PATCH 3/6] update photo adout publish
---
common/http.api.js | 4 ++--
components/order-item/index.vue | 2 +-
pages.json | 1 -
pages/user/contentDetails.vue | 15 +++++++++------
static/image/index/live.png | Bin 1748 -> 3409 bytes
static/image/index/photo.png | Bin 1292 -> 2519 bytes
static/image/index/video.png | Bin 1519 -> 2956 bytes
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/common/http.api.js b/common/http.api.js
index d6e9b05..4618888 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -86,8 +86,8 @@ const install = (Vue, vm) => {
return vm.$u.post("/article/articleInfo",{article_id})
},
// 回复评论
- reply({article_id,pid,content}){
- return vm.$u.post("/article/articleAddComment",{article_id,pid,content})
+ reply({article_id,pid,content,reply_id}){
+ return vm.$u.post("/article/articleAddComment",{article_id,pid,content,reply_id})
},
// 达人是否可以直播
canlive(){
diff --git a/components/order-item/index.vue b/components/order-item/index.vue
index 78bc509..3683744 100644
--- a/components/order-item/index.vue
+++ b/components/order-item/index.vue
@@ -17,7 +17,7 @@
{{info.extend_order_goods[0].goods_name}}
共{{info.extend_order_goods[0].goods_num}}件商品
- 实付￥{{info.extend_order_goods[0].goods_pay_price}}
+ 实付￥{{info.goods_amount}}
diff --git a/pages.json b/pages.json
index d60307e..d53c78b 100644
--- a/pages.json
+++ b/pages.json
@@ -261,7 +261,6 @@
"borderStyle": "black",
"backgroundColor": "#ffffff",
"height": "50px",
- "fontSize": "10px",
"iconWidth": "24px",
"spacing": "3px",
"list": [{
diff --git a/pages/user/contentDetails.vue b/pages/user/contentDetails.vue
index 530b757..fab43fd 100644
--- a/pages/user/contentDetails.vue
+++ b/pages/user/contentDetails.vue
@@ -31,12 +31,12 @@
{{info.extend_order_goods[0].goods_name}}
- 共{{info.extend_order_goods[0].goods_num}}件商品
- 实付￥{{info.goods_amount}}
+ 共{{info.count_number}}件商品
+ 实付￥{{info.order_amount}}
diff --git a/pages.json b/pages.json
index d53c78b..d5b70f5 100644
--- a/pages.json
+++ b/pages.json
@@ -257,7 +257,7 @@
},
"tabBar": {
"color": "#7A7E83",
- "selectedColor": "#3cc51f",
+ "selectedColor": "#FF780F",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"height": "50px",
@@ -265,20 +265,20 @@
"spacing": "3px",
"list": [{
"pagePath": "pages/index/index",
- "iconPath": "",
- "selectedIconPath": "",
+ "iconPath": "static/image/tabbar/index.png",
+ "selectedIconPath": "static/image/tabbar/indexselect.png",
"text": "首页",
"selectedColor": "#FBFBFB"
}, {
"pagePath": "pages/messages/messagesList",
- "iconPath": "",
- "selectedIconPath": "",
+ "iconPath": "static/image/tabbar/info.png",
+ "selectedIconPath": "static/image/tabbar/infoselect.png",
"text": "消息",
"selectedColor": "#FBFBFB"
}, {
"pagePath": "pages/user/index",
- "iconPath": "",
- "selectedIconPath": "",
+ "iconPath": "static/image/tabbar/mine.png",
+ "selectedIconPath": "static/image/tabbar/mineselect.png",
"text": "我的",
"selectedColor": "#FBFBFB"
}]
diff --git a/pages/index/details.vue b/pages/index/details.vue
index d7fcbf9..17762e6 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -28,8 +28,8 @@
-
-
+
+
@@ -52,7 +52,7 @@
收件人信息
-
+
{{ info.extend_order_common.reciver_name }}
@@ -92,7 +92,9 @@
确定处理
- 退款状态:{{ type == 5 ? '同意退款，请注意查收！' : '拒绝退款，请等待客服联系！' }}
+ 退款状态:同意退款，请注意查收！
+ 退款状态:商家同意退款，等待后台处理！
+ 退款状态:商家拒绝退款，请等待客服联系！
-
+
+
+
-
+
+
+
@@ -150,15 +154,11 @@ export default {
this.getswiper();
// 获取可投诉列表
this.getcarlist();
+ // 所有订单
+ this.getallorder(0);
// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
},
onShow() {
- this.num=1
- this.current=0
- // 初始化数据
- this.resetarr()
- // 所有订单
- this.getallorder(0);
this.publishstate = false;
},
onReachBottom() {
@@ -198,7 +198,7 @@ export default {
this.getallorder(3);
} else if (current == 6) {
// 退货订单
- this.getallorder(5);
+ this.getallorder(4);
}
},
// 关闭发布弹窗
@@ -371,9 +371,6 @@ export default {
this.current = index;
this.num = 1;
this.resetarr();
- if (index == 6) {
- this.getallorder(4);
- }
this.reset();
},
// 发布内容跳转页面
diff --git a/pages/release/index.vue b/pages/release/index.vue
index ef217e0..44d023f 100644
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -46,10 +46,10 @@
选择商品
-
+
-
+
@@ -164,7 +164,7 @@ export default {
});
},
// 获取商品数组变化
- getshoplist() {
+ getshoplist(id) {
let arr = this.arres_list;
let newarr = this.list;
this.shoplist = [];
@@ -246,11 +246,16 @@ export default {
},
// 选中某个复选框时，由checkbox时触发
checkboxChange(e) {
- let id = e.name;
- if (e.value == true) {
- this.pushes(id);
- } else {
- this.delarr(id);
+ let id = e;
+ for(let num in this.list){
+ if(id==this.list[num].goods_id){
+ if(this.list[num].checked==true){
+ this.delarr(id);
+ }else{
+ this.pushes(id);
+ }
+ this.list[num].checked = !this.list[num].checked
+ }
}
},
// 删除直播商品
@@ -261,7 +266,7 @@ export default {
} else {
let index = that.arres_list.indexOf(id);
that.arres_list.splice(index, 1);
- that.getshoplist();
+ that.getshoplist(id);
}
},
// 增加直播商品
@@ -271,7 +276,7 @@ export default {
console.log('为空');
} else {
that.arres_list.push(id);
- that.getshoplist();
+ that.getshoplist(id);
}
},
tosign() {
diff --git a/pages/release/video.vue b/pages/release/video.vue
index 8b7c613..f3c9ee6 100644
--- a/pages/release/video.vue
+++ b/pages/release/video.vue
@@ -37,10 +37,10 @@
选择商品
-
+
-
+
@@ -270,11 +270,15 @@ export default {
},
// 选中某个复选框时，由checkbox时触发
checkboxChange(e) {
- let id = e.name;
- if (e.value == true) {
- this.pushes(id);
- } else {
- this.delarr(id);
+ for(let num in this.list){
+ if(id==this.list[num].goods_id){
+ if(this.list[num].checked==true){
+ this.delarr(id);
+ }else{
+ this.pushes(id);
+ }
+ this.list[num].checked = !this.list[num].checked
+ }
}
},
// 删除直播商品
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 34c7785..b86a080 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -35,6 +35,8 @@ export default {
}
},
onLoad() {
+ },
+ onShow() {
this.getmyinfo()
},
methods: {
diff --git a/static/image/tabbar/index.png b/static/image/tabbar/index.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd79cbf3549e042534f37ba59c3746cae880dee7
GIT binary patch
literal 805
zcmV+=1KRwFP)oiqz63Ks7pB_Rc=f+(p%u~J)!NxV~o
z#RrI~m=-~VHm#eghzs2WMMMxRc2O!_*y_#9ktw+$wJ$1qm-C!!S=QIpT5vTnolZCSe7+t;oFk&|0I<(-oOnDQ|GZM)ioi@J6Vx=VhlnPF
z!C+^(T$bT*I1T`Zg%IarvDk;@pvwX|=UV}w4-qGbsMjzIM>RJ$H+v$HNE8ucMAUAY
z=9@pEOMsm7odD1yr7TTNP2EVPQkD9qR4T>7;qWm4(4~~;Ez5dcuP*{-v)TQcru72A
z&C$`(hl7KIVue{@e}Df0BI*W!i-uv0yLC07ZQBPB@e&d7QmIs21yu6}x{aLk2>@s{4CDRZz}%jEKEFi>aUE^jej)x}}uE!C>%Jxm?CjC{zG|`=)6=c7a6nOaa|ZYB}VbF9CASyBT9cDoW}P357zB
zi0GbWSw#ix>+9R(_xs0)sO6skbGcl=DJr8^5OKKv
z%7}Q^FpQzPD~|{vTHNQXHp6T-yGPTsF2`{?eLmkp7KtcMM0wLRUshk4A`y)Nz;nhJ
zN-2*b;^sggkc>v7zZSWiPNz3`z1|ayvC{w$sGjm;rBXT7*4Fl|>gq`VI12zO!~_5%
jb8~Z7lgZ>4H)_8D*w2;sS}S+)00000NkvXXu0mjfC9ZGm
literal 0
HcmV?d00001
diff --git a/static/image/tabbar/indexselect.png b/static/image/tabbar/indexselect.png
new file mode 100644
index 0000000000000000000000000000000000000000..ada108fe9e225b3e3290db28c05ffe4cea490c34
GIT binary patch
literal 774
zcmV+h1Nr=kP)>Y@|{gIyE`5^XXGMVTrznMu+L
zLF_*S+d|P6(;$dYZQWEwTbz^>94
z?*|<9Fpue3%#EuY|GXM>RiKSV8}aNAvP)c#59%n5rr37iv$6k0@b};}qH^WCzeE24
zw29#HG&Au9z12AtS-D+gMLg;Q+rit7W1q^^Z*Pxx0qynhX)+vy}0_yJQDb4jZyMb=Xv*oyg&sZ=@A
z5sU>xNZXPA!Vt0nadC|cQ++Z582=)q*pVDrW^Y8zf?5Ppt2S*~lzrgBMHGHuG?5B5?>RGqA$`%}AwrZemNPo<
zjg*;+VVF@wi;7l3(4uHjo1hQE6m!T)2d8=Wp19_Sn&sr(Jl^5l-#uUdgRtxn5t^o1
zEJ;!Y030Nuort(zxDnA5BEANIC!F(PP18mZkrpFx@lShudtO#n);UCU1Aw^vlri=W
z5x>j>H_NiTorn$qfOw=g9*?&*H8p)taTb7GU0o%TBwa^D7ZF{`$;r9rcDsLwz?LO}
z{r&yxrl+S51HgFzm}HFAdcEHF!fy^33Wc`FvOJ84(PT1N>-YOdmzQFt|6nj!oRN`n
z696{Ywq5D-`97gx7>=T%qCNoFXxsJ?pU*d$4lLyp3WZ#XqKp8**Rip&<7in{82}7$
z&dYRNfAv4Gly7He=Pp^69}&?p0qi3pr>d$)tE;QoT7W}CLvl149Rz?GF(MxTAfRbl
zu&Sy`E-fvs6wrx@i93d2@N{jaY5D=+v;a;4fLqhF2O@MuQJ&H7vqzL5U0Wm)Im9{d
z6Dh|y=O=VsAL;JyE@X@i&9xt~!sGFLOV?(arW+9hBEpwM^ibDzLx6gEdNReguC8u2
zRnK&6mSwdP(S8BEh=?_bL}GViV`FSBO|dLXsOAL#+`vE}uqit``#I7s6OLOMvsb9wee$VkZ)jXx3vzQCy6%SxJ(jobxxF
z^S55FcY3A5{sAPS`vCBfh>Y>^@w9h26vuz(&2&1Q>3h{Q@lg^D5@BW2jRiqtVIc$wQPD_Rt42!AOvPd%l2)r9%$lf1
zh=vLg3&g64#DZ9`p+$rR72X@u(V4y@?@d}vDjnYLo_pT!{_j2ibA+N#L1?R}C0w=(
zmj*=EfmRjLeJi?$5G$-9ge8dXlul=&6xd9T
zc9=D&jG%mE%swERh;Bs#SCITx>B>C)7uYN`5vhmZJ#>1%Xxvk$<-B(G$uQIZ1>8e`
zmF87czI(uNT>7NPPN}z1SGn7VM$^NR#4R~?+-k+(sA$6SywxaYoI83fQctk#5#o6(
zx50aYl4CJ*JBAE-3T;FWN|!UDN1}_U2wwNCns;|euk*R&Slntv=<|S25bjEso%Ah~
zB<%YsNp|+pONeR0It^_0fG2^yWbE~l!v3$K#Hm88$GCb?w5?((GhS&oJind;k0z4jy#UY)7Pxti9TsAlgD179rk}V=+QGK?pA-5ZZ=l
zGe|XXg4g!783BKeuSB!~0z+W0g-9I)PXVidcc_FBtwpgAzj#;3PYuf1?D*g3VWF?D
z0+#{LSEDHR{gH-d5x(H&pA(sUAxYA66|7jH2fPiu0XNB5`lbvsHD9Iwt}s@)2?=b&
jnC_O&^rwFT&E)lAx3#yo-(lvw<2d*0L8>v|_xA`P4g%O)
z?RvJO;o;#$&CSh^0Ho6C^qW6{lu~N|T%DYp+*loN7NnF~2;i~S`hep&ul@pB%glvR
zsnj_zFz`Ljodu;*DVa}{XNYLKZQEb#
z!F=CeCWLrEM1z)PJ*>Mm%d(7)jt-BR+nD*d<2WDZ!g9IXa>FnbfY+_9t*5%XyQ8|G
zI2eoG($aDoz%FKvxA%;QB!IO5b~5wrQmJ&Vs!cSEEwrxKL!1cstX7YW1y_7N!;93}l7vjzR0(qXdLrQrrilW`M
zEjO}3EP<5rdK5)&CX=~K*=)8Ykw}a)vztz*@BPU?wP%GwVXM~qtYH|Pk632g#K6
literal 0
HcmV?d00001
diff --git a/static/image/tabbar/mineselect.png b/static/image/tabbar/mineselect.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fd5d5b0e3323eb0e4081e57070d608f179c50d9
GIT binary patch
literal 705
zcmV;y0zUnTP)#If^m?a*1oLjNk!T~0S@0&Qc@)?)`tZ_e&2fXxI@z3
zoGot(6v9Ky_l%?-kk;Y13xWa#rQnDVx5}lR(e&LZP!$f=nVqN(O0#`qVUT$WbR+rp
z2?>#!0ZM=9S#u`_=Sk`=X|sRiG`qpO3a4WL8TZS@;U~Gfc8olh7G6bIK|EeB?W132
zw7=0)gyFo7%6p=}gVK{3)Xd5;kQvj@A+j6QenelQh6A(|q!Q7GjM+_DZ{`OD-D^?j
zX~d`j`Ht$>iF8r~EQ3@RBq9=yMRQKJrp;dCJ&a-a5$z?#Ej;#T-jU1%Y{1EgZ#5z(
zf$fNf8L~UG^U2f|(4*5!2PCP0n83JjwO
z#`esXJl_~-+5%knNNGqe*?pq*n0U;=v@U73A1^dNbN&oPzU
literal 0
HcmV?d00001
--
2.47.2
From 0b5fa511bf58054465d8633ba9b328d1f921533c Mon Sep 17 00:00:00 2001
From: cmxdd <86407334@qq.com>
Date: Mon, 10 Aug 2020 09:56:01 +0800
Subject: [PATCH 5/6] update adout tag color
---
pages/release/index.vue | 4 ++--
pages/release/video.vue | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pages/release/index.vue b/pages/release/index.vue
index 44d023f..0d770d0 100644
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -312,7 +312,7 @@ export default {
margin: 0 auto;
.form-view {
- background: rgba(255, 120, 15, 1);
+ background: #CDC7C8;
border-radius: 6rpx;
margin-right: 20rpx;
font-size: 24rpx;
@@ -322,7 +322,7 @@ export default {
color: #fff;
}
.active {
- background: red;
+ background: #FF780F;
}
.scroll {
width: 100%;
diff --git a/pages/release/video.vue b/pages/release/video.vue
index f3c9ee6..4bd213f 100644
--- a/pages/release/video.vue
+++ b/pages/release/video.vue
@@ -437,7 +437,7 @@ export default {
-webkit-line-clamp: 2;
}
.form-view {
- background: rgba(255, 120, 15, 1);
+ background: #CDC7C8;
border-radius: 6rpx;
margin-right: 20rpx;
font-size: 24rpx;
@@ -447,7 +447,7 @@ export default {
color: #fff;
}
.active {
- background: red;
+ background: #FF780F;
}
.titles {
font-size: 30rpx;
--
2.47.2
From a0e780d05bbbea01fad99a2200919f18e88388aa Mon Sep 17 00:00:00 2001
From: cmxdd <86407334@qq.com>
Date: Mon, 10 Aug 2020 10:01:10 +0800
Subject: [PATCH 6/6] update adout color of tag
---
pages/release/index.vue | 4 ++--
pages/release/video.vue | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pages/release/index.vue b/pages/release/index.vue
index 0d770d0..8ea3402 100644
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -32,8 +32,8 @@
标签
- + 新建标签
-
+ + 新建标签
+
{{ item.name }}
diff --git a/pages/release/video.vue b/pages/release/video.vue
index 4bd213f..6f482f1 100644
--- a/pages/release/video.vue
+++ b/pages/release/video.vue
@@ -24,8 +24,8 @@
标签
- + 新建标签
-
+ + 新建标签
+
{{ item.name }}
--
2.47.2