提交销售端代码

config/api.js

@@ -1,8 +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.145/newApi'
-const API_BASE = 'http://192.168.1.109/newApi'
+const API_BASE = 'http://192.168.1.145/newApi'
+//const API_BASE = 'http://192.168.1.109/newApi'
 // const API_BASE = 'http://192.168.1.117:8089'
 //const API_BASE = 'http://192.168.1.145/newApi'
 

pages.json

@@ -89,7 +89,7 @@
 		}, {
 			"path": "businessList",
 			"style": {
-				"navigationBarTitleText": "我的商机"
+				"navigationBarTitleText": "我的公海"
 			}
 		}, {
 			"path": "orderList",

pages/index/index.vue

@@ -3,7 +3,7 @@
 		<view class="swiper-item" style="padding: 0 15px;">
 			<view class="chart-box">
 				<view class="navbar-list">
-						<u-image width="220rpx" height="80rpx" v-for="(item,index) in navbarList" :key="index" :src="item.imgPath" :fade="false" @click="handleJumpPathClick(item)"></u-image>
+						<u-image :width="imgWidth" :height="imgHeight" v-for="(item,index) in navbarList" :key="index" :src="item.imgPath" :fade="false" @click="handleJumpPathClick(item)"></u-image>
 				</view>
 				<!-- 简报 -->
 				<view class="bulletin-list">
@@ -74,6 +74,8 @@
 		},
 		data() {
 			return {
+				imgWidth:'220rpx',
+				imgHeight:'80rpx',
 				cWidth: '',
 				cHeight: '',
 				longitude: '',
@@ -179,7 +181,9 @@
 				if(uni.getStorageSync('userData').flag) {
 					this.navbarList.push(this.business)
 				} else {
-					this.navbarList.push(this.empty)
+					this.imgWidth='300rpx'
+					this.imgHeight='120rpx'
+					//this.navbarList.push(this.empty)
 				}
 			}
 			uni.getLocation({

pagesEnroll/enrolledForm.vue

@@ -54,8 +54,8 @@
 			<u-form-item label="学员年龄" prop="age">
 				<u-input v-model="form.age" placeholder=" " disabled />
 			</u-form-item>
-			<u-form-item label="学生生日" prop="birthday">
-				<u-input v-model="form.birthday" placeholder=" " disabled />
+			<u-form-item label="学生生日" prop="birthday" >
+				<u-input v-model="form.birthday" placeholder=" " disabled @click="birthdayShow = true"/>
 			</u-form-item>
 			<u-form-item label="手机号码" prop="phone">
 				<u-input v-model="form.phone" placeholder=" " disabled />
@@ -123,6 +123,8 @@
 				// 多选支付备注显示
 				payTypeReasonShow: false,
 				form: {
+					saleIsMeFlag:true,
+					isSignUp:0,
 					// 选中的支付方式
 					payTypeId: [],
 					// 备注
@@ -241,6 +243,8 @@
 				this.form.classId = uni.getStorageSync("defaultClass").classId
 				this.form.className = uni.getStorageSync("defaultClass").className
 			}
+			this.form.talkerId = uni.getStorageSync('userData').userId
+			this.form.talkerName = uni.getStorageSync('userData').nickName
 		},
 		onReady() {
 			this.form.coachName = uni.getStorageSync('userData').nickName
@@ -279,6 +283,13 @@
 				NET.request(API.getQrCodeInfo, {
 					orderNo
 				}, 'POST').then(res => {
+					if(res.data.payState==1){
+						this.$refs.uTips.show({
+							title: "订单未完成支付",
+							type: 'warning',
+						})
+						return false
+					}
 					this.form.parentsName = res.data.parentsName
 					this.form.studentId = res.data.studentId
 					this.form.studentName = res.data.studentName
@@ -287,6 +298,8 @@
 					this.form.birthday = res.data.birthday
 					this.form.phone = res.data.phone
 					this.cardList = res.data.cards
+					this.form.venueId = res.data.venueId
+					this.form.venueName = res.data.venueName
 					if(this.cardList.length) {
 						this.form.cardId = this.cardList[0].id
 						this.form.cardName = this.cardList[0].cardNameTypeName
@@ -300,7 +313,7 @@
 					this.form.orderNo = res.data.orderNo
 				}).catch(error => {
 					this.$refs.uTips.show({
-						title: error.message,
+						title: "订单无效",
 						type: 'warning',
 					})
 				})

pagesMain/businessList.vue

@@ -21,6 +21,7 @@
 								<!-- <view class="info-type" :class="site.status == 1 ? 'info-type-active' : ''">{{site.status == 0 ? '未报名' : '已报名'}}</view> -->
 								<view class="info-name">{{site.parentName}}</view>
 								<view class="info-phone">{{site.parentPhone}}</view>
+								<view class="info-saleName" v-if="site.saleName!=null">{{site.saleName}}</view>
 							</view>
 							<!-- <u-image width="28px" height="28px" :src="site.type == 2 ? iconPath1 : iconPath2"></u-image> -->
 						</view>
@@ -76,14 +77,7 @@
 				],
 				triggered: false,
 				tabList: [
-				{
-					name: '无效',
-					isOver: false,
-					pageIndex: 1,
-					filterText: '',
-					type: 0,
-					tableList: [],
-				}, {
+				 {
 					name: '未联系',
 					isOver: false,
 					pageIndex: 1,
@@ -111,7 +105,14 @@
 					filterText: '',
 					type: 4,
 					tableList: [],
-				}],
+				},{
+					name: '无效',
+					isOver: false,
+					pageIndex: 1,
+					filterText: '',
+					type: 0,
+					tableList: [],
+				},],
 				current: 0,
 				swiperCurrent: 0,
 				iconPath1: API.getServerImg + 'weibaoming.png',
@@ -276,7 +277,7 @@
 			//  获取列表数据
 			getTableList(index) {
 				NET.request(API.getCustomerList, {
-					isSignUp: 0,
+					isSignUp: 1,
 					applySaleFlag: this.applySaleFlag == 1 ? true : false,
 					name: this.tabList[index].filterText,
 					type: this.tabList[index].type,
@@ -372,6 +373,13 @@
 									font-size: 12px;
 									color: #999999;
 								}
+								.info-saleName{
+									width: calc(100% - 64px);
+									float: left;
+									line-height: 28px;
+									font-size: 12px;
+									color: #6287d2;
+								}
 							}
 						}
 					}

pagesMain/customerList.vue

@@ -22,7 +22,10 @@
 							<!-- <u-image width="28px" height="28px" :src="site.type == 2 ? iconPath1 : iconPath2"></u-image> -->
 						</view>
 						<view class="venue-content" slot="foot" style="text-align: right;" v-if="current != 2">
-							<u-button type="warning" :ripple="true" shape="circle" :custom-style="handleCustomStyle" size="mini"  @click="handleInvalidClick(site.id)">无效</u-button>
+							<u-button type="warning" :ripple="true" shape="circle" :custom-style="handleCustomStyle" size="mini"  @click="handleInvalidClick(site.id,0)">无效</u-button>
+						</view>
+						<view class="venue-content" slot="foot" style="text-align: right;" v-else>
+							<u-button type="warning" :ripple="true" shape="circle" :custom-style="handleCustomStyle" size="mini"  @click="handleInvalidClick(site.id,1)">有效</u-button>
 						</view>
 					</u-card>
 					<u-divider v-if="item.isOver" bg-color="transparent" :style="{paddingTop : item.tableList.length == 0 ? '10px' : ''}">没有更多了</u-divider>
@@ -100,7 +103,7 @@
 				invalidForm: {
 					customerId: null,
 					content: '',
-					deleted: true
+					joinState: 0
 				},
 				// 备注校验规则
 				invalidRules: {
@@ -128,7 +131,8 @@
 				});
 			},
 			//  备注弹窗显示
