Merge branch 'master' of git.zdool.com:xs/yyx/h5

This commit is contained in:
lnn19986213 2023-08-03 14:55:28 +08:00
commit ba56a0f63b
9 changed files with 1555 additions and 830 deletions

169
package-lock.json generated
View File

@ -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",

View File

@ -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"
// }
// }
// }
]
}
],

View File

@ -4,7 +4,7 @@
<u-loading-page :loading="load"></u-loading-page>
</view>
<view v-if="load == false">
<view class="top" :style="{ 'height': titleHeight + 'px' }">
<view class="top" :style="{ height: titleHeight + 'px' }">
<image class="bg" src="../../static/MyBg.png" mode=""></image>
<view class="avator_box" @click="GoPersonalCenter">
<view class="tou">
@ -33,25 +33,19 @@
<view class="nums">
{{ care }}
</view>
<view class="itms_name">
关注
</view>
<view class="itms_name"> 关注 </view>
</view>
<view class="fans_itm" @click="toCol()">
<view class="nums">
{{ colNum }}
</view>
<view class="itms_name">
收藏
</view>
<view class="itms_name"> 收藏 </view>
</view>
<view class="fans_itm" @click="toFans()">
<view class="nums">
{{ fans }}
</view>
<view class="itms_name">
粉丝
</view>
<view class="itms_name"> 粉丝 </view>
</view>
</view>
<view class="jifen_box">
@ -73,47 +67,35 @@
<image src="../../static/DunIcon.png" mode=""></image>
</view>
<view class="ji_word_box">
<view class="ji_word_title">
我的交易
</view>
<view class="ji_con">
作品交易订单
</view>
<view class="ji_word_title"> 我的交易 </view>
<view class="ji_con"> 作品交易订单 </view>
</view>
</view>
</view>
<view class="content_bott">
<view class="content_bott_itm" @click="toWork()">
<view class="content_bott_wods">
我的作品
</view>
<view class="content_bott_wods"> 我的作品 </view>
<view class="content_bott_arrow">
<image src="../../static/rightArrow.png" mode=""></image>
</view>
</view>
<view class="content_bott_itm" @click="tohdM()">
<view class="content_bott_wods">
活动管理
</view>
<view class="content_bott_wods"> 活动管理 </view>
<view class="content_bott_arrow">
<image src="../../static/rightArrow.png" mode=""></image>
</view>
</view>
<view class="content_bott_itm" @click="toOrderControl()">
<view class="content_bott_wods">
点单管理
</view>
<view class="content_bott_wods"> 点单管理 </view>
<view class="content_bott_arrow">
<image src="../../static/rightArrow.png" mode=""></image>
</view>
</view>
<view class="content_bott_itm" >
<view class="content_bott_itm" @click="toCountryside()">
<!-- @click="" -->
<view class="content_bott_wods">
下乡管理
</view>
<view class="content_bott_wods"> 下乡管理 </view>
<view class="content_bott_arrow">
<image src="../../static/rightArrow.png" mode=""></image>
</view>
@ -127,19 +109,14 @@
</view>
</view> -->
<view class="content_bott_itm" @click="myNews()">
<view class="content_bott_wods">
消息
</view>
<view class="content_bott_wods"> 消息 </view>
<view class="content_bott_arrow">
<image src="../../static/rightArrow.png" mode=""></image>
</view>
</view>
<view class="content_bott_itm" @click="toSz()">
<view class="content_bott_wods">
设置
</view>
<view class="content_bott_wods"> 设置 </view>
<view class="content_bott_arrow">
<image src="../../static/rightArrow.png" mode=""></image>
</view>
@ -147,215 +124,238 @@
</view>
</view>
<u-gap height="50" bgColor="#F4F5F7"></u-gap>
<tabbar tabbarId='5'></tabbar>
<tabbar tabbarId="5"></tabbar>
</view>
</view>
</template>
<script>
export default {
data () {
data() {
return {
load: true,
image: '',
userName: '',
userId: '',
point: '',
colNum: '',
fans: '',
care: '',
yhsf: '',
image: "",
userName: "",
userId: "",
point: "",
colNum: "",
fans: "",
care: "",
yhsf: "",
isUnread: false,
statusHeight: 0,
titleHeight: 90,
};
},
onReady () {
onReady() {
const systemMsg = uni.getSystemInfoSync();
this.statusHeight = systemMsg.statusBarHeight
this.statusHeight = systemMsg.statusBarHeight;
// #ifdef MP-WEIXIN
const menuButtonInfo = uni.getMenuButtonBoundingClientRect() //
this.titleHeight = 90 + menuButtonInfo.height + (menuButtonInfo.top - systemMsg.statusBarHeight) * 2
const menuButtonInfo = uni.getMenuButtonBoundingClientRect(); //
this.titleHeight =
90 +
menuButtonInfo.height +
(menuButtonInfo.top - systemMsg.statusBarHeight) * 2;
// #endif
},
onShow () {
this.getUserInfo()
onShow() {
this.getUserInfo();
},
methods: {
//
getUserInfo () {
let _this = this
this.http.request('/user/userInfo', {}, "GET").then(res => {
getUserInfo() {
let _this = this;
this.http
.request("/user/userInfo", {}, "GET")
.then((res) => {
if (res.code == 200) {
// let img = JSON.parse(res.data.images)
this.image = res.data.images
this.userName = res.data.userName
this.userId = res.data.id
this.yhsf = res.data.yhsf
this.point = res.data.point
this.getCol()
this.image = res.data.images;
this.userName = res.data.userName;
this.userId = res.data.id;
this.yhsf = res.data.yhsf;
this.point = res.data.point;
this.getCol();
}
}).catch(e => {
})
.catch((e) => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
});
},
//
getCol () {
this.http.request('/worksCollection', {}, "GET").then(res => {
getCol() {
this.http
.request("/worksCollection", {}, "GET")
.then((res) => {
if (res.code == 200) {
if (res.data.length == 0) {
this.colNum = 0
this.colNum = 0;
} else {
this.colNum = res.data.total
this.colNum = res.data.total;
}
this.getCare()
this.getCare();
}
}).catch(e => {
})
.catch((e) => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
});
},
//
getCare () {
this.http.request('/userFollow/myFollow', {}, "GET").then(res => {
getCare() {
this.http
.request("/userFollow/myFollow", {}, "GET")
.then((res) => {
if (res.code == 200) {
if (res.data.length == 0) {
this.care = 0
this.care = 0;
} else {
this.care = res.data.total
this.care = res.data.total;
}
this.getFans()
this.getFans();
}
}).catch(e => {
})
.catch((e) => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
});
},
//
getFans () {
this.http.request('/userFollow/myFans', {}, "GET").then(res => {
getFans() {
this.http
.request("/userFollow/myFans", {}, "GET")
.then((res) => {
if (res.code == 200) {
if (res.data.length == 0) {
this.fans = 0
this.fans = 0;
} else {
this.fans = res.data.total
this.fans = res.data.total;
}
this.load = false
this.load = false;
}
}).catch(e => {
})
.catch((e) => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
});
},
//
getTalkList () {
let _this = this
this.http.request('/chat/lists', {}, "GET").then(res => {
getTalkList() {
let _this = this;
this.http
.request("/chat/lists", {}, "GET")
.then((res) => {
if (res.code == 200) {
if (res.data.length > 0) {
res.data.forEach(function (item) {
if (item.unread > 0)
_this.isUnread = true
if (item.unread > 0) _this.isUnread = true;
});
}
}
})
}
}
}).catch(e => {
.catch((e) => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
});
},
//
gopointsPg () {
gopointsPg() {
uni.navigateTo({
url: "/pagesB/MyPoints/MyPoints"
})
url: "/pagesB/MyPoints/MyPoints",
});
},
//
goOrderDetails () {
goOrderDetails() {
uni.navigateTo({
url: "/pagesB/MyOrder/MyOrder"
})
url: "/pagesB/MyOrder/MyOrder",
});
},
//
GoPersonalCenter () {
GoPersonalCenter() {
uni.navigateTo({
url: "/pagesB/PersonalCenter/PersonalCenter"
})
url: "/pagesB/PersonalCenter/PersonalCenter",
});
},
//
toCol () {
toCol() {
uni.navigateTo({
url: "/pagesA/my/myCollection"
})
url: "/pagesA/my/myCollection",
});
},
//
toFollow () {
toFollow() {
uni.navigateTo({
url: "/pagesA/my/myFollow?tab=0"
})
url: "/pagesA/my/myFollow?tab=0",
});
},
//
toFans () {
toFans() {
uni.navigateTo({
url: "/pagesA/my/myFollow?tab=1"
})
url: "/pagesA/my/myFollow?tab=1",
});
},
//
toWork () {
toWork() {
uni.navigateTo({
url: "/pagesA/my/myWoekList",
})
});
},
//
toOrderControl () {
toOrderControl() {
uni.navigateTo({
//
url: "OrderActControl",
})
});
},
//
toCountryside() {
uni.navigateTo({
//
url: "/pagesD/xxgl/index",
});
},
//
toAddress () {
toAddress() {
uni.navigateTo({
url: "/pagesA/ReceivingAddress/ReceivingAddress",
})
});
},
//
toSz () {
toSz() {
uni.navigateTo({
url: "/pagesA/my/logOut"
})
url: "/pagesA/my/logOut",
});
},
//
tohdM () {
tohdM() {
uni.navigateTo({
url: "/pagesA/activeManage/activeManage",
})
});
},
//
myNews () {
myNews() {
uni.navigateTo({
url: "/pagesA/msg/msg"
})
}
}
}
url: "/pagesA/msg/msg",
});
},
},
};
</script>
<style>
page {
background-color: #F4F5F7;
background-color: #f4f5f7;
}
</style>
@ -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;
}

