Merge branch 'master' of http://122.51.230.86:3000/dianliang/dl_uniapp
This commit is contained in:
commit
0d6e10033e
@ -11,6 +11,14 @@ export function bloggerDetail(userId) {
|
||||
}
|
||||
|
||||
|
||||
//------------------开通会员-----------------------
|
||||
export function saveOrder(data) {
|
||||
return request({
|
||||
url: '/member/order/uniSaveOrder',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
//------------------名片-----------------------
|
||||
// 查询当前登录用户的名片
|
||||
export function getUserBusiCard() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
// 应用全局配置
|
||||
module.exports = {
|
||||
baseUrl: 'http://192.168.1.17:8080',
|
||||
baseUrl: 'http://192.168.1.4:8080',
|
||||
// baseUrl: 'http://localhost:8080',
|
||||
// 应用信息
|
||||
appInfo: {
|
||||
|
@ -108,11 +108,14 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
uploadUrl: config.baseUrl+'/common/upload',
|
||||
headers: {},
|
||||
//所有可选的平台
|
||||
range: [],
|
||||
sizeType: ['compressed'],
|
||||
//图片数组
|
||||
fileList: [],
|
||||
imageUrl:[],
|
||||
//地址集合
|
||||
addressList: [],
|
||||
//名片数据对象
|
||||
@ -141,12 +144,23 @@
|
||||
|
||||
/**初始化数据*/
|
||||
initData(id) {
|
||||
this.fileList = []
|
||||
this.imageUrl = []
|
||||
if (id) {
|
||||
getBusiCardById({
|
||||
id: id
|
||||
}).then(res => {
|
||||
console.log(res.data, 133)
|
||||
this.dataObj = res.data
|
||||
if (this.dataObj.image != null && this.dataObj.image != ''){
|
||||
console.log(this.dataObj.image,'this.dataObj.image')
|
||||
this.imageUrl = this.dataObj.image.split(',')
|
||||
this.imageUrl.map((item)=>{
|
||||
this.fileList.push({
|
||||
url:config.baseUrl + item
|
||||
})
|
||||
})
|
||||
}
|
||||
}).catch((e) => {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
@ -230,7 +244,11 @@
|
||||
toast("收货地址不能为空")
|
||||
return
|
||||
}
|
||||
// console.log(this.fileList,'fileList')
|
||||
if (this.fileList.length == 0) {
|
||||
toast("证明材料不能为空")
|
||||
return
|
||||
}
|
||||
this.dataObj.image = this.imageUrl.join(',');
|
||||
applyBusiCard(this.dataObj).then(res => {
|
||||
if (res.code == 200) {
|
||||
uni.showToast({
|
||||
@ -250,24 +268,29 @@
|
||||
},
|
||||
|
||||
afterRead(file) {
|
||||
|
||||
for (let i = 0; i < file.tempFilePaths.length; i++) {
|
||||
upload({
|
||||
url: '',
|
||||
filePath: file.tempFilePaths[i]
|
||||
}).then((res) => {
|
||||
console.log(res, '215')
|
||||
this.fileList.push({
|
||||
url: config.baseUrl + res.data
|
||||
url: res.url
|
||||
})
|
||||
console.log(this.fileList, 'fileList')
|
||||
this.imageUrl.push(res.fileName)
|
||||
})
|
||||
}
|
||||
},
|
||||
deleteFile(file, index) {
|
||||
console.log('删除文件');
|
||||
this.fileList.splice(index, 1);
|
||||
this.imageUrl.splice(index, 1);
|
||||
},
|
||||
uploadSuccess(res, file) {
|
||||
console.log('上传成功', res);
|
||||
},
|
||||
uploadFail(error, file) {
|
||||
console.log('上传失败', error);
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
@ -55,123 +55,6 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="card-dom " v-for="item in busiCardList">
|
||||
<!-- 多选框--管理状态或者选择名片时使用 -->
|
||||
<view class="choose-dom" v-if="ifChoose">
|
||||
<uni-data-checkbox v-model="item.choosed" :disabled="1!=item.approvalStatus" multiple
|
||||
:localdata="checkboxArray" />
|
||||
</view>
|
||||
<view :class="['right-content',item.choosed.length>0?'click':'']">
|
||||
<view class="card-title">
|
||||
<!-- 需要根据平台code取对应的图片 TODO -->
|
||||
<image :src="'/static/platform/'+item.platformCode+'.png'" mode="aspectFit"></image>
|
||||
<text>{{item.platformName}}博主</text>
|
||||
<view class="edit-text" @click="edit()">
|
||||
<text v-if="1==item.approvalStatus" style="color:#5986F2;">已审核</text>
|
||||
<text v-else-if="0==item.approvalStatus" style="color:#FC1F3E ;">审核中</text>
|
||||
<text v-else>未通过</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="card-content">
|
||||
<view class="card-person-info">
|
||||
<view class="card-name">
|
||||
<view>{{ item.accountName }}</view>
|
||||
</view>
|
||||
<view class="detail-text">
|
||||
<view class="fans-dom">
|
||||
粉丝:{{ formatNumberWithUnits(item.fansNum) }}
|
||||
</view>
|
||||
<!-- <view class="nickname-dom">-->
|
||||
<!-- 昵称:{{ item.accountName }}-->
|
||||
<!-- </view>-->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="ifEdit" @click="remove(item.id)"
|
||||
:class="['edit-dom',item.choosed.length>0?'':'no-choose']">删除
|
||||
</view>
|
||||
<view v-else :class="['edit-dom',item.choosed.length>0?'':'no-choose']" @click="edit(item.id)">编辑
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="card-dom " v-for="item in busiCardList">
|
||||
<!-- 多选框--管理状态或者选择名片时使用 -->
|
||||
<view class="choose-dom" v-if="ifChoose">
|
||||
<uni-data-checkbox v-model="item.choosed" :disabled="1!=item.approvalStatus" multiple
|
||||
:localdata="checkboxArray" />
|
||||
</view>
|
||||
<view :class="['right-content',item.choosed.length>0?'click':'']">
|
||||
<view class="card-title">
|
||||
<!-- 需要根据平台code取对应的图片 TODO -->
|
||||
<image :src="'/static/platform/'+item.platformCode+'.png'" mode="aspectFit"></image>
|
||||
<text>{{item.platformName}}博主</text>
|
||||
<view class="edit-text" @click="edit()">
|
||||
<text v-if="1==item.approvalStatus" style="color:#5986F2;">已审核</text>
|
||||
<text v-else-if="0==item.approvalStatus" style="color:#FC1F3E ;">审核中</text>
|
||||
<text v-else>未通过</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="card-content">
|
||||
<view class="card-person-info">
|
||||
<view class="card-name">
|
||||
<view>{{ item.accountName }}</view>
|
||||
</view>
|
||||
<view class="detail-text">
|
||||
<view class="fans-dom">
|
||||
粉丝:{{ formatNumberWithUnits(item.fansNum) }}
|
||||
</view>
|
||||
<!-- <view class="nickname-dom">-->
|
||||
<!-- 昵称:{{ item.accountName }}-->
|
||||
<!-- </view>-->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="ifEdit" @click="remove(item.id)"
|
||||
:class="['edit-dom',item.choosed.length>0?'':'no-choose']">删除
|
||||
</view>
|
||||
<view v-else :class="['edit-dom',item.choosed.length>0?'':'no-choose']" @click="edit(item.id)">编辑
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="card-dom " v-for="item in busiCardList">
|
||||
<!-- 多选框--管理状态或者选择名片时使用 -->
|
||||
<view class="choose-dom" v-if="ifChoose">
|
||||
<uni-data-checkbox v-model="item.choosed" :disabled="1!=item.approvalStatus" multiple
|
||||
:localdata="checkboxArray" />
|
||||
</view>
|
||||
<view :class="['right-content',item.choosed.length>0?'click':'']">
|
||||
<view class="card-title">
|
||||
<!-- 需要根据平台code取对应的图片 TODO -->
|
||||
<image :src="'/static/platform/'+item.platformCode+'.png'" mode="aspectFit"></image>
|
||||
<text>{{item.platformName}}博主</text>
|
||||
<view class="edit-text" @click="edit()">
|
||||
<text v-if="1==item.approvalStatus" style="color:#5986F2;">已审核</text>
|
||||
<text v-else-if="0==item.approvalStatus" style="color:#FC1F3E ;">审核中</text>
|
||||
<text v-else>未通过</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="card-content">
|
||||
<view class="card-person-info">
|
||||
<view class="card-name">
|
||||
<view>{{ item.accountName }}</view>
|
||||
</view>
|
||||
<view class="detail-text">
|
||||
<view class="fans-dom">
|
||||
粉丝:{{ formatNumberWithUnits(item.fansNum) }}
|
||||
</view>
|
||||
<!-- <view class="nickname-dom">-->
|
||||
<!-- 昵称:{{ item.accountName }}-->
|
||||
<!-- </view>-->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="ifEdit" @click="remove(item.id)"
|
||||
:class="['edit-dom',item.choosed.length>0?'':'no-choose']">删除
|
||||
</view>
|
||||
<view v-else :class="['edit-dom',item.choosed.length>0?'':'no-choose']" @click="edit(item.id)">编辑
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="ifChoose" class="footer-box">
|
||||
<view class="left-radio">
|
||||
|
@ -28,7 +28,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<!-- 购买 -->
|
||||
<view class="buy-button">立即开通</view>
|
||||
<view class="buy-button" @click="toOrder()">立即开通</view>
|
||||
<!-- 协议 -->
|
||||
<view class="xieyi-box">
|
||||
开通即代表您已阅读并同意<text
|
||||
@ -69,11 +69,8 @@
|
||||
|
||||
<script>
|
||||
import navigationBarVue from '@/components/navigation/navigationBar.vue';
|
||||
import {
|
||||
baseCardList,
|
||||
rightList
|
||||
} from '@/api/business/base.js'
|
||||
|
||||
import {baseCardList, rightList} from '@/api/business/base.js'
|
||||
import {saveOrder} from '@/api/business/member.js'
|
||||
export default {
|
||||
components: {
|
||||
navigationBarVue
|
||||
@ -162,19 +159,21 @@
|
||||
}]
|
||||
}
|
||||
},
|
||||
onShow(){
|
||||
this.initData()
|
||||
|
||||
onLoad(options){
|
||||
this.initData(options.userType);
|
||||
},
|
||||
methods: {
|
||||
/**初始化*/
|
||||
initData(){
|
||||
this.getCardList();
|
||||
this.getRightsList();
|
||||
initData(userType){
|
||||
this.userType = userType
|
||||
this.getCardList(userType);
|
||||
this.getRightsList(userType);
|
||||
},
|
||||
|
||||
/**获取会员卡列表*/
|
||||
getCardList(){
|
||||
baseCardList({userType:this.userType}).then(res => {
|
||||
getCardList(userType){
|
||||
baseCardList({userType:userType}).then(res => {
|
||||
this.memberCardList = res.data
|
||||
}).catch((e) => {
|
||||
uni.showToast({
|
||||
@ -185,8 +184,8 @@
|
||||
})
|
||||
},
|
||||
/**权益列表*/
|
||||
getRightsList(){
|
||||
rightList({userType:this.userType}).then(res => {
|
||||
getRightsList(userType){
|
||||
rightList({userType:userType}).then(res => {
|
||||
this.cardList = res.data.cardList
|
||||
this.rightsList = res.data.rightsList
|
||||
console.log(this.cardList,'cardList')
|
||||
@ -221,6 +220,41 @@
|
||||
handleUserAgrement(site) {
|
||||
this.$tab.navigateTo(`/pages/common/richview/index?title=${site.title}&code=${site.code}`)
|
||||
},
|
||||
/**生成订单*/
|
||||
toOrder(){
|
||||
let data = {
|
||||
userType:this.userType,
|
||||
orderType:'01',
|
||||
goodsId:this.memberCardList[this.chooseCardIndex].id,
|
||||
goodsNum:1,
|
||||
goodsPrice:this.memberCardList[this.chooseCardIndex].priceList[this.choosePriceIndex].price,
|
||||
}
|
||||
if (this.memberCardList[this.chooseCardIndex].priceList[this.choosePriceIndex].title === '年付会员') {
|
||||
data.goodsCycle = '03'
|
||||
}
|
||||
if (this.memberCardList[this.chooseCardIndex].priceList[this.choosePriceIndex].title === '季付会员') {
|
||||
data.goodsCycle = '02'
|
||||
}
|
||||
if (this.memberCardList[this.chooseCardIndex].priceList[this.choosePriceIndex].title === '月付会员') {
|
||||
data.goodsCycle = '01'
|
||||
}
|
||||
saveOrder(data).then(res => {
|
||||
if (res.code == 200) {
|
||||
uni.showToast({
|
||||
icon: 'success',
|
||||
duration: 2000,
|
||||
title: '保存成功'
|
||||
});
|
||||
uni.navigateBack()
|
||||
}
|
||||
}).catch((e) => {
|
||||
uni.showToast({
|
||||
icon: 'error',
|
||||
duration: 2000,
|
||||
title: e
|
||||
});
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
@ -281,7 +281,7 @@
|
||||
this.$tab.navigateTo('/pages/mine/auth/auth-choose')
|
||||
},
|
||||
goMemberCard() {
|
||||
this.$tab.navigateTo('/pages/mine/member/member-card')
|
||||
this.$tab.navigateTo('/pages/mine/member/member-card?userType='+this.localUserType)
|
||||
},
|
||||
/**
|
||||
* 跳转编辑页
|
||||
|
@ -23,7 +23,7 @@ const upload = config => {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
timeout: config.timeout || timeout,
|
||||
url: baseUrl + config.url,
|
||||
url: baseUrl + '/common/upload' + config.url,
|
||||
filePath: config.filePath,
|
||||
name: config.name || 'file',
|
||||
header: config.header,
|
||||
|
Loading…
Reference in New Issue
Block a user