Commit bc02e096 by kyle

接口对接

parent 0951c511
......@@ -3,8 +3,21 @@
export default {
onLaunch: function() {
console.log('App Launch');
uni.getSystemInfo({
success:(systemInfo)=> {
uni.request({
url: '/api/appVersion/checkIsUpdate',
method:'POST',
data: {
appType: 1,
version: systemInfo.appVersion,
systemType:systemInfo.osName === 'android' ? 1 : 2
},
success: (result) => {
const data = result.data.data['appVersionInfo'];
if (data.isForceUpdate && data.wgtUrl) {
uni.downloadFile({
url: '/cffpUpdate/__UNI__65C4CDC.wgt',
url: data.wgtUrl,
success: (downloadResult) => {
if (downloadResult.statusCode === 200) {
plus.runtime.install(downloadResult.tempFilePath, {
......@@ -16,57 +29,13 @@
console.error('install fail...');
});
}
} ,
fail(e) {
console.log(e)
}
});
// #ifdef APP-PLUS
plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
uni.downloadFile({
url: 'https://mdev.zuihuibi.cn/cffpUpdate/__UNI__65C4CDC.wgt',
success: (downloadResult) => {
if (downloadResult.statusCode === 200) {
plus.runtime.install(downloadResult.tempFilePath, {
force: false
}, function() {
console.log('install success...');
plus.runtime.restart();
}, function(e) {
console.error('install fail...');
});
}
}
});
// uni.request({
// url: 'http://www.example.com/update/',
// data: {
// version: widgetInfo.version,
// name: widgetInfo.name
// },
// success: (result) => {
// var data = result.data;
// if (data.update && data.wgtUrl) {
// uni.downloadFile({
// url: data.wgtUrl,
// success: (downloadResult) => {
// if (downloadResult.statusCode === 200) {
// plus.runtime.install(downloadResult.tempFilePath, {
// force: false
// }, function() {
// console.log('install success...');
// plus.runtime.restart();
// }, function(e) {
// console.error('install fail...');
// });
// }
// }
// });
// }
// }
// });
});
// #endif
}
})
initApp()
},
onShow: function() {
......
......@@ -168,6 +168,26 @@ export default {
// 支付宝支付
aliAppPay(params){
return request(`${apiURL}/aliPay/aliAppPay`, "POST", params)
},
// 分享链接列表
userShareLinkList(params){
return request(`${cffpURL}/share/userShareLinkList`, "POST", params)
},
// 分享阅读列表
userShareReadList(params){
return request(`${cffpURL}/share/userShareReadList`, "POST", params)
},
// 分享购买列表
userShareBuyList(params){
return request(`${cffpURL}/share/userShareBuyList`, "POST", params)
},
// 我的分享统计
userShareCount(params){
return request(`${cffpURL}/share/userShareCount`, "POST", params)
},
// 退课明细
userRefundCourseDtl(params){
return request(`${cffpURL}/course /userRefundCourseDtl`, "POST", params)
}
}
......@@ -4,7 +4,10 @@
<image :src="thumbnailPath" alt="" mode="widthFix"></image>
</view>
<view class="courseDetailBox">
<view class="title">
<h4>{{title}}</h4>
<text class="detailBtn" @click="viewDetail()" v-if="isNeedViewDetail">订单详情></text>
</view>
<view class="summaryBox" v-if="summaryBox">
<text>{{summaryBox}}</text>
</view>
......@@ -37,6 +40,12 @@
},
dataList:{
type:Object
},
isNeedViewDetail:{
type:Boolean
},
orderId:{
type:String
}
},
......@@ -56,6 +65,11 @@
}else{
return [].concat(v2,v1)
}
},
viewDetail(){
uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${this.orderId}&type=drop`
})
}
}
}
......@@ -76,6 +90,15 @@
.courseDetailBox{
width: 100%;
color: #333;
.title{
display: flex;
justify-content: space-between;
align-items: center;
.detailBtn{
font-size: 24rpx;
color: #4A4A4A;
}
}
h4{
font-size: 32rpx;
}
......
......@@ -32,7 +32,7 @@
};
},
mounted() {
console.log(this.title,this.lists)
console.log(this.lists)
},
onLoad() {
......@@ -40,7 +40,6 @@
methods:{
link(val){
if(val){
console.log(val)
uni.navigateTo({
url:val
})
......
......@@ -315,6 +315,9 @@
},
mounted() {
this.checkToken();
},
destroyed() {
uni.hideToast();
}
}
</script>
......
......@@ -128,7 +128,7 @@
},
"devServer" : {
"proxy" : {
"/api" : {
"/api":{
"port" : 3000, // 端口号
"target" : "https://mdev.zuihuibi.cn", //请求的目标域名
"changeOrigin" : true, //是否跨域
......
......@@ -245,6 +245,13 @@
"navigationBarTitleText": "纳税规则",
"enablePullDownRefresh": false
}
},{
"path" : "pages/applyDropClass/applyDropClass",
"style" :
{
"navigationBarTitleText": "申请退课",
"enablePullDownRefresh": false
}
}
],
// "tabBar": {
......
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
};
}
}
</script>
<style lang="scss">
</style>
......@@ -9,6 +9,7 @@
<script>
import listItem from "@/components/listItem/listItem.vue";
import api from "@/api/api";
export default {
components:{
listItem
......@@ -19,13 +20,36 @@
lists:[],
fileId:'',
type:'1',
userId:'1'
}
},
methods: {
queryLists(obj){
const params = {
userId:this.userId,
fileId:this.fileId
}
api[obj.req](params).then(res=>{
if(res['success']){
const r = res['data'][obj.result];
if(r && r.length>0){
for(let i=0;i<r.length;i++){
this.lists.push({id:r[i][obj.id],children:JSON.parse(JSON.stringify(obj.children))});
for(let m=0;m<this.lists[i]['children'].length;m++){
this.lists[i]['children'][m]['value'] = r[i][this.lists[i]['children'][m]['alias']] ? r[i][this.lists[i]['children'][m]['alias']] : this.lists[i]['children'][m]['value'];
if(this.lists[i]['children'][m].needParam){
this.lists[i]['children'][m]['link'] += r[i][obj.id]
}
}
}
}
}else{
this.lists = []
}
})
}
},
onLoad(option) {
console.log(option)
this.fileId = option.fileId;
// type 1为分享明细 2阅读明细 3购买明细
this.type = option.type;
......@@ -38,13 +62,18 @@
{no:2,name:'分享链接',width: '35%'},
{no:3,name:'阅读明细',width: '25%'},
];
this.lists = [
{id:1,children:[{no:1,value:'XXXXX',link:'',width: '40%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '35%'},{no:3,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=2`,width: '25%'}]},
{id:2,children:[{no:1,value:'XXXXX',link:'',width: '40%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '35%'},{no:3,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=2`,width: '25%'}]},
{id:3,children:[{no:1,value:'XXXXX',link:'',width: '40%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '35%'},{no:3,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=2`,width: '25%'}]},
{id:4,children:[{no:1,value:'XXXXX',link:'',width: '40%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '35%'},{no:3,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=2`,width: '25%'}]},
{id:5,children:[{no:1,value:'XXXXX',link:'',width: '40%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '35%'},{no:3,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=2`,width: '25%'}]},
this.queryLists(
{
req:'userShareLinkList',
result:'userShareLinks',
id:'shareId',
children:[
{no:1,name:'分享时间',width: '40%',value:'',link:null,alias:'shareDate'},
{no:2,name:'分享链接',width: '35%',value:'',link:null,alias:'shareUrl'},
{no:3,name:'阅读明细',width: '25%',value:'阅读明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=2`},
]
}
);
}else if(this.type=='2'){
this.title = [
{no:1,name:'用户',width: '20%'},
......@@ -52,25 +81,38 @@
{no:3,name:'阅读时间',width: '25%'},
{no:4,name:'购买明细',width: '25%'}
];
this.lists = [
{id:1,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3`,width: '25%'}]},
{id:2,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3`,width: '25%'}]},
{id:3,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3`,width: '25%'}]},
{id:4,children:[{no:1,value:'XXXXX',link:'',width: '20%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:3,value:'2022-10-12',link:'',width: '25%'},{no:4,value:'查看明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3`,width: '25%'}]},
this.queryLists(
{
req:'userShareReadList',
result:'userShareReads',
id:'readId',
children:[
{no:1,name:'用户',width: '20%',value:'',link:null,alias:'readName'},
{no:2,name:'阅读链接',width: '30%',value:'',link:null,alias:'readUrl'},
{no:3,name:'阅读时间',width: '25%',value:'',link:null,alias:'readDate'},
{no:3,name:'购买明细',width: '25%',value:'购买明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3`},
]
}
);
}else if(this.type=='3'){
this.title = [
{no:1,name:'用户',width: '30%'},
{no:2,name:'阅读链接',width: '30%'},
{no:3,name:'购买订单',width: '40%'},
];
this.lists = [
{id:1,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:`/pages/orderDetail/orderDetail?id=1`,width: '40%'}]},
{id:2,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:`/pages/orderDetail/orderDetail?id=1`,width: '40%'}]},
{id:3,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:`/pages/orderDetail/orderDetail?id=1`,width: '40%'}]},
{id:4,children:[{no:1,value:'XXXXX',link:'',width: '30%'},{no:2,value:'https://mdev.zuihuibi.cn/cffp/pages/commonDetail/commonDetail',link:'',width: '30%'},{no:4,value:'查看明细',link:`/pages/orderDetail/orderDetail?id=1`,width: '40%'}]},
this.queryLists(
{
req:'userShareBuyList',
result:'userShareLinks',
id:'orderId',
children:[
{no:1,name:'用户',width: '30%',value:'',link:null,alias:'buyName'},
{no:2,name:'阅读链接',width: '30%',value:'',link:null,alias:'buyUrl'},
{no:3,name:'购买订单',width: '40%',value:'',link:`/pages/orderDetail/orderDetail?id=`,alias:'orderNo',needParam:true},
]
}
);
}
}
}
</script>
......
......@@ -78,39 +78,39 @@
return {
queryDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
userId:null,
userId:'1',
coursesCountInfos:{},
userShareCourse:[]
userShareCourses:[]
}
},
methods: {
bindDateChange: function(e) {
this.queryDate = e.detail.value
},
userShareCount(){
const params = {
userId:this.userId,
queryDate:this.queryDate
}
api.userShareCount(params).then(res=>{
console.log(res)
if(res['success']){
this.coursesCountInfos = res['data'];
}
})
},
userShareQuery(){
const params = {
userId:this.userId,
queryDate:this.queryDate
}
this.coursesCountInfos ={
shareFrequencyMonth:'XXX',
integralMonth:'XXX',
shareSectionMonth:'XXX',
shareFrequencyCount:'XXX',
integralCount:'XXX',
shareSectionCount:'XXX'
}
this.userShareCourses = [
{fileId:1,fileTitle:'11111',fileLecturerName:'sssss',fileLecturerRanks:'nnnnnn',coursePrice:'12312',salesNumber:123,shareDate:'2022-11-11 17:33',shareCount:123,readCount:111,buyCount:111}
]
console.log(this.userShareCourses)
// api.userShareQuery(params).then(res=>{
// console.log(res)
// if(res['success']){
// this.coursesCountInfos = res['data']['coursesCountInfos'];
// this.userShareCourses = res['data']['userShareCourses'];
// }
// })
api.userShareQuery(params).then(res=>{
console.log(res)
if(res['success']){
this.userShareCourses = res['data']['userShareCourses'];
}
})
},
// 查看详情
goDetail(val){
......@@ -126,7 +126,8 @@
}
},
onLoad() {
this.userShareQuery()
this.userShareCount();
this.userShareQuery();
},
mounted() {
......
......@@ -4,15 +4,19 @@
<view class="ulBox">
<view v-for="item in orderInfoList.filter(item=>item.pageArea===1)" :key="item.id" class="liBox">
<text>{{item.name}}:</text>
<text :style="{color:item.color ? item.color : '#666'}">{{item.value}}</text>
<text :style="{color:item.color ? item.color : '#666'}">{{item.type==='currency' && item.value ? '¥' : ''}}{{item.value ? item.value : '/'}}</text>
</view>
</view>
<view class="ulBox">
<view v-for="item in orderInfoList.filter(item=>item.pageArea===2)" :key="item.id" class="liBox">
<text>{{item.name}}:</text>
<text :style="{color:item.color ? item.color : '#666'}">{{item.value}}</text>
<text :style="{color:item.color ? item.color : '#666'}">{{item.type==='currency' && item.value ? '¥' : ''}}{{item.value ? item.value : '/'}}</text>
</view>
</view>
<!-- 退课 -->
<view class="dropClassBox" v-if="type=='drop'">
<view class="dropBtn">退课</view>
</view>
</view>
</view>
</template>
......@@ -35,11 +39,12 @@
{id:7,name:'课程现价',value:'111111',type:'currency',alias:'orderPrice',pageArea:1},
{id:8,name:'积分抵扣',value:'111111',color:'#FA6900',type:'currency',alias:'integralExchange',pageArea:1},
{id:9,name:'实际支付',value:'111111',type:'currency',alias:'paymentAmount',pageArea:1},
{id:10,name:'获得积分',value:'111111',type:'currency',color:'#F15A1F',alias:'salesCommission',pageArea:2},
{id:10,name:'获得积分',value:'111111',type:'string',color:'#F15A1F',alias:'salesCommission',pageArea:2},
{id:11,name:'积分来源',value:'111111',type:'string',alias:'commissionSource',pageArea:2},
{id:12,name:'课程状态',value:'111111',type:'string',alias:'courseStatusName',pageArea:2},
{id:13,name:'观看截至',value:'111111',type:'string',alias:'effectiveEndDate',pageArea:2}
],
type:''
};
},
methods:{
......@@ -68,6 +73,7 @@
},
onLoad(option) {
this.orderId = option.id
this.type = option.type
}
}
......@@ -97,6 +103,20 @@
}
}
.dropClassBox{
display: flex;
justify-content: flex-end;
padding-right: 20rpx;
margin-top: 20rpx;
.dropBtn{
border-radius: 80rpx;
color: #fff;
background-color: #20269B;
font-size: 36rpx;
text-align: center;
padding: 6rpx 50rpx;
}
}
}
}
</style>
......@@ -166,7 +166,11 @@
api.queryInfo({userId:this.userId}).then(res=>{
if(res['success']){
this.customerBasicInfo = res['data'];
console.log(res)
}else{
uni.showToast({
title: res['message'],
duration: 2000
});
}
})
}
......
......@@ -46,10 +46,10 @@
<template v-if="userCourses && tabType===1">
<view class="saleOrderInfoItem" v-for="item in userCourses" :key="item.fileId">
<view class="courseInfoContent">
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :tagList="{v1:item.fileLecturerRanks,v2:item.fileLecturerName}"></course-item>
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :tagList="{v1:item.fileLecturerRanks,v2:item.fileLecturerName}" :isNeedViewDetail="true" :orderId="item.orderId"></course-item>
</view>
<view class="countsContent" @click="goDetail(item.fileId)">
<text>实际支付:¥199.00</text>
<view class="countsContent">
<text>实际支付:¥{{item.paymentAmount.toFixed(2)}}</text>
</view>
</view>
</template>
......@@ -132,12 +132,12 @@
}
},
// 查看详情
goDetail(val){
uni.navigateTo({
url:`/pages/commonDetail/commonDetail?fileId=${val}&type=1`
})
},
// // 查看详情
// goDetail(val){
// uni.navigateTo({
// url:`/pages/commonDetail/commonDetail?fileId=${val}&type=1`
// })
// },
// 查看积分
viewIntegral(){
uni.navigateTo({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment