zzp 2 years ago
parent
commit
d24835a8d8
5 changed files with 15 additions and 21 deletions
  1. 3 1
      config/api.js
  2. 0 16
      pages/index/index.vue
  3. 4 0
      pagesEnroll/enrolledForm.vue
  4. 2 1
      pagesMain/customerList.vue
  5. 6 3
      pagesMain/venueDetail.vue

+ 3 - 1
config/api.js

@@ -1,6 +1,8 @@
 // const API_BASE = 'https://xinghuolanqiu.com/newApi'
 // const API_BASE = 'http://192.168.1.126:30000'
-const API_BASE = 'http://192.168.1.117:8089'
+// const API_BASE = 'http://192.168.1.117:8089'
+const API_BASE = 'http://192.168.1.145/newApi'
+
 module.exports = {
 	//  微信授权登录
 	wxLogin: API_BASE + '/v2/sale/login/wxLogin',

+ 0 - 16
pages/index/index.vue

@@ -303,27 +303,11 @@
 						series: [
 							{
 								data: this.threadList
-								// data: [{'name':"一班(20)","value":500},{'name':"二班","value":30},{'name':"三班","value":20},{'name':"四班","value":18}]
-								// data: threadList
 							}
 						]
 					};
 				this.drawCharts('chartBox', aaa);
 			},
-			// 图
-			// getRing() {
-			// 	// console.log(threadList);
-			// 	let res = {
-			// 			series: [
-			// 				{
-			// 					// data: this.threadList
-			// 					data: [{'name':"一班(20)","value":500},{'name':"二班","value":30},{'name':"三班","value":20},{'name':"四班","value":18}]
-			// 					// data: threadList
-			// 				}
-			// 			]
-			// 		};
-			// 	this.drawCharts('chartBox', res);
-			// },
 			//  切换简报
 			handlebulletinClick(index) {
 				this.bulletinCurrent = index

+ 4 - 0
pagesEnroll/enrolledForm.vue

@@ -287,6 +287,10 @@
 					this.form.birthday = res.data.birthday
 					this.form.phone = res.data.phone
 					this.cardList = res.data.cards
+					if(this.cardList.length) {
+						this.form.cardId = this.cardList[0].id
+						this.form.cardName = this.cardList[0].cardNameTypeName
+					}
 					if (res.data.imageFileId) {
 						this.form.imageFileId = res.data.imageFileId
 						this.fileList = [{

+ 2 - 1
pagesMain/customerList.vue

@@ -113,7 +113,8 @@
 				}
 			}
 		},
-		onLoad() {
+		onShow() {
+			this.tabList = Object.assign([], this.$options.data().tabList)
 			this.getTableList(0)
 			this.getTableList(1)
 			this.getTableList(2)

+ 6 - 3
pagesMain/venueDetail.vue

@@ -150,7 +150,7 @@
 				// 	url: '/pagesMember/classDetail?id=' + item.id
 				// });
 			},
-			//  弹出
+			// 体验
 			cardHandle(item, type) {
 				const classId = parseInt(item.id)
 				const customerId = parseInt(this.$store.state.customerId)
@@ -158,11 +158,15 @@
 					classId,
 					customerId
 				}, 'POST').then(res => {
-					this.subscribeShow = false
 					this.$refs.uTips.show({
 						title: res.message,
 						type: 'success',
 					})
+					setTimeout(()=> {
+						uni.navigateBack({
+							delta: 2
+						})
+					}, 1000)
 				}).catch(error => {
 					this.$refs.uTips.show({
 						title: error.message,
@@ -194,7 +198,6 @@
 					classId: this.classId,
 					studentId: this.userId,
 				}, 'POST').then(res => {
-					this.subscribeShow = false
 					this.$refs.uTips.show({
 						title: res.message,
 						type: 'success',