-			handleInvalidClick(id) {
+			handleInvalidClick(id,type) {
+				this.invalidForm.joinState=type
 				this.invalidForm.customerId = id
 				this.$refs.invalidFormRef.setRules(this.invalidRules)
 				this.invalidShow = true
@@ -201,10 +205,11 @@
 			//  获取列表数据
 			getTableList(index) {
 				NET.request(API.getCustomerList, {
-					isSignUp: 1,
+					isSignUp: 0,
 					name: this.tabList[index].filterText,
 					type: this.tabList[index].type,
 					page: this.tabList[index].pageIndex,
+					saleIsMeFlag: true,
 					size: 10,
 				}, 'POST').then(res => {
 					this.triggered = false

pagesMain/threadList.vue

@@ -60,14 +60,7 @@
 				// filterText: '',
 				triggered: false,
 				tabList: [
-				{
-					name: '无效',
-					isOver: false,
-					pageIndex: 1,
-					filterText: '',
-					type: 0,
-					tableList: [],
-				}, {
+				 {
 					name: '未联系',
 					isOver: false,
 					pageIndex: 1,
@@ -95,6 +88,13 @@
 					filterText: '',
 					type: 4,
 					tableList: [],
+				},{
+					name: '无效',
+					isOver: false,
+					pageIndex: 1,
+					filterText: '',
+					type: 0,
+					tableList: [],
 				}],
 				current: 0,
 				swiperCurrent: 0,
@@ -156,7 +156,8 @@
 			//  获取列表数据
 			getTableList(index) {
 				NET.request(API.getCustomerList, {
-					isSignUp: 0,
+					isSignUp: 1,
+					saleIsMeFlag: true,
 					name: this.tabList[index].filterText,
 					type: this.tabList[index].type,
 					page: this.tabList[index].pageIndex,