View File

@ -23,7 +23,7 @@
<u-radio-group @change="selectForm1" v-model="programs" :borderBottom="true" placement="column"
iconPlacement="right">
<u-radio :customStyle="{ marginBottom: '16px' }" v-for="(item, index) in program" :key="index" :label="item.name"
labelSize="28rpx" labelColor="#231F1C" :name="item.id" activeColor="#99241B ">
labelSize="28rpx" labelColor="#231F1C" :name="item.name" activeColor="#99241B ">
</u-radio>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="showType = false">确认</u-button>
@ -41,9 +41,9 @@
</view>
</view>
<u-popup :show="showTypes" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
<u-radio-group @change="selectForm1" v-model="teams" :borderBottom="true" placement="column" iconPlacement="right">
<u-radio-group @change="selectForm2" v-model="teams" :borderBottom="true" placement="column" iconPlacement="right">
<u-radio :customStyle="{ marginBottom: '16px' }" v-for="(item, index) in team" :key="index" :label="item.name"
labelSize="28rpx" labelColor="#231F1C" :name="item.id" activeColor="#99241B ">
labelSize="28rpx" labelColor="#231F1C" :name="item.name" activeColor="#99241B ">
</u-radio>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="showTypes = false">确认</u-button>
@ -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 {
})
}
}
}
</script>

