From c9c714d4e3b8ab778df6a11dd61fc7f939fd9a3d Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Fri, 14 Aug 2020 12:17:28 +0800
Subject: [PATCH] gdpaoup
---
components/release/tap_tosign.vue | 53 ++++++++++++++++--
pages/index/details.vue | 7 ++-
pages/release/index.vue | 27 ++++++++-
pages/release/video.vue | 90 ++++++++++++++++++++++++++++--
static/videoPlay.png | Bin 0 -> 4833 bytes
5 files changed, 164 insertions(+), 13 deletions(-)
create mode 100644 static/videoPlay.png
diff --git a/components/release/tap_tosign.vue b/components/release/tap_tosign.vue
index fb38ebe..7831b59 100644
--- a/components/release/tap_tosign.vue
+++ b/components/release/tap_tosign.vue
@@ -2,10 +2,16 @@
- 标签
+
+ 标签
+ {{ is_edit ? "取消编辑" : "编辑" }}
+
+ 新建标签
{{item.name}}
+ :key="index">
+ {{item.name}}
+
+
@@ -35,7 +41,8 @@
action: 'http://www.example.com/upload',
fileList: [],
show: false,
- rSelect: []
+ rSelect: [],
+ is_edit: false,
}
},
props:['fileListes'],
@@ -44,6 +51,10 @@
console.log(this.show)
this.show = !this.show
},
+ // 编辑标签
+ editing() {
+ this.is_edit = !this.is_edit;
+ },
// 颜色切换
tapInfo(e) {
if (this.rSelect.indexOf(e) == -1) {
@@ -54,6 +65,31 @@
}
this.$emit("qiehuan",this.rSelect)
},
+ // 删除标签
+ isTable(id,index) {
+ uni.showModal({
+ title: "提示",
+ content: "是否删除此标签？",
+ success: (res) => {
+ console.log();
+ if (res.confirm) {
+ this.delTable(id,index);
+ }
+ }
+ })
+ },
+ delTable(id,index) {
+ let me = this;
+ this.$u.post("Streaming/deltLabel", {label_id: id}).then(res => {
+ if (res.errCode == 0) {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: 'success'
+ });
+ this.fileListes.splice(index,1);
+ }
+ })
+ },
chuangjian(){
this.$u.api.createLivesp({spec_name:this.form.name}).then((res)=>{
if(res.errCode != 0){
@@ -81,7 +117,12 @@
#release {
width: 690rpx;
margin: 0 auto;
-
+
+ .flex-title {
+ display: flex;
+ justify-content: space-between;
+ }
+
.form-view {
background: rgba(255, 255, 255, 1);
border-radius: 6rpx;
@@ -91,6 +132,10 @@
display: inline-block;
margin-bottom: 28rpx;
color: #333;
+ .close {
+ margin-left: 10rpx;
+ vertical-align: middle;
+ }
}
.titles {
diff --git a/pages/index/details.vue b/pages/index/details.vue
index 9e8a713..591a6e9 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -181,6 +181,9 @@ export default {
};
},
onLoad(option) {
+ let pages = getCurrentPages();
+ let prePage = pages[pages.length - 2];
+ console.log(prePage);
this.type = option.type;
console.log(this.type)
this.orderid = option.id;
@@ -270,8 +273,8 @@ export default {
// 确定退款
this.$u.api.refund({
refund_id: this.refundid,
- seller_state:2,
- seller_message:""
+ seller_state: 2,
+ seller_message: ""
}).then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
diff --git a/pages/release/index.vue b/pages/release/index.vue
index a7cce63..a6e690c 100644
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -38,7 +38,7 @@
+ 新建标签
{{ item.name }}
-
+
@@ -246,6 +246,31 @@ export default {
}
});
},
+ // 删除标签
+ isTable(id,index) {
+ uni.showModal({
+ title: "提示",
+ content: "是否删除此标签？",
+ success: (res) => {
+ console.log();
+ if (res.confirm) {
+ this.delTable(id,index);
+ }
+ }
+ })
+ },
+ delTable(id,index) {
+ let me = this;
+ this.$u.post("Streaming/deltLabel", {label_id: id}).then(res => {
+ if (res.errCode == 0) {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: 'success'
+ });
+ this.fileListes.splice(index,1);
+ }
+ })
+ },
// 上传封面
uploadcover(data) {
console.log(data);
diff --git a/pages/release/video.vue b/pages/release/video.vue
index 2efddb0..253e1b8 100644
--- a/pages/release/video.vue
+++ b/pages/release/video.vue
@@ -16,17 +16,26 @@
@on-success="uploadcover"
>
视频
-
+
选择视频
-
+
+
+
+
+
+
- 标签
+
+ 标签
+ {{ is_edit ? "取消编辑" : "编辑" }}
+
+ 新建标签
{{ item.name }}
+
@@ -167,6 +176,7 @@ export default {
videopath: '', //视频链接
fileListes: [],
show: false,
+ is_video: false,
show_two: false,
arres_list: [],
shoplist: [], //选择商品列表
@@ -176,13 +186,27 @@ export default {
tagcontent: '', //新建标签名字
selectvideo: '', //视频名字
videostate: false, //视频状态
- progress: 0
+ progress: 0,
+ is_edit: false, // 编辑标签
};
},
onLoad() {
this.getLiveSpec();
this.resetgood();
},
+ watch: {
+ show() {
+ let me = this;
+ if (this.show) {
+ this.is_video = true;
+ } else {
+ setTimeout(function() {
+ me.is_video = false;
+ },600)
+ }
+ },
+ immediate: true
+ },
methods: {
// 获取可以推荐的商品
resetgood() {
@@ -291,6 +315,31 @@ export default {
}
});
},
+ // 删除标签
+ isTable(id,index) {
+ uni.showModal({
+ title: "提示",
+ content: "是否删除此标签？",
+ success: (res) => {
+ console.log();
+ if (res.confirm) {
+ this.delTable(id,index);
+ }
+ }
+ })
+ },
+ delTable(id,index) {
+ let me = this;
+ this.$u.post("Streaming/deltLabel", {label_id: id}).then(res => {
+ if (res.errCode == 0) {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: 'success'
+ });
+ this.fileListes.splice(index,1);
+ }
+ })
+ },
// 上传封面
uploadcover(data) {
let obj = data.data;
@@ -305,6 +354,10 @@ export default {
show_add() {
this.show = !this.show;
},
+ // 编辑标签
+ editing() {
+ this.is_edit = !this.is_edit;
+ },
// 选择直播商品点击确定
changes() {
let that = this;
@@ -353,6 +406,10 @@ export default {
width: 690rpx;
margin: 0 auto;
padding-bottom:20rpx;
+ .flex-title {
+ display: flex;
+ justify-content: space-between;
+ }
.titles_border,
.uni-textarea-compute {
border: 1px #bababa solid !important;
@@ -487,6 +544,10 @@ export default {
display: inline-block;
margin-bottom: 28rpx;
color: #fff;
+ .close {
+ margin-left: 10rpx;
+ vertical-align: middle;
+ }
}
.active {
background: #ff780f;
@@ -497,16 +558,33 @@ export default {
color: rgba(51, 51, 51, 1);
margin: 30rpx 0;
}
+ .video-flex {
+ flex-direction: column;
+ font-size: 28rpx;
+ color: #666;
+ }
.videobox {
width: 200rpx;
height: 200rpx;
display: flex;
- flex-direction: column;
justify-content: center;
align-items: center;
- background: #f4f5f6;
+ background-color: #f4f5f6;
margin-left: 10rpx;
border-radius: 10rpx;
+
+ .video-mode {
+ width: 200rpx;
+ height: 200rpx;
+ line-height: 280rpx;
+ text-align: center;
+ border-radius: 10rpx;
+ background-color: #000;
+ & > image {
+ width: 100rpx;
+ height: 100rpx;
+ }
+ }
}
.videotext {
margin-top: 10rpx;
diff --git a/static/videoPlay.png b/static/videoPlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..f18c676150878d960eb93b96e3a9a2e77433c026
GIT binary patch
literal 4833
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
Hu0mjfs5=}k
literal 0
HcmV?d00001