diff --git a/pages/index/details.vue b/pages/index/details.vue index 3dc3c9a..d12e47c 100644 --- a/pages/index/details.vue +++ b/pages/index/details.vue @@ -2,7 +2,7 @@ - + {{ list.goods_name }} @@ -39,6 +39,7 @@ 姓名 {{ info.extend_order_common.reciver_name }} + 手机号 @@ -526,6 +527,11 @@ export default { } .value { font-size: 26rpx; + flex: 1; + } + image{ + width: 40rpx; + height: 40rpx; } } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 42764ed..ab7edb5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,7 +2,7 @@ - + > --> + @@ -34,7 +35,7 @@ 选择订单号 {{ worker.name }} - + 请选择 @@ -358,6 +359,13 @@ export default { }, // 骑手投诉点击确定 setWorker(e) { + if(e[0].label==null){ + this.$refs.uToast.show({ + title: "选择无效", + type: 'error' + }); + return + } let arr = this.carlist; for (let index in arr) { if (arr[index].takeawayer_id == e[0].value) { diff --git a/pages/release/index.vue b/pages/release/index.vue index 8ea3402..a055cd0 100644 --- a/pages/release/index.vue +++ b/pages/release/index.vue @@ -33,7 +33,7 @@ 标签 + 新建标签 - + {{ item.name }} @@ -46,10 +46,17 @@ 选择商品 - + - + @@ -118,6 +125,8 @@ export default { checked: false, list: [], List_tosign: [], + flagA: true, + flagB: false, scrollTop: 0, imgarr: [], //上传图片数组 cover: '', //图文封面 @@ -137,31 +146,34 @@ export default { for (let index in arr) { newarr.push(arr[index].file_id); } - this.$u.api.publishphoto({ - article_title: this.form.name, - article_content: this.form.intro, - article_pic: this.imgarrA[0].file_name, - file_id: newarr, - goods_id_arr: this.arres_list, - label_arr: this.selectarr - }).then(res => { - if (res.errCode != 0) { - this.$refs.uToast.show({ - title: res.message, - type: 'error' - }); - } else { - this.$refs.uToast.show({ - title: res.message, - type: 'success' - }); - setTimeout(function(){ - uni.navigateBack({ - delta:1 - }) - },1000) - } - }); + console.log(this.imgarrA); + this.$u.api + .publishphoto({ + article_title: this.form.name, + article_content: this.form.intro, + article_pic: this.imgarrA[0].file_name, + file_id: newarr, + goods_id_arr: this.arres_list, + label_arr: this.selectarr + }) + .then(res => { + if (res.errCode != 0) { + this.$refs.uToast.show({ + title: res.message, + type: 'error' + }); + } else { + this.$refs.uToast.show({ + title: res.message, + type: 'success' + }); + setTimeout(function() { + uni.navigateBack({ + delta: 1 + }); + }, 1000); + } + }); }, // 获取商品数组变化 getshoplist(id) { @@ -207,35 +219,52 @@ export default { }, // 创建标签 addLiveSpec() { - this.$u.api.createLivesp({ - spec_name: this.tagcontent - }).then(res => { - if (res.errCode != 0) { - this.$refs.uToast.show({ - title: res.message, - type: 'error' - }); - } else { - this.tagcontent = ''; - this.show = false; - this.$refs.uToast.show({ - title: res.message, - type: 'success' - }); - } - }); + this.$u.api + .createLivesp({ + spec_name: this.tagcontent + }) + .then(res => { + if (res.errCode != 0) { + this.$refs.uToast.show({ + title: res.message, + type: 'error' + }); + } else { + this.tagcontent = ''; + this.show = false; + this.$refs.uToast.show({ + title: res.message, + type: 'success' + }); + } + }); }, // 上传封面 uploadcover(data) { - let obj = data.data; - obj.url = obj.file_path; - this.imgarrA.push(obj); + console.log(data); + if (data.errCode != 0) { + this.$refs.uToast.show({ + title: '上传失败', + type: 'error' + }); + } else { + let obj = data.data; + obj.url = obj.file_path; + this.imgarrA.push(obj); + } }, // 上传图片 uploadphoto(data) { - let obj = data.data; - obj.url = obj.file_path; - this.imgarrB.push(obj); + if (data.errCode != 0) { + this.$refs.uToast.show({ + title: '上传失败', + type: 'error' + }); + } else { + let obj = data.data; + obj.url = obj.file_path; + this.imgarrB.push(obj); + } }, changes() { let that = this; @@ -246,16 +275,14 @@ export default { }, // 选中某个复选框时,由checkbox时触发 checkboxChange(e) { - 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 - } + let that = this; + let num =Number(e.name) + if (e.value == true) { + that.delarr(that.list[num].goods_id); + that.list[num].checked=true + } else { + that.pushes(that.list[num].goods_id); + that.list[num].checked=false } }, // 删除直播商品 @@ -288,7 +315,7 @@ export default { } else { let arr = res.data.list; for (let index in arr) { - arr[index].checked = false; + arr[index].checked = true; } this.list = arr; } @@ -312,7 +339,7 @@ export default { margin: 0 auto; .form-view { - background: #CDC7C8; + background: #cdc7c8; border-radius: 6rpx; margin-right: 20rpx; font-size: 24rpx; @@ -322,7 +349,7 @@ export default { color: #fff; } .active { - background: #FF780F; + background: #ff780f; } .scroll { width: 100%; diff --git a/pages/release/video.vue b/pages/release/video.vue index 002d29f..05bbbc5 100644 --- a/pages/release/video.vue +++ b/pages/release/video.vue @@ -37,10 +37,17 @@ 选择商品 - + - + @@ -230,6 +237,9 @@ export default { uploadvideo() { let url = this.action; let that = this; + uni.showLoading({ + title:"上传中!" + }) uni.chooseVideo({ count: 1, sourceType: ['camera', 'album'], @@ -251,6 +261,7 @@ export default { let obj = JSON.parse(uploadFileRes.data); that.videopath = obj.data.url; that.selectvideo = obj.data.key; + uni.hideLoading() that.videostate = true; }, fail: function(error) { @@ -271,15 +282,14 @@ export default { }, // 选中某个复选框时,由checkbox时触发 checkboxChange(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 - } + let that = this; + let num =Number(e.name) + if (e.value == true) { + that.delarr(that.list[num].goods_id); + that.list[num].checked=true + } else { + that.pushes(that.list[num].goods_id); + that.list[num].checked=false } }, // 删除直播商品 diff --git a/pages/user/info.vue b/pages/user/info.vue index de4bc44..84122c2 100644 --- a/pages/user/info.vue +++ b/pages/user/info.vue @@ -57,6 +57,9 @@ export default { title: res.message, type: 'success' }); + uni.navigateBack({ + delta:1 + }) } }); }, diff --git a/static/image/tabbar/index.png b/static/image/tabbar/index.png index dd79cbf..daa9381 100644 Binary files a/static/image/tabbar/index.png and b/static/image/tabbar/index.png differ diff --git a/static/image/tabbar/indexselect.png b/static/image/tabbar/indexselect.png index ada108f..2db9213 100644 Binary files a/static/image/tabbar/indexselect.png and b/static/image/tabbar/indexselect.png differ diff --git a/static/image/tabbar/info.png b/static/image/tabbar/info.png index a1ea72c..fef3c42 100644 Binary files a/static/image/tabbar/info.png and b/static/image/tabbar/info.png differ diff --git a/static/image/tabbar/infoselect.png b/static/image/tabbar/infoselect.png index 18c49d2..f4d93b7 100644 Binary files a/static/image/tabbar/infoselect.png and b/static/image/tabbar/infoselect.png differ diff --git a/static/image/tabbar/mine.png b/static/image/tabbar/mine.png index cef4977..c6f4f38 100644 Binary files a/static/image/tabbar/mine.png and b/static/image/tabbar/mine.png differ diff --git a/static/image/tabbar/mineselect.png b/static/image/tabbar/mineselect.png index 8fd5d5b..88d2dd9 100644 Binary files a/static/image/tabbar/mineselect.png and b/static/image/tabbar/mineselect.png differ