Merge branch 'v3' of http://git.jihengcc.cn/starfire/spark-sale into v3

pagesMain/businessList.vue

@@ -300,7 +300,7 @@
 			//  跳转到报名详情
 			goToOrderList(item) {
 				uni.navigateTo({
-					url: `/pagesMain/customerInfo?id=${item.id}&title=线索信息`
+					url: `/pagesMain/customerInfo?id=${item.id}&title=公海信息`
 				});
 			}
 		},

pagesMain/customerInfo.vue

@@ -5,7 +5,7 @@
 				<u-input v-model="form.studentName" placeholder=" " disabled />
 			</u-form-item>
 			<u-form-item v-if="navbarTitle == '客户信息'" label="学生照片" prop="imageFileId" label-position="top">
-				<u-upload max-count="1" :deletable="false" :file-list="form.fileList" index="1"></u-upload>
+				<u-upload max-count="1" :deletable="false" :file-list="form.fileList" index="1" :show-progress="false" :preview-full-image="false"></u-upload>
 			</u-form-item>
 			<u-form-item label="学员性别" prop="sex" placeholder=" " disabled>
 				<text>{{ form.sex == '0' ? '男' : '女' }}</text>

pagesMain/customerList.vue

@@ -16,7 +16,7 @@
 							<view class="student-info">
 								<view class="info-name">{{site.studentName}}</view>
 								<!-- <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-name" style="width:100px;">{{site.parentName}}</view>
 								<view class="info-phone">{{site.parentPhone}}</view>
 							</view>
 							<!-- <u-image width="28px" height="28px" :src="site.type == 2 ? iconPath1 : iconPath2"></u-image> -->
@@ -362,5 +362,6 @@
 		position: fixed;
 		bottom: 15px;
 		right: 15px;
+		z-index: 10;
 	}
 </style>