Browse Source

修改

master
前端-胡立永 10 months ago
parent
commit
c73defcb55
9 changed files with 224 additions and 122 deletions
  1. +16
    -0
      api/api.js
  2. +109
    -79
      components/config/showPrivacyAgreement.vue
  3. +3
    -3
      components/post/actorList.vue
  4. +3
    -0
      main.js
  5. +1
    -1
      manifest.json
  6. +18
    -16
      pages/index/index.vue
  7. +0
    -1
      pages/mine/promotionRecord.vue
  8. +43
    -9
      pages/mine/purse.vue
  9. +31
    -13
      pages/publish/actorDetail.vue

+ 16
- 0
api/api.js View File

@ -18,6 +18,11 @@ const config = {
url: '/api/index/getBanner', url: '/api/index/getBanner',
method: 'GET' method: 'GET'
}, },
//获取演员集详情接口
indexGetActorDetail: {
url: '/api/index/getActorDetail',
method: 'GET'
},
//获取认证演员 //获取认证演员
indexGetActorList: { indexGetActorList: {
url: '/api/index/getActorList', url: '/api/index/getActorList',
@ -43,6 +48,11 @@ const config = {
url: '/api/index/getComplaintReason', url: '/api/index/getComplaintReason',
method: 'GET' method: 'GET'
}, },
//获取投诉原因
indexGetGetWorkPage: {
url: '/api/index/getWorkPage',
method: 'GET'
},
@ -54,6 +64,12 @@ const config = {
method: 'GET', method: 'GET',
auth: true auth: true
}, },
//获取用户平台数据
infoGetInfoMoney: {
url: '/api/info/getInfoMoney',
method: 'GET',
auth: true
},
//获取银行卡列表带分页 //获取银行卡列表带分页
infoGetBankCardPage: { infoGetBankCardPage: {
url: '/api/info/getBankCardPage', url: '/api/info/getBankCardPage',


+ 109
- 79
components/config/showPrivacyAgreement.vue View File

@ -1,118 +1,148 @@
<template> <template>
<uv-popup ref="privacyPopup">
<uv-popup ref="popup" z-index="99999" :closeOnClickOverlay="false" :customStyle="{ backgroundColor: 'transparent' }">
<view class="privacyPopup"> <view class="privacyPopup">
<view class="title"> <view class="title">
<view class="title_circle"></view>
<view>{{ title }}</view>
<view>协议与隐私政策</view>
</view> </view>
<view class="content_pri"> <view class="content_pri">
<text>在你使用{{ title }}服务之前请仔细阅读</text>
<text style="color: #1793ee;" @click="goToPrivacy">{{ title }}小程序隐私保护指引</text>
<text>如你同意{{ title }}小程序隐私保护指引请点击同意开始使用{{ title }}</text>
<view class="text">
欢迎来到车队佳油!我们根据最新的法律法规监管政策要求更新了用户协议隐私政策,请您认真阅读
</view>
</view>
<view class="config">
<uv-checkbox-group v-model="checkboxValue" shape="circle">
<view class="content">
<view style="display: flex;">
<uv-checkbox size="30rpx" :name="1"></uv-checkbox>
同意<text @click="goToPrivacy">车队佳油隐私政策</text>
</view>
<view class="">
以及<text @click="goToPrivacy">用户协议</text>
</view>
</view>
</uv-checkbox-group>
</view> </view>
<view class="pri_btn"> <view class="pri_btn">
<button class="confuse_btn" @click="confusePrivacy">拒绝</button>
<button class="confirm_btn" id="agree-btn" open-type="agreePrivacyAuthorization"
@agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
<!-- <button class="confuse_btn" @click="confusePrivacy">拒绝</button> -->
<button
class="confirm_btn" id="agree-btn"
open-type="agreePrivacyAuthorization"
@agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
</view> </view>
</view> </view>
</uv-popup> </uv-popup>
</template> </template>
<script> <script>
export default { export default {
data(){
return{
title : '帧视界',
name: 'PrivacyAgreementPoup',
data() {
return {
resolvePrivacyAuthorization: {},
checkboxValue : false
}
},
mounted() {
if(wx.getPrivacySetting){
wx.getPrivacySetting({
success: res => {
console.log(res)
if (res.needAuthorization) {
//
this.init()
}
},
fail: () => {}
})
} }
}, },
methods:{
init(resolve){
this.$refs.privacyPopup.open()
methods: {
//
init(resolve) {
this.$refs.popup.open('center')
this.resolvePrivacyAuthorization = resolve this.resolvePrivacyAuthorization = resolve
}, },
// //
goToPrivacy(){
goToPrivacy() {
wx.openPrivacyContract({ wx.openPrivacyContract({
success: () => {
success: () => {
console.log('打开成功'); console.log('打开成功');
}, // }, //
fail: () => {
fail: () => {
uni.showToast({ uni.showToast({
title:'打开失败,稍后重试',
title: '打开失败,稍后重试',
icon: 'none' icon: 'none'
}) })
} // } //
}) })
}, },
// //
confusePrivacy(){
this.$refs.privacyPopup.close()
this.resolvePrivacyAuthorization({ event:'disagree' })
confusePrivacy() {
this.$refs.popup.close()
this.resolvePrivacyAuthorization({
event: 'disagree'
})
}, },
// //
handleAgreePrivacyAuthorization(){
handleAgreePrivacyAuthorization() {
// id // id
this.resolvePrivacyAuthorization({ buttonId: 'agree-btn', event: 'agree' })
this.$refs.privacyPopup.close()
// this.resolvePrivacyAuthorization({
// buttonId: 'agree-btn',
// event: 'agree'
// })
this.$refs.popup.close()
} }
} }
} }
</script> </script>
<style scoped lang="scss">
*{
box-sizing: border-box;
}
.privacyPopup{
width: 520rpx;
/* height: 500rpx; */
background-color: #fff;
border-radius: 50rpx;
padding: 20rpx 40rpx;
}
.title{
display: flex;
align-items: center;
justify-content: start;
margin: 20rpx 0;
font-size: 38rpx;
font-weight: 600;
}
.title .title_circle{
width: 60rpx;
height: 60rpx;
background-color: #efefef;
border-radius: 50%;
margin-right: 20rpx;
}
.content_pri{
width: 480rpx;
margin: 0 auto;
font-size: 34rpx;
line-height: 1.5;
}
.pri_btn{
width: 100%;
height: 158rpx;
display: flex;
align-items: center;
justify-content: space-evenly;
}
.pri_btn .confuse_btn,.pri_btn .confirm_btn{
width: 200rpx;
height: 90rpx;
<style lang="scss" scoped>
.privacyPopup {
width: 90%;
margin: 0rpx auto;
background: white;
border-radius: 20rpx; border-radius: 20rpx;
font-size: 34rpx;
}
.pri_btn .confuse_btn{
background-color: #eee;
color: #52bf6b;
}
.pri_btn .confirm_btn{
background-color: #52bf6b;
color: #fff;
box-sizing: border-box;
padding: 40rpx 30rpx;
.title {
text-align: center;
font-size: 36rpx;
}
.content_pri {
padding: 30rpx 0rpx;
font-size: 28rpx;
}
.config {
font-size: 28rpx;
text-align: center;
line-height: 40rpx;
margin-bottom: 30rpx;
text {
color: #00aaff;
}
.content{
display: flex;
}
}
.pri_btn {
button {
background: #00aaff;
outline: none;
color: white;
font-size: 30rpx;
}
}
} }
</style>
</style>

+ 3
- 3
components/post/actorList.vue View File

@ -1,7 +1,7 @@
<template> <template>
<view class="postList"> <view class="postList">
<view class="item" v-for="(item, index) in list" <view class="item" v-for="(item, index) in list"
@click="$utils.navigateTo('/publish/postDetail?id=123')"
@click="$utils.navigateTo('/publish/actorDetail?id=' + item.id)"
:key="index"> :key="index">
<image <image
:src="item.image && :src="item.image &&
@ -17,7 +17,7 @@
</view> </view>
</view> </view>
<view class="info"> <view class="info">
(介绍:介绍内容介内容介绍内容介内容介绍内容介内容介绍内容介内容)
{{ item.photographerContent }}
</view> </view>
<view class="createBy"> <view class="createBy">
<!-- <view class=""> <!-- <view class="">
@ -31,7 +31,7 @@
联系方式 <text>去查看</text> 联系方式 <text>去查看</text>
</view> </view>
<view class="price"> <view class="price">
价格 <text>9999</text>
价格 <text>{{ item.money }}</text>
</view> </view>
</view> </view>
</view> </view>


+ 3
- 0
main.js View File

@ -26,6 +26,9 @@ uni.$uv.setConfig({
}, },
}) })
//
//wxe7ae8cbe1673834c
//组件注册 //组件注册
import configPopup from '@/components/config/configPopup.vue' import configPopup from '@/components/config/configPopup.vue'
import changeLanguage from '@/components/base/changeLanguage.vue' import changeLanguage from '@/components/base/changeLanguage.vue'


