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 0000000..f18c676
Binary files /dev/null and b/static/videoPlay.png differ