diff --git a/package-lock.json b/package-lock.json index 17ec1be..f0b8a02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3121,6 +3121,44 @@ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "css-loader": { "version": "3.6.0", "resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-3.6.0.tgz", @@ -3194,6 +3232,13 @@ "slash": "^2.0.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, "hash-sum": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz", @@ -3308,6 +3353,42 @@ "requires": { "minipass": "^3.1.1" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } } } }, @@ -16640,94 +16721,6 @@ "vue-style-loader": "^4.1.0" } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz", diff --git a/src/pages.json b/src/pages.json index 73188be..bff5b6e 100644 --- a/src/pages.json +++ b/src/pages.json @@ -619,6 +619,14 @@ "enablePullDownRefresh": false } }, + // 下乡管理 + { + "path": "xxgl/index", + "style": { + "navigationBarTitleText": "下乡管理", + "enablePullDownRefresh": false + } + }, // 线上看展 { "path": "xskz/index", @@ -627,15 +635,28 @@ "enablePullDownRefresh": false } }, - // 线上看展 + // 线上看展-详情 { "path": "xskz/details", "style": { "navigationBarTitleText": "线上看展-详情", "enablePullDownRefresh": false + // "usingComponents": { + // "player-component": "plugin://player/video" + // } } } - + // 线上看展-详情 + // { + // "path": "xskz/details", + // "style": { + // "navigationBarTitleText": "线上看展-详情", + // "enablePullDownRefresh": false, + // "usingComponents": { + // "player-component": "plugin://player/video" + // } + // } + // } ] } ], @@ -655,4 +676,4 @@ "navigationBarBackgroundColor": "#FFFFFF", //导航栏背景颜色（同状态栏背景色） "backgroundColor": "#F8F8F8" //下拉显示出来的窗口的背景色 } -} +} \ No newline at end of file diff --git a/src/pagesA/my/My.vue b/src/pagesA/my/My.vue index 0d08354..35c6fec 100644 --- a/src/pagesA/my/My.vue +++ b/src/pagesA/my/My.vue @@ -4,7 +4,7 @@ - + @@ -33,25 +33,19 @@ {{ care }} - - 关注 - + 关注 {{ colNum }} - - 收藏 - + 收藏 {{ fans }} - - 粉丝 - + 粉丝 @@ -73,47 +67,35 @@ - - 我的交易 - - - 作品交易订单 - + 我的交易 + 作品交易订单 - - 我的作品 - + 我的作品 - - 活动管理 - + 活动管理 - - 点单管理 - + 点单管理 - + - - 下乡管理 - + 下乡管理 @@ -127,19 +109,14 @@ --> - - - 消息 - + 消息 - - 设置 - + 设置 @@ -147,215 +124,238 @@ - + @@ -395,7 +395,7 @@ image { margin-left: 24rpx; .user_name_de { - color: #251B1D; + color: #251b1d; font-size: 40rpx; font-weight: 600; @@ -420,10 +420,9 @@ image { .words { margin-top: 16rpx; - color: #AFADB0; + color: #afadb0; font-size: 24rpx; } - } .arrow { @@ -431,10 +430,8 @@ image { height: 48rpx; } } - } - .content_area { padding: 0 32rpx; margin-bottom: 120rpx; @@ -447,18 +444,18 @@ image { height: 160rpx; border: 1px solid transparent; border-radius: 8px; - background-color: #FFFFFF; + background-color: #ffffff; .fans_itm { .nums { - color: #251B1D; + color: #251b1d; font-weight: bold; font-family: DIN-Bold, DIN; font-size: 16px; } .itms_name { - color: #AFADB0; + color: #afadb0; font-size: 24rpx; margin-top: 16rpx; } @@ -477,7 +474,7 @@ image { display: flex; width: 332rpx; height: 136rpx; - background-color: #FFFFFF; + background-color: #ffffff; border-radius: 8px; .ji_ico { @@ -492,12 +489,12 @@ image { .ji_word_title { font-size: 28rpx; - color: #251B1D; + color: #251b1d; font-weight: 600; } .ji_con { - color: #AFADB0; + color: #afadb0; font-size: 24rpx; font-weight: 400; margin-top: 8rpx; @@ -508,7 +505,7 @@ image { .content_bott { padding: 32rpx; - background-color: #FFFFFF; + background-color: #ffffff; border-radius: 8px; .content_bott_itm { @@ -519,7 +516,7 @@ image { .content_bott_wods { font-size: 28rpx; - color: #251B1D; + color: #251b1d; font-weight: 600; } diff --git a/src/pagesD/wyxx/addindex.vue b/src/pagesD/wyxx/addindex.vue index c8fc3a4..a9d68b4 100644 --- a/src/pagesD/wyxx/addindex.vue +++ b/src/pagesD/wyxx/addindex.vue @@ -23,7 +23,7 @@ + labelSize="28rpx" labelColor="#231F1C" :name="item.name" activeColor="#99241B "> 确认 @@ -41,9 +41,9 @@ - + + labelSize="28rpx" labelColor="#231F1C" :name="item.name" activeColor="#99241B "> 确认 @@ -106,8 +106,10 @@ export default { ok: true, team: [], teams: '', + teamsId: '', program: [], programs: '', + programsId: '', showTypes: false } }, @@ -128,32 +130,6 @@ export default { this.eTime = gettime this.wTime = gettime }, - // 订单类型 - // getTypeList () { - // this.http.request('/hallType/list', {}, "GET").then(res => { - // if (res.code == 200) { - // this.radiolist1 = res.data.records - // } - // }).catch(e => { - // uni.showToast({ - // title: e.data.message, - // icon: "none", - // }); - // }) - // }, - // 用户类型 - // getUserList () { - // this.http.request('/hall/yhlx', {}, "GET").then(res => { - // if (res.code == 200) { - // this.radiolist2 = res.data - // } - // }).catch(e => { - // uni.showToast({ - // title: e.data.message, - // icon: "none", - // }); - // }) - // }, close () { this.showType = false this.showTime = false @@ -161,9 +137,18 @@ export default { }, selectForm1 (form) { let _this = this - this.radiolist1.forEach(function (item) { + this.program.forEach((item) => { if (item.name == form) { - _this.typeId = item.code + _this.teamsId = item.id + } + }) + }, + + selectForm2 (form) { + let _this = this + this.team.forEach(function (item) { + if (item.name == form) { + _this.programsId = item.id } }) }, @@ -179,82 +164,6 @@ export default { } this.showTime = false }, - // selectForm2 () { - // let _this = this - // let code = [] - // this.radiolist2.forEach(function (item) { - // _this.radiovalue2.forEach(function (ele) { - // if (item.label == ele) { - // code.push(item.value) - // } - // }) - // }) - // this.userTypeValue = code.join(',') - // this.userType = this.radiovalue2.join(',') - // this.showUser = false - // }, - changeTrue (e) { - console.log('change', e); - }, - valChange (e) { - console.log('当前值为: ' + e.value) - }, - // 删除图片 - deletePic (event) { - this[`fileList${event.name}`].splice(event.index, 1) - }, - // 新增图片 - // async afterRead (event) { - // // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式 - // let lists = [].concat(event.file) - // let fileListLen = this[`fileList${event.name}`].length - // lists.map((item) => { - // this[`fileList${event.name}`].push({ - // ...item, - // status: 'uploading', - // message: '上传中' - // }) - // }) - // for (let i = 0; i < lists.length; i++) { - // const result = await this.uploadFilePromise(lists[i].url) - // let item = this[`fileList${event.name}`][fileListLen] - // this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, { - // status: 'success', - // message: '', - // url: result - // })) - // fileListLen++ - // } - // }, - // uploadFilePromise (url) { - // let token = uni.getStorageSync('token'); - // return new Promise((resolve, reject) => { - // let a = uni.uploadFile({ - // url: http.config.baseUrl + '/file/upload', - // filePath: url, - // name: 'file', - // formData: { - // user: 'test' - // }, - // header: { - // "X-Token": token - // }, - // success: (res) => { - // if (JSON.parse(res.data).code == 200) { - // setTimeout(() => { - // resolve(JSON.parse(res.data).data.path) - // }, 1000) - // } else { - // uni.showToast({ - // title: JSON.parse(res.data).message, - // icon: "none", - // }); - // this.fileList3.pop() - // } - // } - // }); - // }) - // }, next () { this.ok = true if (this.title == '') { @@ -317,8 +226,8 @@ export default { this.http.request('/artCountryside/add', { title: this.title, - showId: this.programs, - teams: this.teams, + showId: this.programsId, + teamId: this.teamsId, endTime: this.eTime, startTime: this.wTime, }, "POST").then(res => { @@ -355,7 +264,6 @@ export default { }) } - } } diff --git a/src/pagesD/wyxx/detail.vue b/src/pagesD/wyxx/detail.vue new file mode 100644 index 0000000..99c3659 --- /dev/null +++ b/src/pagesD/wyxx/detail.vue @@ -0,0 +1,446 @@ + + + + + diff --git a/src/pagesD/wyxx/index.vue b/src/pagesD/wyxx/index.vue index 54f737c..00e234a 100644 --- a/src/pagesD/wyxx/index.vue +++ b/src/pagesD/wyxx/index.vue @@ -19,7 +19,9 @@ - + + + @@ -41,7 +43,8 @@ - + + @@ -64,16 +67,25 @@ - - + + {{ item.title }} - {{ item.content }} + + 节目：{{ item.teamName }} + + + 团队：{{ item.showName }} + - 截止时间：{{ item.deadline }} + 开始时间：{{ item.startTime }} + + + + 截止时间：{{ item.endTime }} @@ -83,6 +95,7 @@ + @@ -94,7 +107,8 @@ export default { mainList: [], villageId: '', team: [], - program: [] + program: [], + loadings: true }; }, onShow () { @@ -105,21 +119,23 @@ export default { this.tabC = val; }, RuralDevelopmentPlanlist () { + this.loadings = true let data = { villageId: this.villageId } this.http.request(`/artCountryside/list`, data, 'GET').then(res => { if (res.code === 200) { - console.log(res.data.records); this.mainList = res.data.records + this.loadings = false } else { + this.loadings = false uni.showToast({ - title: res.data.message, + title: res.message, icon: "error", }); } }).catch(err => { - + this.loadings = false }) }, toAddOrder () { @@ -147,6 +163,20 @@ export default { } }).catch(err => { + }) + }, + toDetail (value) { + this.http.request(`/artCountryside/details?id=${value}`, {}, 'GET').then(res => { + if (res.code == 200) { + console.log(res); + } else { + uni.showToast({ + title: res.message, + icon: "error", + }); + } + }).catch(err => { + }) } }, @@ -200,15 +230,17 @@ export default { } .forms { - width: 90%; + width: 98%; // height: 40rpx; // background-color: skyblue; - margin: 40rpx auto 0rpx; + margin: 20rpx auto; .teamBox { height: 140rpx; padding: 18rpx 10rpx; background-color: #fff; + // background-color: rgb(241, 243, 244); + border: 1px solid rgb(241, 243, 244); margin-bottom: 20rpx; display: flex; @@ -276,10 +308,14 @@ image { .main { padding: 32rpx; // background-color: #F4F5F7; + // background-color: rgb(241, 243, 244); + border-radius: 16rpx; .mainList { - margin-bottom: 32rpx; border-radius: 16rpx; + // background-color: rgb(241, 243, 244); + margin-bottom: 20rpx; + border: 1px solid rgb(241, 243, 244); overflow: hidden; .mainListImg { @@ -300,7 +336,8 @@ image { .text { padding: 32rpx; - background-color: #FFF; + // background-color: #FFF; + .text1 { font-size: 32rpx; @@ -345,4 +382,12 @@ image { border-radius: 50%; z-index: 999; } + +.loading { + width: 100%; + height: 100%; + position: absolute; + left: 0px; + top: 0px; +} diff --git a/src/pagesD/xskz/details.vue b/src/pagesD/xskz/details.vue index ddba72b..180d74c 100644 --- a/src/pagesD/xskz/details.vue +++ b/src/pagesD/xskz/details.vue @@ -1,10 +1,10 @@ @@ -17,10 +17,11 @@ export default { }; }, onShow() { - this.store = requirePlugin("player"); - this.player = this.store.get("tvp"); - console.log(this.store); - console.log(this.player); + // this.store = requirePlugin("player"); + // this.player = this.selectComponent('#tvp-id'); + // this.player = this.store.get("tvp"); + // console.log(this.store); + // console.log(this.player); }, mounted() {}, methods: {}, diff --git a/src/pagesD/xskz/index.vue b/src/pagesD/xskz/index.vue index 052ada8..7202d84 100644 --- a/src/pagesD/xskz/index.vue +++ b/src/pagesD/xskz/index.vue @@ -24,11 +24,27 @@ --> - + - + + + {{ item.name }} + + + - + + + @@ -102,6 +118,12 @@ export default { }); }); }, + skip(query = {}) { + uni.navigateTo({ + // 稍后改为 订单管理的页面 + url: "/pagesD/xskz/details", + }); + }, playMask(obj) { // this.videoList[index].play = false; // var video = document.getElementById("video"); @@ -163,44 +185,52 @@ export default { } .forms { - width: 90%; margin: 40rpx auto 0rpx; .teamBox { .teamBox-top { position: relative; - - .team-image { - width: 100%; - height: 400rpx; - border: 2px solid red; + .content { + position: relative; + z-index: 4; + .content-title { + position: absolute; + z-index: 10; + padding: 18rpx; + text { + color: #fff; + max-width: 500rpx; + overflow: hidden; /* 超出一行文字自动隐藏 */ + text-overflow: ellipsis; /*文字隐藏后添加省略号*/ + white-space: nowrap; + } + } + .team-image { + width: 100%; + height: 400rpx; + } } .mask { position: absolute; top: 0; - width: 100%; - height: 100%; - z-index: 99; - text { - // position: absolute; - // left: 60rpx; - color: #fff; - max-width: 500rpx; - overflow: hidden; /* 超出一行文字自动隐藏 */ - text-overflow: ellipsis; /*文字隐藏后添加省略号*/ - white-space: nowrap; - } - image { - width: 60rpx; - height: 60rpx; - margin: 110rpx 0 0 300rpx; + left: 0; + right: 0; + bottom: 0; + z-index: 12; + display: flex; + align-items: center; + justify-content: center; + .mask-play { + image { + width: 60rpx; + height: 60rpx; + } } } } .teamBox-bottom { display: flex; justify-content: space-between; - width: 100%; - padding: 15rpx 15rpx; + padding: 15rpx 32rpx; background-color: #fff; box-sizing: border-box; .interactive { diff --git a/src/pagesD/xxgl/index.vue b/src/pagesD/xxgl/index.vue index 3fc0e38..fa40bed 100644 --- a/src/pagesD/xxgl/index.vue +++ b/src/pagesD/xxgl/index.vue @@ -1,117 +1,243 @@