+ 1
- 1
manifest.json View File

@ -52,7 +52,7 @@
"quickapp" : {}, "quickapp" : {},
/* */ /* */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxe7ae8cbe1673834c",
"appid" : "wx3c24e397e3b132ea",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"ignoreDevUnusedFiles" : false "ignoreDevUnusedFiles" : false


+ 18
- 16
pages/index/index.vue View File

@ -122,24 +122,25 @@
actorList : [], actorList : [],
postList : [], postList : [],
trends : [], trends : [],
queryParams: {
pageNo: 1,
pageSize: 10
},
total : 0,
} }
}, },
computed : { computed : {
}, },
//
onReachBottom() {
if(this.queryParams.pageSize < this.total){
this.queryParams.pageSize += 10
this.indexGetTrendsPage()
}
},
onShow() { onShow() {
this.getData() this.getData()
if(wx.onNeedPrivacyAuthorization){
console.log('onNeedPrivacyAuthorization');
wx.onNeedPrivacyAuthorization(resolve => {
console.log('onNeedPrivacyAuthorization');
//
//
this.resolvePrivacyAuthorization = resolve
this.$refs.showPrivacy.init(resolve)
})
}
this.indexGetTrendsPage()
}, },
methods: { methods: {
getData(){ getData(){
@ -153,12 +154,13 @@
this.actorList = res.result this.actorList = res.result
} }
}) })
this.$api('indexGetTrendsPage', {
pageNo : 1,
pageSize : 10,
}, res => {
},
indexGetTrendsPage(){
this.$api('indexGetTrendsPage',
this.queryParams, res => {
if(res.code == 200){ if(res.code == 200){
this.trends = res.result.records this.trends = res.result.records
this.total = res.result.total
} }
}) })
}, },


