This commit is contained in:
parent
b5d16d8d7f
commit
bfd050f593
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name" : "艺象心",
|
"name" : "艺象心",
|
||||||
"appid" : "__UNI__9AD4766",
|
"appid" : "__UNI__77CA6BC",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.0.0",
|
"versionName" : "1.0.0",
|
||||||
"versionCode" : "100",
|
"versionCode" : "100",
|
||||||
|
@ -73,5 +73,11 @@
|
||||||
},
|
},
|
||||||
"mp-qq" : {
|
"mp-qq" : {
|
||||||
"usingComponents" : true
|
"usingComponents" : true
|
||||||
|
},
|
||||||
|
"h5" : {
|
||||||
|
"router" : {
|
||||||
|
"mode" : "hash"
|
||||||
|
},
|
||||||
|
"title" : "艺象心"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
{
|
{
|
||||||
"path": "pages/pageHome/pageHome",
|
"path": "pages/pageHome/pageHome",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false,
|
||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
|
@ -28,7 +27,6 @@
|
||||||
{
|
{
|
||||||
"path": "pages/mediaProp/mediaProp",
|
"path": "pages/mediaProp/mediaProp",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false,
|
||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
|
@ -37,7 +35,6 @@
|
||||||
{
|
{
|
||||||
"path": "pages/literHelp/literHelp",
|
"path": "pages/literHelp/literHelp",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false,
|
||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
|
@ -46,7 +43,6 @@
|
||||||
{
|
{
|
||||||
"path": "pages/literFamily/literFamily",
|
"path": "pages/literFamily/literFamily",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"navigationStyle": "custom",
|
"navigationStyle": "custom",
|
||||||
"enablePullDownRefresh": true,
|
"enablePullDownRefresh": true,
|
||||||
"onReachBottomDistance": 20
|
"onReachBottomDistance": 20
|
||||||
|
@ -55,7 +51,6 @@
|
||||||
{
|
{
|
||||||
"path": "pages/activity/activity",
|
"path": "pages/activity/activity",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false,
|
||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
|
@ -76,7 +71,6 @@
|
||||||
}, {
|
}, {
|
||||||
"path": "pages/shop/Shop",
|
"path": "pages/shop/Shop",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"navigationStyle": "custom",
|
"navigationStyle": "custom",
|
||||||
"enablePullDownRefresh": true,
|
"enablePullDownRefresh": true,
|
||||||
"onReachBottomDistance": 20
|
"onReachBottomDistance": 20
|
||||||
|
@ -165,7 +159,6 @@
|
||||||
, {
|
, {
|
||||||
"path": "pages/my/My",
|
"path": "pages/my/My",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false,
|
||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
|
@ -189,7 +182,6 @@
|
||||||
{
|
{
|
||||||
"path": "pages/my/myWorks",
|
"path": "pages/my/myWorks",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": true,
|
"enablePullDownRefresh": true,
|
||||||
"onReachBottomDistance": 20
|
"onReachBottomDistance": 20
|
||||||
}
|
}
|
||||||
|
@ -198,7 +190,6 @@
|
||||||
{
|
{
|
||||||
"path": "pages/my/myWoekList",
|
"path": "pages/my/myWoekList",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": true,
|
"enablePullDownRefresh": true,
|
||||||
"onReachBottomDistance": 20
|
"onReachBottomDistance": 20
|
||||||
}
|
}
|
||||||
|
@ -207,7 +198,6 @@
|
||||||
{
|
{
|
||||||
"path": "pages/my/myFollow",
|
"path": "pages/my/myFollow",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": true,
|
"enablePullDownRefresh": true,
|
||||||
"onReachBottomDistance": 20
|
"onReachBottomDistance": 20
|
||||||
}
|
}
|
||||||
|
@ -255,7 +245,6 @@
|
||||||
{
|
{
|
||||||
"path": "pages/OrderDetail/OrderDetail",
|
"path": "pages/OrderDetail/OrderDetail",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false,
|
||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
|
@ -265,7 +254,6 @@
|
||||||
"path" : "pages/famousArts/famousArts",
|
"path" : "pages/famousArts/famousArts",
|
||||||
"style" :
|
"style" :
|
||||||
{
|
{
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -274,7 +262,6 @@
|
||||||
"path" : "pages/SelectId/SelectId",
|
"path" : "pages/SelectId/SelectId",
|
||||||
"style" :
|
"style" :
|
||||||
{
|
{
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false,
|
||||||
"navigationStyle":"custom"
|
"navigationStyle":"custom"
|
||||||
}
|
}
|
||||||
|
@ -331,7 +318,6 @@
|
||||||
"path" : "pages/folderDetail/folderDetail",
|
"path" : "pages/folderDetail/folderDetail",
|
||||||
"style" :
|
"style" :
|
||||||
{
|
{
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -358,7 +344,6 @@
|
||||||
"path" : "pages/ArtRace/ArtRaceDetail",
|
"path" : "pages/ArtRace/ArtRaceDetail",
|
||||||
"style" :
|
"style" :
|
||||||
{
|
{
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false,
|
||||||
"navigationStyle":"custom"
|
"navigationStyle":"custom"
|
||||||
}
|
}
|
||||||
|
@ -377,7 +362,6 @@
|
||||||
"path" : "pages/MyOrder/MyOrder",
|
"path" : "pages/MyOrder/MyOrder",
|
||||||
"style" :
|
"style" :
|
||||||
{
|
{
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"navigationStyle":"custom",
|
"navigationStyle":"custom",
|
||||||
"enablePullDownRefresh": true,
|
"enablePullDownRefresh": true,
|
||||||
"onReachBottomDistance": 20
|
"onReachBottomDistance": 20
|
||||||
|
@ -414,7 +398,6 @@
|
||||||
"path" : "pages/Login/Login",
|
"path" : "pages/Login/Login",
|
||||||
"style" :
|
"style" :
|
||||||
{
|
{
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false,
|
||||||
"navigationStyle":"custom"
|
"navigationStyle":"custom"
|
||||||
}
|
}
|
||||||
|
@ -424,7 +407,6 @@
|
||||||
"path" : "pages/Login/Register",
|
"path" : "pages/Login/Register",
|
||||||
"style" :
|
"style" :
|
||||||
{
|
{
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -433,7 +415,6 @@
|
||||||
"path" : "pages/Login/RemeberPW",
|
"path" : "pages/Login/RemeberPW",
|
||||||
"style" :
|
"style" :
|
||||||
{
|
{
|
||||||
"navigationBarTitleText": "",
|
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -520,6 +501,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"globalStyle": {
|
"globalStyle": {
|
||||||
|
"navigationBarTitleText": "艺象心",
|
||||||
"navigationBarTextStyle": "black", //导航栏标题颜色及状态栏前景颜色,仅支持 black/white
|
"navigationBarTextStyle": "black", //导航栏标题颜色及状态栏前景颜色,仅支持 black/white
|
||||||
"navigationBarBackgroundColor": "#FFFFFF", //导航栏背景颜色(同状态栏背景色)
|
"navigationBarBackgroundColor": "#FFFFFF", //导航栏背景颜色(同状态栏背景色)
|
||||||
"backgroundColor": "#F8F8F8" //下拉显示出来的窗口的背景色
|
"backgroundColor": "#F8F8F8" //下拉显示出来的窗口的背景色
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
}" itemStyle="height: 50px;">
|
}" itemStyle="height: 50px;">
|
||||||
</u-tabs>
|
</u-tabs>
|
||||||
<view class="artworks">
|
<view class="artworks">
|
||||||
<u-empty v-if="workList.length < 1" icon="http://cdn.uviewui.com/uview/empty/data.png">
|
<u-empty v-if="workList.length < 1" mode="data" icon="../../static/orderE.png" marginTop="120">
|
||||||
</u-empty>
|
</u-empty>
|
||||||
<view class="art_item" v-for="(v, i) in workList" :key="i">
|
<view class="art_item" v-for="(v, i) in workList" :key="i">
|
||||||
<view class="art_item_top">
|
<view class="art_item_top">
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="img_box">
|
<view class="img_box">
|
||||||
<view class=" puber" @click="toUser(v.user.id,v.user.images,v.user.userName)">
|
<view class=" puber" @click="toUser(v.user.id,v.user.images,v.user.userName,v.isFollow)">
|
||||||
<view class="avtor">
|
<view class="avtor">
|
||||||
<image :src="v.user.images" mode=""></image>
|
<image :src="v.user.images" mode=""></image>
|
||||||
</view>
|
</view>
|
||||||
|
@ -255,9 +255,9 @@
|
||||||
this.pages = 1
|
this.pages = 1
|
||||||
this.getData()
|
this.getData()
|
||||||
},
|
},
|
||||||
toUser(val1,val2,val3){
|
toUser(val1,val2,val3,val4){
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2
|
url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,6 +103,7 @@
|
||||||
this.id = op.id
|
this.id = op.id
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
|
this.list2 = []
|
||||||
this.getType()
|
this.getType()
|
||||||
},
|
},
|
||||||
onReady() {
|
onReady() {
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
},
|
},
|
||||||
onLoad(params){
|
onLoad(params){
|
||||||
console.log(params)
|
console.log(params)
|
||||||
let {url} = params
|
let path = params.url
|
||||||
this.url = `../../../static/pdf/pdf.html?url=${url}`
|
this.url = `../../static/pdf/pdf.html?url=` + path
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
|
@ -44,7 +44,7 @@
|
||||||
methods: {
|
methods: {
|
||||||
toDetail() {
|
toDetail() {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/ConfirmOrder/purchaseDetail'
|
url: '/pages/MyOrder/MyOrder'
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
returnBack() {
|
returnBack() {
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<u-form-item prop="checKcode" ref="item1" class="data_itm">
|
<u-form-item prop="checKcode" ref="item1" class="data_itm">
|
||||||
<u-input placeholder="请输入验证码" border="bottom" clearable v-model="registInfo.checKcode">
|
<u-input placeholder="请输入验证码" border="bottom" clearable v-model="registInfo.checKcode">
|
||||||
<template slot="suffix">
|
<template slot="suffix">
|
||||||
<u-code ref="uCode" @change="codeChange" seconds="20" changeText="X秒重新获取"></u-code>
|
<u-code ref="uCode" @change="codeChange" seconds="60" changeText="X秒重新获取"></u-code>
|
||||||
<u-button @click="getCode" :text="tips" :hairline="false" plain style="border: 0px;">
|
<u-button @click="getCode" :text="tips" :hairline="false" plain style="border: 0px;">
|
||||||
</u-button>
|
</u-button>
|
||||||
</template>
|
</template>
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
</u--input>
|
</u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
</view>
|
</view>
|
||||||
<u-button text="确认并登录" size="large" throttleTime=1000 color="#99241B" style="margin-top: 80rpx;"
|
<u-button text="确认" size="large" throttleTime=1000 color="#99241B" style="margin-top: 80rpx;"
|
||||||
@click="submitNext"></u-button>
|
@click="submitNext"></u-button>
|
||||||
</u--form>
|
</u--form>
|
||||||
</view>
|
</view>
|
||||||
|
@ -48,11 +48,6 @@
|
||||||
required: true,
|
required: true,
|
||||||
message: '请填写验证码',
|
message: '请填写验证码',
|
||||||
trigger:['blur']
|
trigger:['blur']
|
||||||
},{
|
|
||||||
min: 6,
|
|
||||||
max: 6,
|
|
||||||
message: '验证码长度应该等于6个字符!',
|
|
||||||
trigger: "blur"
|
|
||||||
}],
|
}],
|
||||||
'number': [{
|
'number': [{
|
||||||
type: 'number',
|
type: 'number',
|
||||||
|
@ -125,22 +120,44 @@
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title: '正在获取验证码'
|
title: '正在获取验证码'
|
||||||
})
|
})
|
||||||
setTimeout(() => {
|
this.http.request('/auth/getCode?phone=' + this.registInfo.number, {}, "GET").then(res => {
|
||||||
|
if (res.code == 200) {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
// 这里此提示会被this.start()方法中的提示覆盖
|
|
||||||
uni.$u.toast('验证码已发送');
|
uni.$u.toast('验证码已发送');
|
||||||
// 通知验证码组件内部开始倒计时
|
|
||||||
this.$refs.uCode.start();
|
this.$refs.uCode.start();
|
||||||
}, 2000);
|
}
|
||||||
|
}).catch(e => {
|
||||||
|
uni.showToast({
|
||||||
|
title: e.data.message,
|
||||||
|
icon: "none",
|
||||||
|
});
|
||||||
|
})
|
||||||
} else {
|
} else {
|
||||||
uni.$u.toast('倒计时结束后再发送');
|
uni.$u.toast('倒计时结束后再发送');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
submitNext() {
|
submitNext() {
|
||||||
this.$refs.registForm.validate().then(res => {
|
this.http.request('/auth/resetCodeByPhone', {
|
||||||
uni.$u.toast('Thanks your helping')
|
phone: this.registInfo.number,
|
||||||
}).catch(errors => {
|
code: this.registInfo.checKcode,
|
||||||
uni.$u.toast('您的资料还未补充完整')
|
password: this.registInfo.pasw,
|
||||||
|
}, "POST").then(res => {
|
||||||
|
if (res.code == 200) {
|
||||||
|
uni.showToast({
|
||||||
|
title: '修改成功',
|
||||||
|
icon: 'none',
|
||||||
|
});
|
||||||
|
setTimeout(() => {
|
||||||
|
uni.navigateTo({
|
||||||
|
url: '/pages/Login/Login'
|
||||||
|
})
|
||||||
|
}, 1200)
|
||||||
|
}
|
||||||
|
}).catch(e => {
|
||||||
|
uni.showToast({
|
||||||
|
title: e.data.message,
|
||||||
|
icon: "none",
|
||||||
|
});
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -166,7 +166,6 @@
|
||||||
.backImg {
|
.backImg {
|
||||||
width: 40rpx;
|
width: 40rpx;
|
||||||
height: 40rpx;
|
height: 40rpx;
|
||||||
margin-right: 32rpx;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.barLabel {
|
.barLabel {
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<image src="../../static/jfIcon.png" mode="" class="top_line_left_img">
|
<image src="../../static/jfIcon.png" mode="" class="top_line_left_img">
|
||||||
</view>
|
</view>
|
||||||
<view class="top_line_right">
|
<view class="top_line_right">
|
||||||
3543
|
{{point}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="point_box">
|
<view class="point_box">
|
||||||
|
@ -53,27 +53,7 @@
|
||||||
tab: 0,
|
tab: 0,
|
||||||
load: true,
|
load: true,
|
||||||
point: '',
|
point: '',
|
||||||
pointList:[{
|
pointList:[]
|
||||||
title:'浏览资讯',
|
|
||||||
time:'2022.04.10 11:29:22',
|
|
||||||
num:'+2',
|
|
||||||
},{
|
|
||||||
title:'浏览每日一赏',
|
|
||||||
time:'2022.04.10 11:29:22',
|
|
||||||
num:'+2',
|
|
||||||
},{
|
|
||||||
title:'浏览每日一赏资讯',
|
|
||||||
time:'2022.04.10 11:29:22',
|
|
||||||
num:'-2',
|
|
||||||
},{
|
|
||||||
title:'浏览每日一赏资讯',
|
|
||||||
time:'2022.04.10 11:29:22',
|
|
||||||
num:'+12',
|
|
||||||
},{
|
|
||||||
title:'浏览每日一赏资讯',
|
|
||||||
time:'2022.04.10 11:29:22',
|
|
||||||
num:'-22',
|
|
||||||
},]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onShow(){
|
onShow(){
|
||||||
|
|
|
@ -443,7 +443,7 @@
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.return {
|
.return {
|
||||||
position: absolute;
|
position: fixed;
|
||||||
left: 24rpx;
|
left: 24rpx;
|
||||||
top: 110rpx;
|
top: 110rpx;
|
||||||
|
|
||||||
|
|
|
@ -243,9 +243,15 @@
|
||||||
pushWork() {
|
pushWork() {
|
||||||
this.http.request('/works/addWork', this.worksVo, "POST").then(res => {
|
this.http.request('/works/addWork', this.worksVo, "POST").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
uni.showToast({
|
||||||
|
title: '发布成功',
|
||||||
|
icon: 'none',
|
||||||
|
});
|
||||||
|
setTimeout(() => {
|
||||||
uni.redirectTo({
|
uni.redirectTo({
|
||||||
url: "/pages/pageHome/pageHome"
|
url: "/pages/pageHome/pageHome"
|
||||||
})
|
})
|
||||||
|
}, 1000)
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
.work_desc {
|
.work_desc {
|
||||||
width: 92%;
|
width: 92%;
|
||||||
margin: 10px 4%;
|
margin: 10px 4%;
|
||||||
font-size: 12px;
|
font-size: 14px;
|
||||||
font-family: PingFangSC-Regular, PingFang SC;
|
font-family: PingFangSC-Regular, PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: #251B1D;
|
color: #251B1D;
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<view class="layout" v-if="load == false">
|
<view class="layout" v-if="load == false">
|
||||||
<view class="shelves">
|
<view class="shelves">
|
||||||
<view class="shelves-item" v-for="(item,index) in enjoyList" :key="index" @click="ToEnjoy(item.id)">
|
<view class="shelves-item" v-for="(item,index) in enjoyList" :key="index" @click="ToEnjoy(item.id)">
|
||||||
<image :src="item.file" mode="widthFix" class="shelves-img"></image>
|
<image :src="item.file" class="shelves-img"></image>
|
||||||
<view class="name">{{item.name}}</view>
|
<view class="name">{{item.name}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -15,7 +15,6 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
@ -81,7 +80,7 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
.shelves-item {
|
.shelves-item {
|
||||||
width: 311rpx;
|
width: calc(50% - 32rpx);
|
||||||
margin-top: 32rpx;
|
margin-top: 32rpx;
|
||||||
margin-left: 16rpx;
|
margin-left: 16rpx;
|
||||||
margin-right: 16rpx;
|
margin-right: 16rpx;
|
||||||
|
@ -89,7 +88,7 @@
|
||||||
|
|
||||||
.shelves-img {
|
.shelves-img {
|
||||||
border-radius: 8px 8px 8px 8px;
|
border-radius: 8px 8px 8px 8px;
|
||||||
width: 311rpx;
|
width: 100%;
|
||||||
height: 312rpx;
|
height: 312rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<u-empty v-if="writerList.length < 1" mode="data" icon="../../static/orderE.png" style="margin-top: 120px;">
|
<u-empty v-if="writerList.length < 1" mode="data" icon="../../static/orderE.png" style="margin-top: 120px;">
|
||||||
</u-empty>
|
</u-empty>
|
||||||
<view class="shelves-item" v-for="(item,index) in writerList" :key="index" @click="ToEnjoy(item.id)">
|
<view class="shelves-item" v-for="(item,index) in writerList" :key="index" @click="ToEnjoy(item.id)">
|
||||||
<image :src="item.images" mode="widthFix" class="shelves-img"></image>
|
<image :src="item.images" class="shelves-img"></image>
|
||||||
<view class="name">{{item.userName}}</view>
|
<view class="name">{{item.userName}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -8,11 +8,11 @@
|
||||||
<view class="top">
|
<view class="top">
|
||||||
<view class="left">
|
<view class="left">
|
||||||
<view class="avator">
|
<view class="avator">
|
||||||
<image src="../../static/MoneyIco.png"></image>
|
<image :src="userImg"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="people">
|
<view class="people">
|
||||||
<view class="art_name">
|
<view class="art_name">
|
||||||
吕茂盛
|
{{userName}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="famous_bot" v-show="id=='1'">
|
<view class="famous_bot" v-show="id=='1'">
|
||||||
<u-empty v-if="achievement.length < 1" mode="data" icon="../../static/orderE.png" style="margin-top: 120px;">
|
<u-empty v-if="achievement.length < 1" mode="data" icon="../../static/orderE.png" marginTop="120">
|
||||||
</u-empty>
|
</u-empty>
|
||||||
<view class="famous_bot_itm" v-for="(v,i) in achievement" :key="i">
|
<view class="famous_bot_itm" v-for="(v,i) in achievement" :key="i">
|
||||||
<view class="ico">
|
<view class="ico">
|
||||||
|
@ -51,7 +51,7 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="famous_bot" v-show="id=='2'">
|
<view class="famous_bot" v-show="id=='2'">
|
||||||
<u-empty v-if="honor.length < 1" mode="data" icon="../../static/orderE.png" style="margin-top: 120px;">
|
<u-empty v-if="honor.length < 1" mode="data" icon="../../static/orderE.png" marginTop="120">
|
||||||
</u-empty>
|
</u-empty>
|
||||||
<view class="famous_bot_itm" v-for="(v,i) in honor" :key="i">
|
<view class="famous_bot_itm" v-for="(v,i) in honor" :key="i">
|
||||||
<view class="ico" style="padding-right: 8rpx;">
|
<view class="ico" style="padding-right: 8rpx;">
|
||||||
|
@ -65,7 +65,7 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="famous_bot" v-show="id=='3'">
|
<view class="famous_bot" v-show="id=='3'">
|
||||||
<u-empty v-if="represe.length < 1" mode="data" icon="../../static/orderE.png" style="margin-top: 120px;">
|
<u-empty v-if="represe.length < 1" mode="data" icon="../../static/orderE.png" marginTop="120">
|
||||||
</u-empty>
|
</u-empty>
|
||||||
<view class="famous_bot_itm" style="display: block;" v-for="(v,i) in represe" :key="i">
|
<view class="famous_bot_itm" style="display: block;" v-for="(v,i) in represe" :key="i">
|
||||||
<view class="works" v-for="(a,b) in v.value" :key="b">
|
<view class="works" v-for="(a,b) in v.value" :key="b">
|
||||||
|
@ -137,6 +137,7 @@
|
||||||
let opu = JSON.parse(res.data.opus)
|
let opu = JSON.parse(res.data.opus)
|
||||||
_this.represe = opu
|
_this.represe = opu
|
||||||
}
|
}
|
||||||
|
this.userName = res.data.userName
|
||||||
this.load = false
|
this.load = false
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
|
|
|
@ -823,7 +823,6 @@
|
||||||
}
|
}
|
||||||
console.log("dataddddddddd", data);
|
console.log("dataddddddddd", data);
|
||||||
this.$refs.form1.validate().then(res => {
|
this.$refs.form1.validate().then(res => {
|
||||||
uni.$u.toast('Thanks your helping')
|
|
||||||
this.http.request('/auth/init', data, "POST").then(res => {
|
this.http.request('/auth/init', data, "POST").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
<u-loading-page :loading="load"></u-loading-page>
|
<u-loading-page :loading="load"></u-loading-page>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="load == false">
|
<view v-if="load == false">
|
||||||
<view class="navbar" v-show="opCalue>0" :style="{'opacity':opCalue}">
|
<view class="navbar">
|
||||||
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
|
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
|
||||||
<view class="apptitle" :style="{'height':titleHeight+'px'}">
|
<view class="apptitle" :style="{'height':titleHeight+'px'}">
|
||||||
<image src="../../static/blackArrow.png" mode="" class="backImg" @click="back"></image>
|
<image src="../../static/orderLeftArrow.png" mode="" class="backImg" @click="back"></image>
|
||||||
<view class="barLabel">
|
<view class="barLabel">
|
||||||
文艺之家
|
文艺之家
|
||||||
</view>
|
</view>
|
||||||
|
@ -42,6 +42,8 @@
|
||||||
活动剪影
|
活动剪影
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<u-empty v-if="jianAct.length < 1" mode="data" icon="../../static/orderE.png" marginTop="120">
|
||||||
|
</u-empty>
|
||||||
<view class="activity" v-for="(v,i) in jianAct" :key="i" @click="goDetail(v.id)">
|
<view class="activity" v-for="(v,i) in jianAct" :key="i" @click="goDetail(v.id)">
|
||||||
<view class="left">
|
<view class="left">
|
||||||
<view class="content">
|
<view class="content">
|
||||||
|
@ -66,7 +68,6 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import http from '../../request/interface.js'
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
@ -224,7 +225,7 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
z-index: 999;
|
z-index: 999;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
background: #FFFFFF;
|
color: #FFFFFF;
|
||||||
|
|
||||||
.apptitle {
|
.apptitle {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -232,15 +233,14 @@
|
||||||
padding: 0 16px;
|
padding: 0 16px;
|
||||||
|
|
||||||
.backImg {
|
.backImg {
|
||||||
width: 20px;
|
width: 40rpx;
|
||||||
height: 20px;
|
height: 40rpx;
|
||||||
margin-right: 16px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.barLabel {
|
.barLabel {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 16px;
|
font-size: 32rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
收藏
|
收藏
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="fans_itm" @click="toFollow()">
|
<view class="fans_itm" @click="toFans()">
|
||||||
<view class="nums">
|
<view class="nums">
|
||||||
{{fans}}
|
{{fans}}
|
||||||
</view>
|
</view>
|
||||||
|
@ -157,7 +157,11 @@
|
||||||
getCol(){
|
getCol(){
|
||||||
this.http.request('/worksCollection', {}, "GET").then(res => {
|
this.http.request('/worksCollection', {}, "GET").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
if(res.data.length == 0){
|
||||||
|
this.colNum = 0
|
||||||
|
}else {
|
||||||
this.colNum = res.data.total
|
this.colNum = res.data.total
|
||||||
|
}
|
||||||
this.getCare()
|
this.getCare()
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
|
@ -171,7 +175,11 @@
|
||||||
getCare(){
|
getCare(){
|
||||||
this.http.request('/userFollow/myFollow', {}, "GET").then(res => {
|
this.http.request('/userFollow/myFollow', {}, "GET").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
if(res.data.length == 0){
|
||||||
|
this.care = 0
|
||||||
|
}else {
|
||||||
this.care = res.data.total
|
this.care = res.data.total
|
||||||
|
}
|
||||||
this.getFans()
|
this.getFans()
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
|
@ -185,7 +193,11 @@
|
||||||
getFans(){
|
getFans(){
|
||||||
this.http.request('/userFollow/myFans', {}, "GET").then(res => {
|
this.http.request('/userFollow/myFans', {}, "GET").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
if(res.data.length == 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 => {
|
||||||
|
@ -221,14 +233,20 @@
|
||||||
},
|
},
|
||||||
//我的关注
|
//我的关注
|
||||||
toFollow(){
|
toFollow(){
|
||||||
// uni.navigateTo({
|
uni.navigateTo({
|
||||||
// url: "/pages/my/myFollow"
|
url: "/pages/my/myFollow?tab=0"
|
||||||
// })
|
})
|
||||||
|
},
|
||||||
|
//我的粉丝
|
||||||
|
toFans(){
|
||||||
|
uni.navigateTo({
|
||||||
|
url: "/pages/my/myFollow?tab=1"
|
||||||
|
})
|
||||||
},
|
},
|
||||||
//我的作品
|
//我的作品
|
||||||
toWork(){
|
toWork(){
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: "/pages/my/myWoekList?id=" + this.userId + '&userName=' + this.userName + '&userImg=' + this.image
|
url: "/pages/my/myWoekList",
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
//设置
|
//设置
|
||||||
|
|
|
@ -122,6 +122,7 @@
|
||||||
this.radiovalue1 = this.data.type
|
this.radiovalue1 = this.data.type
|
||||||
this.v1 = this.data.type
|
this.v1 = this.data.type
|
||||||
this.radiovalue2 = this.data.workTag
|
this.radiovalue2 = this.data.workTag
|
||||||
|
this.tabs = this.data.workTag
|
||||||
this.v2 = this.data.workTag.join(',')
|
this.v2 = this.data.workTag.join(',')
|
||||||
let arr = this.data.file.split(',')
|
let arr = this.data.file.split(',')
|
||||||
arr.forEach(function(item){
|
arr.forEach(function(item){
|
||||||
|
@ -132,6 +133,7 @@
|
||||||
this.worksVo.wpPath = this.data.wpPath
|
this.worksVo.wpPath = this.data.wpPath
|
||||||
this.worksVo.price = this.data.price
|
this.worksVo.price = this.data.price
|
||||||
this.worksVo.code = this.data.code
|
this.worksVo.code = this.data.code
|
||||||
|
this.worksVo.workId = this.data.id
|
||||||
},
|
},
|
||||||
onReady() {
|
onReady() {
|
||||||
// this.load = false
|
// this.load = false
|
||||||
|
|
|
@ -72,7 +72,7 @@
|
||||||
|
|
||||||
<view class="operation">
|
<view class="operation">
|
||||||
<button type="default" class="collection" @click="goPre">上一步</button>
|
<button type="default" class="collection" @click="goPre">上一步</button>
|
||||||
<button type="default" class="apply" @click="cfmPub()">确认发布</button>
|
<button type="default" class="apply" @click="cfmPub()">确认修改</button>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
@ -106,23 +106,23 @@
|
||||||
this.price = this.worksVo.price
|
this.price = this.worksVo.price
|
||||||
this.wpPath = this.worksVo.wpPath
|
this.wpPath = this.worksVo.wpPath
|
||||||
this.code = this.worksVo.code
|
this.code = this.worksVo.code
|
||||||
if(this.worksVo.usePermission == 0){
|
if(this.worksVo.usePermission == 2){
|
||||||
this.radiovalue1 = '不可购买'
|
this.radiovalue1 = '不可购买'
|
||||||
this.v2 = '不可购买'
|
this.v2 = '不可购买'
|
||||||
}else if(this.worksVo.usePermission == 1){
|
}else if(this.worksVo.usePermission == 1){
|
||||||
this.radiovalue1 = '可购买'
|
this.radiovalue1 = '可购买'
|
||||||
this.v2 = '可购买'
|
this.v2 = '可购买'
|
||||||
}
|
}
|
||||||
if(this.worksVo.usePermission == 1){
|
if(this.worksVo.buy == 1){
|
||||||
this.radiovalue7 = '免费使用'
|
this.radiovalue7 = '免费使用'
|
||||||
this.v1 = '免费使用'
|
this.v1 = '免费使用'
|
||||||
}else if(this.worksVo.usePermission == 2){
|
}else if(this.worksVo.buy == 2){
|
||||||
this.radiovalue7 = '积分购买'
|
this.radiovalue7 = '积分购买'
|
||||||
this.v1 = '积分购买'
|
this.v1 = '积分购买'
|
||||||
}else if(this.worksVo.usePermission == 3){
|
}else if(this.worksVo.buy == 3){
|
||||||
this.radiovalue7 = '付费购买'
|
this.radiovalue7 = '付费购买'
|
||||||
this.v1 = '付费购买'
|
this.v1 = '付费购买'
|
||||||
}else if(this.worksVo.usePermission == 4){
|
}else if(this.worksVo.buy == 4){
|
||||||
this.radiovalue7 = '面议'
|
this.radiovalue7 = '面议'
|
||||||
this.v1 = '面议'
|
this.v1 = '面议'
|
||||||
}
|
}
|
||||||
|
@ -248,9 +248,6 @@
|
||||||
if(this.wpPath != ''){
|
if(this.wpPath != ''){
|
||||||
this.http.request('/works/isValid?strLink='+this.wpPath, "POST").then(res => {
|
this.http.request('/works/isValid?strLink='+this.wpPath, "POST").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
uni.redirectTo({
|
|
||||||
url: "/pages/pageHome/pageHome"
|
|
||||||
})
|
|
||||||
this.pushWork()
|
this.pushWork()
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
|
@ -265,11 +262,18 @@
|
||||||
|
|
||||||
},
|
},
|
||||||
pushWork() {
|
pushWork() {
|
||||||
this.http.request('/works/addWork', this.worksVo, "POST").then(res => {
|
this.http.request('/works/edit', this.worksVo, "POST").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
uni.showToast({
|
||||||
|
title: '修改成功',
|
||||||
|
icon: 'none',
|
||||||
|
});
|
||||||
|
setTimeout(() => {
|
||||||
uni.redirectTo({
|
uni.redirectTo({
|
||||||
url: "/pages/pageHome/pageHome"
|
// url: "/pages/my/myWorkDetail?id=" + this.worksVo.workId
|
||||||
|
url: "/pages/my/My"
|
||||||
})
|
})
|
||||||
|
}, 1200)
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
|
|
|
@ -23,14 +23,17 @@
|
||||||
</u-empty>
|
</u-empty>
|
||||||
<view class="famous_bot_itm" v-for="(v,i) in dataList" :key="i">
|
<view class="famous_bot_itm" v-for="(v,i) in dataList" :key="i">
|
||||||
<view class="ico">
|
<view class="ico">
|
||||||
<image src="../../static/FamousArts/redStart.png"></image>
|
<image :src="v.images"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="con">
|
<view class="con">
|
||||||
{{v.userName}}
|
{{v.userName}}
|
||||||
</view>
|
</view>
|
||||||
<view class="works" @click="unFollow()">
|
<view class="works" @click="unFollow(v.id)" v-if="tab == 0">
|
||||||
已关注
|
已关注
|
||||||
</view>
|
</view>
|
||||||
|
<view class="works" @click="toUser(v.id,v.images,v.userName,v.isFollow)" v-if="tab == 1">
|
||||||
|
去逛逛
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<u-popup :show="showStar" @close="close" closeOnClickOverlay mode="center" :round="5">
|
<u-popup :show="showStar" @close="close" closeOnClickOverlay mode="center" :round="5">
|
||||||
|
@ -59,18 +62,51 @@
|
||||||
pages: 1,
|
pages: 1,
|
||||||
size: 20,
|
size: 20,
|
||||||
tab: 0,
|
tab: 0,
|
||||||
|
userId:'',
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
onLoad(op) {
|
||||||
|
this.tab = op.tab
|
||||||
|
},
|
||||||
|
// 下拉刷新
|
||||||
|
onPullDownRefresh() {
|
||||||
|
this.pages = 1
|
||||||
|
if(this.tab == 0){
|
||||||
|
this.getCare()
|
||||||
|
}else if(this.tab == 1){
|
||||||
|
this.getFans()
|
||||||
|
}
|
||||||
|
setTimeout(function() {
|
||||||
|
uni.stopPullDownRefresh();
|
||||||
|
}, 1000);
|
||||||
|
},
|
||||||
|
//上拉
|
||||||
|
onReachBottom() {
|
||||||
|
this.pages++
|
||||||
|
if(this.tab == 0){
|
||||||
|
this.getMoreCare()
|
||||||
|
}else if(this.tab == 1){
|
||||||
|
this.getMoreFans()
|
||||||
|
}
|
||||||
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
this.getCareTotal()
|
this.getCareTotal()
|
||||||
|
if(this.tab == 0){
|
||||||
this.getCare()
|
this.getCare()
|
||||||
|
}else if(this.tab == 1){
|
||||||
|
this.getFans()
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
//关注数
|
//关注数
|
||||||
getCareTotal(){
|
getCareTotal(){
|
||||||
this.http.request('/userFollow/myFollow', {page:this.pages,size:this.size}, "GET").then(res => {
|
this.http.request('/userFollow/myFollow', {page:this.pages,size:this.size}, "GET").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
if(res.data.length == 0){
|
||||||
|
this.care = 0
|
||||||
|
}else {
|
||||||
this.care = res.data.total
|
this.care = res.data.total
|
||||||
|
}
|
||||||
this.getFansTotal()
|
this.getFansTotal()
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
|
@ -84,7 +120,11 @@
|
||||||
getFansTotal(){
|
getFansTotal(){
|
||||||
this.http.request('/userFollow/myFans', {page:this.pages,size:this.size}, "GET").then(res => {
|
this.http.request('/userFollow/myFans', {page:this.pages,size:this.size}, "GET").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
if(res.data.length == 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 => {
|
||||||
|
@ -98,7 +138,9 @@
|
||||||
getCare(){
|
getCare(){
|
||||||
this.http.request('/userFollow/myFollow', {page:this.pages,size:this.size}, "GET").then(res => {
|
this.http.request('/userFollow/myFollow', {page:this.pages,size:this.size}, "GET").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
console.log(res.data)
|
if(res.data.length == 0){
|
||||||
|
this.dataList = []
|
||||||
|
}else {
|
||||||
res.data.records.forEach(function(item){
|
res.data.records.forEach(function(item){
|
||||||
if(item.images != null && item.images != undefined && item.images != ''){
|
if(item.images != null && item.images != undefined && item.images != ''){
|
||||||
let img = JSON.parse(item.images)
|
let img = JSON.parse(item.images)
|
||||||
|
@ -107,6 +149,79 @@
|
||||||
})
|
})
|
||||||
this.dataList = res.data.records
|
this.dataList = res.data.records
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}).catch(e => {
|
||||||
|
uni.showToast({
|
||||||
|
title: e.data.message,
|
||||||
|
icon: "none",
|
||||||
|
});
|
||||||
|
})
|
||||||
|
},
|
||||||
|
//粉丝列表
|
||||||
|
getFans(){
|
||||||
|
this.http.request('/userFollow/myFans', {page:this.pages,size:this.size}, "GET").then(res => {
|
||||||
|
if (res.code == 200) {
|
||||||
|
if(res.data.length == 0){
|
||||||
|
this.dataList = []
|
||||||
|
}else {
|
||||||
|
res.data.records.forEach(function(item){
|
||||||
|
if(item.images != null && item.images != undefined && item.images != ''){
|
||||||
|
let img = JSON.parse(item.images)
|
||||||
|
item.images = img[0]
|
||||||
|
}
|
||||||
|
})
|
||||||
|
this.dataList = res.data.records
|
||||||
|
}
|
||||||
|
console.log(this.dataList)
|
||||||
|
}
|
||||||
|
}).catch(e => {
|
||||||
|
uni.showToast({
|
||||||
|
title: e.data.message,
|
||||||
|
icon: "none",
|
||||||
|
});
|
||||||
|
})
|
||||||
|
},
|
||||||
|
//关注列表-更多
|
||||||
|
getMoreCare(){
|
||||||
|
let _this = this
|
||||||
|
this.http.request('/userFollow/myFollow', {page:this.pages,size:this.size}, "GET").then(res => {
|
||||||
|
if (res.code == 200) {
|
||||||
|
if(res.data.length == 0){
|
||||||
|
this.pages--
|
||||||
|
}else {
|
||||||
|
res.data.records.forEach(function(item){
|
||||||
|
if(item.images != null && item.images != undefined && item.images != ''){
|
||||||
|
let img = JSON.parse(item.images)
|
||||||
|
item.images = img[0]
|
||||||
|
}
|
||||||
|
_this.dataList.push(item)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}).catch(e => {
|
||||||
|
uni.showToast({
|
||||||
|
title: e.data.message,
|
||||||
|
icon: "none",
|
||||||
|
});
|
||||||
|
})
|
||||||
|
},
|
||||||
|
//粉丝列表-更多
|
||||||
|
getMoreFans(){
|
||||||
|
let _this = this
|
||||||
|
this.http.request('/userFollow/myFans', {page:this.pages,size:this.size}, "GET").then(res => {
|
||||||
|
if (res.code == 200) {
|
||||||
|
if(res.data.length == 0){
|
||||||
|
this.pages--
|
||||||
|
}else {
|
||||||
|
res.data.records.forEach(function(item){
|
||||||
|
if(item.images != null && item.images != undefined && item.images != ''){
|
||||||
|
let img = JSON.parse(item.images)
|
||||||
|
item.images = img[0]
|
||||||
|
}
|
||||||
|
_this.dataList.push(item)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: e.data.message,
|
title: e.data.message,
|
||||||
|
@ -115,23 +230,44 @@
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
//取消关注
|
//取消关注
|
||||||
unFollow(){
|
unFollow(val){
|
||||||
this.showStar = true
|
this.showStar = true
|
||||||
|
this.userId = val
|
||||||
},
|
},
|
||||||
close() {
|
close() {
|
||||||
this.showStar = false
|
this.showStar = false
|
||||||
},
|
},
|
||||||
|
//确认取消关注
|
||||||
sureUnF(){
|
sureUnF(){
|
||||||
|
this.http.request('/userFollow/delFollow?writerId=' + this.userId, "GET").then(res => {
|
||||||
|
if (res.code == 200) {
|
||||||
this.showStar = false
|
this.showStar = false
|
||||||
|
this.pages = 1
|
||||||
|
this.getCare()
|
||||||
|
}
|
||||||
|
}).catch(e => {
|
||||||
|
uni.showToast({
|
||||||
|
title: e.data.message,
|
||||||
|
icon: "none",
|
||||||
|
});
|
||||||
|
})
|
||||||
},
|
},
|
||||||
toFollow() {
|
toFollow() {
|
||||||
this.tab = 0
|
this.tab = 0
|
||||||
this.pages = 1
|
this.pages = 1
|
||||||
|
this.getCare()
|
||||||
},
|
},
|
||||||
toFans() {
|
toFans() {
|
||||||
this.tab = 1
|
this.tab = 1
|
||||||
this.pages = 1
|
this.pages = 1
|
||||||
|
this.getFans()
|
||||||
},
|
},
|
||||||
|
//去逛逛
|
||||||
|
toUser(val1,val2,val3,val4){
|
||||||
|
uni.navigateTo({
|
||||||
|
url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
|
||||||
|
})
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,11 +69,11 @@
|
||||||
lineBg: '../../static/scrollLine.png',
|
lineBg: '../../static/scrollLine.png',
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
onLoad(option) {
|
// onLoad(option) {
|
||||||
this.userId = option.id
|
// this.userId = option.id
|
||||||
this.userImg = option.userImg
|
// this.userImg = option.userImg
|
||||||
this.userName = option.userName
|
// this.userName = option.userName
|
||||||
},
|
// },
|
||||||
// 下拉刷新
|
// 下拉刷新
|
||||||
onPullDownRefresh() {
|
onPullDownRefresh() {
|
||||||
this.pages = 1
|
this.pages = 1
|
||||||
|
@ -89,9 +89,27 @@
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
this.pages = 1
|
this.pages = 1
|
||||||
this.getType()
|
this.getUserInfo()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
//用户信息
|
||||||
|
getUserInfo() {
|
||||||
|
let _this = this
|
||||||
|
this.http.request('/user/userInfo', {}, "GET").then(res => {
|
||||||
|
if (res.code == 200) {
|
||||||
|
let img = JSON.parse(res.data.images)
|
||||||
|
this.userImg = img[0]
|
||||||
|
this.userName = res.data.userName
|
||||||
|
this.userId = res.data.id
|
||||||
|
this.getType()
|
||||||
|
}
|
||||||
|
}).catch(e => {
|
||||||
|
uni.showToast({
|
||||||
|
title: e.data.message,
|
||||||
|
icon: "none",
|
||||||
|
});
|
||||||
|
})
|
||||||
|
},
|
||||||
//作品分类
|
//作品分类
|
||||||
getType() {
|
getType() {
|
||||||
let _this = this
|
let _this = this
|
||||||
|
@ -185,7 +203,8 @@
|
||||||
if (item.file != undefined) {
|
if (item.file != undefined) {
|
||||||
let fileArr = item.file.split(',')
|
let fileArr = item.file.split(',')
|
||||||
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
|
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
|
||||||
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs == 'gif' || gs == 'tif' || gs == 'tiff') {
|
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
|
||||||
|
'gif' || gs == 'tif' || gs == 'tiff') {
|
||||||
item.file = fileArr[0]
|
item.file = fileArr[0]
|
||||||
} else if (gs == 'pdf') {
|
} else if (gs == 'pdf') {
|
||||||
item.file = '../../static/fileImg/pdfS.png'
|
item.file = '../../static/fileImg/pdfS.png'
|
||||||
|
|
|
@ -211,7 +211,7 @@
|
||||||
this.openPDF()
|
this.openPDF()
|
||||||
}else if(this.iswx == 1){
|
}else if(this.iswx == 1){
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: "./webView?url=" + this.contractUrl
|
url: "/pages/ArtWorks/webView?url=" + this.contractUrl
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -17,9 +17,12 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="talk" @click="goFollow()">
|
<view class="talk" @click="goFollow()" v-if="isFollow == 2">
|
||||||
关注
|
关注
|
||||||
</view>
|
</view>
|
||||||
|
<view class="talked" @click="goUnFollow()" v-if="isFollow == 3">
|
||||||
|
已关注
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="famous_bot">
|
<view class="famous_bot">
|
||||||
|
@ -75,6 +78,7 @@
|
||||||
list1: [],
|
list1: [],
|
||||||
userImg: '',
|
userImg: '',
|
||||||
userName: '',
|
userName: '',
|
||||||
|
isFollow: '',
|
||||||
workList: [],
|
workList: [],
|
||||||
pages: 1,
|
pages: 1,
|
||||||
size: 20,
|
size: 20,
|
||||||
|
@ -85,6 +89,7 @@
|
||||||
this.userId = option.id
|
this.userId = option.id
|
||||||
this.userImg = option.userImg
|
this.userImg = option.userImg
|
||||||
this.userName = option.userName
|
this.userName = option.userName
|
||||||
|
this.isFollow = option.isFollow
|
||||||
},
|
},
|
||||||
// 下拉刷新
|
// 下拉刷新
|
||||||
onPullDownRefresh() {
|
onPullDownRefresh() {
|
||||||
|
@ -260,6 +265,7 @@
|
||||||
this.http.request('/userFollow/addFollow?writerId=' + this.userId, "GET").then(res => {
|
this.http.request('/userFollow/addFollow?writerId=' + this.userId, "GET").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
this.pages = 1
|
this.pages = 1
|
||||||
|
this.isFollow = 3
|
||||||
this.getData()
|
this.getData()
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
|
@ -268,7 +274,21 @@
|
||||||
icon: "none",
|
icon: "none",
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
goUnFollow(){
|
||||||
|
this.http.request('/userFollow/delFollow?writerId=' + this.userId, "GET").then(res => {
|
||||||
|
if (res.code == 200) {
|
||||||
|
this.pages = 1
|
||||||
|
this.isFollow = 2
|
||||||
|
this.getData()
|
||||||
}
|
}
|
||||||
|
}).catch(e => {
|
||||||
|
uni.showToast({
|
||||||
|
title: e.data.message,
|
||||||
|
icon: "none",
|
||||||
|
});
|
||||||
|
})
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -347,13 +367,19 @@
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding: 12rpx 24rpx;
|
padding: 12rpx 24rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
.concat_ico {
|
|
||||||
width: 32rpx;
|
|
||||||
height: 32rpx;
|
|
||||||
margin-right: 8rpx;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.talked {
|
||||||
|
border: 1px solid #afadb0;
|
||||||
|
font-size: 24rpx;
|
||||||
|
font-weight: 600;
|
||||||
|
border-radius: 60rpx;
|
||||||
|
color: #afadb0;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 12rpx 24rpx;
|
||||||
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -305,13 +305,10 @@
|
||||||
margin-left: 8px;
|
margin-left: 8px;
|
||||||
|
|
||||||
.art_item_top {
|
.art_item_top {
|
||||||
|
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 192px;
|
height: 320rpx;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
border-radius: 8px 8px 0px 0px;
|
border-radius: 8px 8px 0px 0px;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.art_item_bott {
|
.art_item_bott {
|
||||||
|
|
|
@ -7,8 +7,8 @@ export default {
|
||||||
config: {
|
config: {
|
||||||
// baseUrl: "http://192.168.0.57:8080/h5/api", //王锡
|
// baseUrl: "http://192.168.0.57:8080/h5/api", //王锡
|
||||||
// baseUrl: "http://192.168.124.110:8088/api", //周源
|
// baseUrl: "http://192.168.124.110:8088/api", //周源
|
||||||
baseUrl: "http://192.168.0.29:8080/h5/api", //俞燕红
|
// baseUrl: "http://192.168.0.29:8080/h5/api", //俞燕红
|
||||||
// baseUrl: "https://wlsq.ydool.com.cn/api", //线上
|
baseUrl: "https://yxx.ydool.net/h5/api", //线上
|
||||||
header: {
|
header: {
|
||||||
'Content-Type': 'application/json;charset=UTF-8',
|
'Content-Type': 'application/json;charset=UTF-8',
|
||||||
// 'Content-Type':'application/x-www-form-urlencoded'
|
// 'Content-Type':'application/x-www-form-urlencoded'
|
||||||
|
|
|
@ -18,12 +18,13 @@
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
.operate {
|
.operate {
|
||||||
|
display: none;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 20px;
|
bottom: 20px;
|
||||||
right: 20px;
|
right: 20px;
|
||||||
width: 100px;
|
width: 100px;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
display: flex;
|
/* display: flex; */
|
||||||
background-color: rgba(0,0,0,0.1);
|
background-color: rgba(0,0,0,0.1);
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
z-index: 9999;
|
z-index: 9999;
|
||||||
|
|
Loading…
Reference in New Issue