瀏覽代碼

提交更改我的课程列表接口

puyao 2 周之前
父節點
當前提交
63f34fe4f0
共有 6 個文件被更改,包括 53 次插入7 次删除
  1. 1 1
      api/manageCompany.js
  2. 1 1
      common/request.js
  3. 6 1
      pages.json
  4. 1 0
      pages_course/video.vue
  5. 4 3
      pages_manage/components/courseIndex.vue
  6. 40 1
      pages_user/user/pay.vue

+ 1 - 1
api/manageCompany.js

@@ -264,7 +264,7 @@ export function trainingCampList(data){
 }
 //获取营期下拉列表
 export function courseList(data){
-	return request('/companyapp/app/fs/course/courseList',data, 'POST', 'application/json;charset=UTF-8');
+	return request('/companyapp/app/fs/course/list',data, 'POST', 'application/json;charset=UTF-8');
 }
 //获取appid配置
 export function getLoginMiniAppId({appId}){

+ 1 - 1
common/request.js

@@ -21,7 +21,7 @@ export default class Request {
 		let token = uni.getStorageSync('AppToken');
 		if(router.indexOf("/companyapp")!=-1){
 			// router =router.replace('/companyapp','')
-			 // path = 'http://t7e6ce29.natappfree.cc'//存在本地
+			 // path = 'http://aa5ae96f.natappfree.cc'//存在本地
 			 path = 'https://userapp.moonxiang.com'//存在文化
 			 type = 1
 			 token = uni.getStorageSync('ManageToken');

+ 6 - 1
pages.json

@@ -678,7 +678,12 @@
 					"path": "user/pay",
 					"style": {
 						"navigationBarTitleText": "收款",
-						"enablePullDownRefresh": false
+						"navigationStyle": "custom",
+						"scrollIndicator": "none",
+						"app-plus": {
+							"bounce": "none",
+							"softinputMode": "adjustResize"
+						}
 					}
 
 				}, {

+ 1 - 0
pages_course/video.vue

@@ -1035,6 +1035,7 @@
 				this.currentReward = e.detail.value
 			},
 			closeAnswerPopup(type) {
+				console.log(type)
 				this.$refs.answerPopup.close()
 				if(this.isOpen==1) {
 					return

+ 4 - 3
pages_manage/components/courseIndex.vue

@@ -163,6 +163,7 @@
 				pageSizet: 10,
 				triggeredst:false,
 				showtrain:false
+				
 			}
 		},
 		computed: {
@@ -185,7 +186,7 @@
 				setTimeout(() => {
 					this.triggeredst = false;
 					uni.stopPullDownRefresh()
-					this.pageNum = 1;
+					this.pageNumt = 1;
 					this.trainingCampLists('refresh') //触底  不穿执行else
 					// 请求接口里面需要判断是不是最后一页 是最后一页 status赋值为‘loadmore’没有更多了
 					// 请求接口
@@ -197,7 +198,7 @@
 					this.loadStatust = 'loading'
 					uni.showNavigationBarLoading()
 					setTimeout(() => {
-						this.pageNum++
+						this.pageNumt++
 						this.trainingCampLists() //触底  不穿执行else
 						uni.hideNavigationBarLoading()
 					}, 1000);
@@ -219,7 +220,7 @@
 					pageNum:this.pageNumt,
 					pageSize:this.pageSizet,
 				}
-				trainingCampList().then(res=>{
+				trainingCampList(data).then(res=>{
 					if(res.code==200){
 						const list=res.data.list
 						if (type == 'refresh') {

+ 40 - 1
pages_user/user/pay.vue

@@ -1,5 +1,12 @@
 <template>
 	<view class="content">
+		<view class="header-nav"
+			:style="{height: `calc(88rpx + ${statusBarHeight}px)`,paddingTop: statusBarHeight + 'px'}">
+			<u-icon name="arrow-left" size="24" @click="tosales" v-if="appToken"></u-icon>
+			<view class="header-title"
+				:style="{width:menuButtonLeft + 'px',height:menuButtonH+'px',lineHeight:menuButtonH+'px'}">
+				收款</view>
+		</view>
 		<view class="top">
 			<view class="inner">
 				<view class="pay">
@@ -46,7 +53,11 @@
 				desc:"",
 				money:null,
 				wxPay: true,
-				scanCodeDiscountAmount:''
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+				menuButtonLeft: 281,
+				menuButtonH: 45,
+				scanCodeDiscountAmount:'',
+				appToken:''
 			}
 		},
 		onLoad: function(options) {
@@ -60,6 +71,7 @@
 		 //   	this.companyId=obj.companyId;
 			// this.companyUserId=obj.companyUserId;
 		 //   }
+		 this.appToken=uni.getStorageSync('CompanyUserToken')
 			this.companyId=options.companyId;		
 			this.companyUserId=options.companyUserId;
 			if(!uni.getStorageSync('AppToken')||uni.getStorageSync('AppToken')==null){
@@ -75,6 +87,11 @@
 			}
 		},
 		methods: {
+			tosales() {
+				uni.navigateTo({
+					url: "/pages_company/index"
+				})
+			},
 			onNickNameInput(e){
 				console.log(e)
 			},
@@ -212,6 +229,28 @@
 </script>
 
 <style lang="scss">
+	.header-nav {
+		height: 88rpx;
+		// @include u-flex(row, center, flex-start);
+		display: flex;
+		justify-content: start;
+		overflow: hidden;
+		background-color: #fff;
+		box-sizing: border-box;
+	
+		.header-title {
+			text-align: center;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			padding: 0 10rpx 0 100rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 15px;
+			color: #000;
+			box-sizing: border-box;
+		}
+	}
 	page{
 		height: 100%;
 		background-color: #f0eff4;