+ 0
- 1
pages/mine/promotionRecord.vue View File

@ -54,7 +54,6 @@
<script> <script>
import PromotionRecordList from "@/pages/mine/sonPage/promotion/promotionRecordList.vue"; import PromotionRecordList from "@/pages/mine/sonPage/promotion/promotionRecordList.vue";
import moment from "moment"; import moment from "moment";
export default { export default {
components: {PromotionRecordList}, components: {PromotionRecordList},
data() { data() {


+ 43
- 9
pages/mine/purse.vue View File

@ -10,21 +10,21 @@
<!--上部分--> <!--上部分-->
<view class="content-top"> <view class="content-top">
<view class="aaa"> <view class="aaa">
<view class="top">1240,045</view>
<view class="top">{{ money.money }}</view>
<view class="bottom">可提现金额</view> <view class="bottom">可提现金额</view>
</view> </view>
<view class="b"> <view class="b">
<view class="bb"> <view class="bb">
<view class="top">今日收益</view> <view class="top">今日收益</view>
<view class="bottom">1234</view>
<view class="bottom">{{ money.todayMoney }}</view>
</view> </view>
<view class="bb"> <view class="bb">
<view class="top">累计收益</view> <view class="top">累计收益</view>
<view class="bottom">1234</view>
<view class="bottom">{{ money.userSumMoney }}</view>
</view> </view>
<view class="bb"> <view class="bb">
<view class="top">已提现</view> <view class="top">已提现</view>
<view class="bottom">1234</view>
<view class="bottom">{{ money.userMoney }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -34,16 +34,16 @@
<view class="card-record">卡片记录</view> <view class="card-record">卡片记录</view>
<!--具体银行卡--> <!--具体银行卡-->
<view class="cards" > <view class="cards" >
<view class="cardItem" v-for="(item, index) in 5" :key="index">
<view class="cardItem" v-for="(item, index) in list" :key="index">
<view class="cardImage"> <view class="cardImage">
<image src="/static/image/addBankCard/1.svg" style="width: 100%;height: 100%;"></image> <image src="/static/image/addBankCard/1.svg" style="width: 100%;height: 100%;"></image>
</view> </view>
<view class="cardInfo"> <view class="cardInfo">
<view class="cardNum"> <view class="cardNum">
6222021000000000018
{{ item.bankId }}
</view> </view>
<view class="cardName"> <view class="cardName">
工商银行
{{ item.bankAddress }}
</view> </view>
</view> </view>
<view class="cardIcon"> <view class="cardIcon">
@ -72,8 +72,27 @@ import '../../common.css'; // 引入公共 CSS 文件
export default { export default {
data() { data() {
return {};
return {
queryParams: {
pageNo: 1,
pageSize: 10
},
total : 0,
list : [],
money : {}
};
}, },
onShow() {
this.getData()
this.infoGetInfoMoney()
},
//
onReachBottom() {
if(this.queryParams.pageSize < this.total){
this.queryParams.pageSize += 10
this.getData()
}
},
methods: { methods: {
// //
gotoIncomeRecordPage() { gotoIncomeRecordPage() {
@ -82,7 +101,22 @@ export default {
// //
gotoWithdrawPage() { gotoWithdrawPage() {
this.$utils.navigateTo('/mine/withdraw'); this.$utils.navigateTo('/mine/withdraw');
}
},
getData(){
this.$api('infoGetBankCardPage', this.queryParams, res => {
if(res.code == 200){
this.list = res.result.records
this.total = res.result.total
}
})
},
infoGetInfoMoney(){
this.$api('infoGetInfoMoney', res => {
if(res.code == 200){
this.money = res.result
}
})
},
} }
} }
</script> </script>


+ 31
- 13
pages/publish/actorDetail.vue View File

@ -14,7 +14,7 @@
<view class="topInfo"> <view class="topInfo">
<view class="title"> <view class="title">
{{ item.title }}
{{ item.name }}
</view> </view>
</view> </view>
@ -34,18 +34,18 @@
<view class="content"> <view class="content">
<uv-parse :content="item.content"></uv-parse>
<uv-parse :content="item.photographerContent"></uv-parse>
</view> </view>
<view class="works"> <view class="works">
<view class="item" <view class="item"
v-for="(item, index) in 10"
v-for="(item, index) in list"
:key="index"> :key="index">
<view class="item-title"> <view class="item-title">
代表作品夏
{{ item.title }}
</view> </view>
<view class="item-image"> <view class="item-image">
<image :src="item.image" mode=""></image>
</view> </view>
</view> </view>
</view> </view>
@ -62,22 +62,30 @@
}, },
data() { data() {
return { return {
item: {
title: "这是一条动态",
createTime: '2024-08-22 09:00:00',
createBy: "小飞",
content: '这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态',
item: {},
list : [],
queryParams: {
pageNo: 1,
pageSize: 10
}, },
total : 0,
} }
}, },
onLoad(options) { onLoad(options) {
// this.$route.query // this.$route.query
console.log(options)
// this.getData(options.id)
this.getData(options.id)
this.getList()
},
//
onReachBottom() {
if(this.queryParams.pageSize < this.total){
this.queryParams.pageSize += 10
this.indexGetTrendsPage()
}
}, },
methods: { methods: {
getData(id){ getData(id){
this.$api('indexGetTrendsDetail', {
this.$api('indexGetActorDetail', {
id id
}, res => { }, res => {
if(res.code == 200){ if(res.code == 200){
@ -85,6 +93,16 @@
} }
}) })
}, },
getList(){
this.$api('indexGetGetWorkPage', {
token : uni.getStorageSync('token')
}, res => {
if(res.code == 200){
this.list = res.result.records
this.total = res.result.total
}
})
}
} }
} }
</script> </script>


Loading…
Cancel
Save