446
src/pagesD/wyxx/detail.vue Normal file
View File

@ -0,0 +1,446 @@
<template>
<view class="">
<view class="">
<u-loading-page :loading="load"></u-loading-page>
</view>
<view class="page" v-if="load == false">
<view class="return" @click="back">
<image src="../../static/orderLeftArrow.png" mode="scaleToFill"></image>
</view>
<view class="pageImg">
<u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current"
indicatorStyle="right: 20px" height='440rpx'>
<view slot="indicator" class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
</view>
</u-swiper>
</view>
<view class="main">
<view class="mainTitle">{{ data.title }}</view>
<view class="textList">
<view class="type">
<img class='textImg' src="../../static/detailIcon/icon10.png" alt="">
<view class="text1">需求清单</view>
</view>
<view class="text2">{{ data.demand }}</view>
</view>
<view class="textList">
<view class="type">
<img class='textImg' src="../../static/detailIcon/icon10.png" alt="">
<view class="text1">具体内容</view>
</view>
<view class="text2">
{{ data.content }}
</view>
</view>
<view class="file_box" v-for="(item, index) in list2" :key="index" @click="downLoad(item.url)">
<view class="file_box_left">
<image :src="item.img" class="file_box_left_img"></image>
</view>
<view class="file_box_right">
<view class="file_box_name">
{{ item.name }}
</view>
</view>
</view>
</view>
<view class="line"></view>
<view class="activityDetails">
<view class="item_ul">
<view class="title">
<image class="icon" src="../../static/detailIcon/icon0.png" mode="scaleToFill"></image>
<text>需求详情</text>
</view>
<view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon5.png" mode="scaleToFill"></image>
<text>类型:</text>
</view>
<view class="content">{{ data.typeName }}</view>
</view>
<!-- <view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon8.png" mode="scaleToFill"></image>
<text>可接单用户类型:</text>
</view>
<view class="content"> {{data.rclx}} </view>
</view> -->
<view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon6.png" mode="scaleToFill"></image>
<text> 可接单人数:</text>
</view>
<view class="content"><text style=" color: #99241B;"> {{ data.jdrs }}</text>/{{ data.quantity }} </view>
</view>
<view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon7.png" mode="scaleToFill"></image>
<text>截止时间:</text>
</view>
<view class="content"> {{ data.deadline }}</view>
</view>
<view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon4.png" mode="scaleToFill"></image>
<text>活动时间:</text>
</view>
<view class="content"> {{ data.activityTime }} </view>
</view>
</view>
</view>
<view v-if="isCheck == 0">
<view class="" v-if="data.hallState == 1">
<view class="orderBtn" v-if="data.isBaoming">
<view class="btnQ" @click="baoQ">取消接单</view>
</view>
<view class="orderBtn" v-else>
<view class="btn" @click="bao">申请接单</view>
</view>
</view>
<view class="" v-else>
<view class="orderBtn">
<view class="btnQ">已无法接单</view>
</view>
</view>
</view>
<view v-else-if="isCheck == 1">
<view class="bao_title">
已接单用户
</view>
<view class="per_line" v-for="(v, i) in userList" :key="i">
<view class="oer_image">
<image :src="v.userTx[0]"></image>
</view>
<view>
{{ v.userName }}
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data () {
return {
load: true,
id: '',
data: {},
list: [],
list2: [],
userList: [],
currentNum: 0,
isCheck: 0,
}
},
onLoad (op) {
this.id = op.id
if (op.isCheck) {
this.isCheck = op.isCheck
}
},
onShow () {
this.getData()
},
methods: {
getData () {
let _this = this
this.http.request('/hall/details', {
id: this.id,
}, "GET").then(res => {
if (res.code == 200) {
//
if (res.data.enclosure) {
let fileArr = res.data.enclosure.split(',')
fileArr.forEach(function (item) {
let gs = item.substr(item.lastIndexOf(".") + 1)
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
'gif' || gs == 'tif' || gs == 'tiff') {
_this.list.push(item)
} else if (gs == 'pdf') {
_this.list2.push({
name: res.data.name + '.' + gs,
img: '../../static/fileImg/pdfS.png',
url: item,
})
}
})
}
this.data = res.data
this.data.rclx = this.data.yhsf.join(',')
this.userList = res.data.users
this.userList.forEach(function (el) {
let img = JSON.stringify(el.userTx)
el.userTx = img
})
this.load = false
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
back () {
uni.navigateBack()
},
//
downLoad (val) {
this.contractUrl = val
uni.navigateTo({
url: "/pagesB/ArtWorks/webView?url=" + this.contractUrl
})
},
bao () {
this.http.request('/hallUser/singUp?hallId=' + this.id, {}, "POST").then(res => {
if (res.code == 200) {
this.getData()
this.load = true
this.list = []
this.list2 = []
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
baoQ () {
this.http.request('/hallUser/qxSingUp?hallId=' + this.id, {}, "POST").then(res => {
if (res.code == 200) {
this.getData()
this.load = true
this.list = []
this.list2 = []
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
}
}
}
</script>
<style lang="scss" scoped>
image {
height: 100%;
width: 100%;
}
.page {
.return {
position: fixed;
left: 24rpx;
top: 110rpx;
z-index: 10;
image {
width: 48rpx;
height: 48rpx;
}
}
.pageImg {
height: 440rpx;
.img {
width: 100%;
height: 100%;
}
}
.main {
padding: 32rpx;
.mainTitle {
font-size: 36rpx;
font-weight: 600;
color: #251B1D;
margin-bottom: 28rpx;
}
.textList {
margin-bottom: 24rpx;
.type {
display: flex;
height: 48rpx;
line-height: 48rpx;
.textImg {
width: 32rpx;
height: 32rpx;
margin-top: 10rpx;
margin-right: 16rpx;
}
.text1 {
font-size: 32rpx;
font-weight: 600;
color: #32333C;
}
}
.text2 {
font-size: 28rpx;
color: #32333C;
line-height: 48rpx;
}
}
.file_box {
width: 92%;
height: 64px;
margin: 10px 4%;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #251B1D;
background: #F4F5F7;
border-radius: 6px;
overflow: hidden;
.file_box_left {
width: 40px;
height: 40px;
margin-top: 12px;
margin-left: 12px;
float: left;
.file_box_left_img {
width: 40px;
height: 40px;
}
}
.file_box_right {
margin-left: 20px;
float: left;
.file_box_name {
height: 64px;
line-height: 64px;
font-size: 16px;
font-weight: 600;
color: #251B1D;
}
}
}
}
.line {
height: 16rpx;
background: #F4F5F7;
}
.activityDetails {
.item_ul {
.title {
font-size: 32rpx;
font-weight: bold;
padding: 24rpx;
display: flex;
background: #F4F5F7;
.icon {
width: 40rpx;
height: 40rpx;
margin-right: 10rpx;
// display: none;
}
}
.item_li {
padding: 16rpx 32rpx 32rpx;
margin: 16rpx 0;
border-bottom: 2rpx solid #F1F1F1;
display: flex;
// justify-content: space-between;
align-items: center;
font-weight: 600;
.standard {
display: flex;
align-items: center;
margin-right: 10rpx;
.icon {
width: 32rpx;
height: 32rpx;
// display: none;
}
text {
color: #251B1D;
// color: $gray;
margin-left: 8rpx;
}
}
.content {}
}
}
}
.orderBtn {
width: 100%;
background-color: #FFF;
padding-bottom: 20rpx;
.btn {
width: calc(100% - 64rpx);
height: 96rpx;
line-height: 96rpx;
text-align: center;
background: #99241B;
border-radius: 8rpx;
font-size: 32rpx;
font-weight: 600;
color: #FFFFFF;
margin: 0 auto;
}
.btnQ {
width: calc(100% - 64rpx);
height: 96rpx;
line-height: 96rpx;
text-align: center;
background: #F9F2F2;
border-radius: 8rpx;
font-size: 32rpx;
font-weight: 600;
color: #99241B;
margin: 0 auto;
}
}
.bao_title {
width: 686rpx;
margin: 20rpx 32rpx;
font-size: 28rpx;
font-weight: 500;
color: #32333C;
}
.per_line {
width: 686rpx;
margin: 10rpx 32rpx;
display: flex;
align-items: center;
.oer_image {
width: 88rpx;
height: 88rpx;
border-radius: 50%;
margin-left: 30rpx;
}
}
}
</style>

View File

@ -19,7 +19,9 @@
<view v-if="team.length > 0">
<view class="teamBox" v-for="(item, index) in team">
<view class="teamBox-right">
<image :src="item.file" mode=""></image>
<!-- <image :src="item.file" mode=""></image> -->
<image src="../../static/txIcon.png" mode=""></image>
<!-- txIcon -->
</view>
<view class="teamBox-left">
<view class="teamMinbox-top">
@ -41,7 +43,8 @@
<view v-if="program.length > 0">
<view class="teamBox" v-for="(item, index) in program">
<view class="teamBox-right">
<image :src="item.file" mode=""></image>
<!-- <image :src="item.file" mode=""></image> -->
<image src="../../static/txIcon.png" mode=""></image>
</view>
<view class="teamBox-left">
<view class="teamMinbox-top">
@ -64,16 +67,25 @@
<image src="../../static/orderHall/addOrder.png"></image>
</view>
<view class="main" v-if="mainList.length > 0">
<view class="mainList" v-for="(item, i) in mainList" :key="i">
<view class="mainListImg" @click="toDetail(item.id)">
<view class="mainList" v-for="(item, i) in mainList" :key="i" @click="toDetail(item.id)">
<!-- <view class="mainListImg" @click="toDetail(item.id)">
<img class='img' :src="item.enclosure" alt="">
</view>
</view> -->
<view class="text">
<view class="text1">{{ item.title }}</view>
<view class="text2">{{ item.content }}</view>
<view class="text3">
<view class="time">节目{{ item.teamName }}</view>
</view>
<view class="text3">
<view class="time">团队{{ item.showName }}</view>
</view>
<view class="text3">
<img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
<view class="time">截止时间{{ item.deadline }}</view>
<view class="time">开始时间{{ item.startTime }}</view>
</view>
<view class="text3">
<img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
<view class="time">截止时间{{ item.endTime }}</view>
</view>
</view>
</view>
@ -83,6 +95,7 @@
</u-empty>
</view>
</view>
<u-loading-page class="loading" loading-text="加载中" :loading="loadings"></u-loading-page>
</view>
</template>
@ -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;
}
</style>

View File

@ -1,10 +1,10 @@
<template>
<view>
<player-component
<!-- <player-component
playerid="tvp"
id="tvp-id"
vid="13881752490784308944"
></player-component>
vid="p0743x9grjv"
></player-component> -->
</view>
</template>
@ -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: {},

View File

@ -24,13 +24,29 @@
</view>
</view> -->
<view class="forms">
<view class="teamBox" v-for="(item, index) in list" :key="item.id">
<view
class="teamBox"
v-for="item in list"
:key="item.id"
@click="skip({ id: item.id })"
>
<view class="teamBox-top">
<image class="team-image" :src="item.linkPath" mode="scaleToFill" />
<view class="content">
<view class="content-title">
<text>{{ item.name }}</text>
</view>
<image
class="team-image"
src="https://cdn.uviewui.com/uview/album/1.jpg"
mode="scaleToFill"
/>
</view>
<view class="mask">
<view class="mask-play">
<image src="../../static/play.png"></image>
</view>
</view>
</view>
<view class="teamBox-bottom">
<view class="interactive">
<image src="../../static/play-1.png" mode=""></image>
@ -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;
}
.mask {
.content {
position: relative;
z-index: 4;
.content-title {
position: absolute;
top: 0;
width: 100%;
height: 100%;
z-index: 99;
z-index: 10;
padding: 18rpx;
text {
// position: absolute;
// left: 60rpx;
color: #fff;
max-width: 500rpx;
overflow: hidden; /* 超出一行文字自动隐藏 */
text-overflow: ellipsis; /*文字隐藏后添加省略号*/
white-space: nowrap;
}
}
.team-image {
width: 100%;
height: 400rpx;
}
}
.mask {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 12;
display: flex;
align-items: center;
justify-content: center;
.mask-play {
image {
width: 60rpx;
height: 60rpx;
margin: 110rpx 0 0 300rpx;
}
}
}
}
.teamBox-bottom {
display: flex;
justify-content: space-between;
width: 100%;
padding: 15rpx 15rpx;
padding: 15rpx 32rpx;
background-color: #fff;
box-sizing: border-box;
.interactive {

File diff suppressed because it is too large Load Diff