Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp

pages/mine/set/my-info.vue

@@ -13,7 +13,7 @@
 					<uni-easyinput v-model="valiFormData.nickName" placeholder="请输入" />
 				</uni-forms-item>
 				<uni-forms-item labelWidth="280rpx" label="联系方式" required name="phonenumber">
-					<uni-easyinput v-model="valiFormData.phonenumber" placeholder="请输入" />
+					<uni-easyinput v-model="valiFormData.phonenumber" type="number" placeholder="请输入" />
 				</uni-forms-item>
 				<uni-forms-item labelWidth="280rpx" label="绑定手机号" required name="userName">
 					<uni-easyinput disabled v-model="valiFormData.userName" />

pages/notice/detail.vue

@@ -108,19 +108,19 @@
 							{{!noticeDetail.isUrgent?'否':noticeDetail.isUrgent==1?'是':'否'}}
 						</view>
 					</view>
-					<view class="dl-item" v-if="noticeDetail.thirdUrl&&passSign">
-
-						<view class="dl-label">
-							三方链接：
+					<view class="dl-item" v-if="noticeDetail.thirdUrl&&isSign">
+						<view class="dl-label" @click="copyUrl(noticeDetail.thirdUrl)">
+							三方报名链接(点击复制)：
 						</view>
-						<view class="dl-value">
+					</view>
+					<view class="dl-item" v-if="noticeDetail.thirdUrl&&isSign">
+						<view class="dl-value" @click="copyUrl(noticeDetail.thirdUrl)">
 							{{noticeDetail.thirdUrl}}
 						</view>
 					</view>
-					<view class="dl-item" v-else-if="noticeDetail.thirdUrl&&!passSign">
-
+					<view class="dl-item" v-else-if="noticeDetail.thirdUrl&&!isSign">
 						<view class="dl-label">
-							三方链接：
+							三方报名链接：
 						</view>
 						<view class="dl-value">
 							报名通过后可查看
@@ -229,7 +229,18 @@
 			<shareImages ref="canvas" :canvasWidth="canvasWidth" :canvasHeight="canvasHeight" :shareTitle="shareTitle"
 				:goodsTitle="goodsTitle" :shareImage="shareImage" :qrSize="qrSize" :qrUrl="qrUrl"
 				@success="shareSuccess()" />
-
+			<!-- 报名弹窗 -->
+			<uni-popup ref="popupNew">
+				<view class="popup-content">
+					<view style="text-align: center;">
+						<view>此通告需要收集博主信息</view>
+						<view>请复制通告到微信对话框填写信息报名</view>
+					</view>
+					<view style="text-align: center;width: 100%;margin-top: 20rpx;">
+						<view class="dl-copy-button" @click="goLinkUrl">点击复制</view>
+					</view>
+				</view>
+			</uni-popup>
 		</view>
 	</view>
 </template>
@@ -259,7 +270,8 @@
 	} from '@/api/business/base.js'
 	import config from '@/config'
 	import {
-		getSignCard
+		getSignCard,
+		userSign
 	} from '@/api/business/signCard.js'
 	import {
 		getUrlLink
@@ -271,6 +283,9 @@
 		},
 		data() {
 			return {
+				signFormData: {
+					customForm: []
+				},
 				navigatePath: '000',
 				//是否是看自己的通告-通告主
 				viewMy: false,
@@ -371,6 +386,25 @@
 			this.viewNotice()
 		},
 		methods: {
+			copyUrl(url) {
+				uni.setClipboardData({
+					data: url,
+					success: function() {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none',
+							duration: 2000
+						});
+					},
+					fail: function() {
+						uni.showToast({
+							title: '复制失败',
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
 			goLogin() {
 				uni.navigateTo({
 					url: '/pages/login?canBack=true'
@@ -559,7 +593,7 @@
 						data: res.data,
 						success: function() {
 							uni.showToast({
-								title: '名单复制成功，请到浏览器下载',
+								title: '复制成功',
 								icon: 'none',
 								duration: 2000
 							});
@@ -584,12 +618,26 @@
 			 * 报名
 			 */
 			goReport() {
+				let that = this
 				getSignCard({
 					noticeId: this.noticeId
 				}).then(res => {
 					if (res.code == 200) {
 						if (res.data.canUserNum > 0) {
-							this.$tab.navigateTo('/pages/notice/report?noticeId=' + this.noticeId)
+							if (this.noticeDetail.thirdUrl) {
+								//有第三方链接的不需要在本平台填写信息
+								//处理卡片
+								this.signFormData.noticeId = this.noticeDetail.id
+								this.signFormData.cardList = [res.data.list[0]]
+								this.signFormData.isSuper = 0
+								userSign(this.signFormData).then(res => {
+									this.$refs.popupNew.open('center')
+									that.getDetail()
+								})
+							} else {
+								this.$tab.navigateTo('/pages/notice/report?noticeId=' + this.noticeId)
+							}
+
 						} else {
 							this.$refs.alertDialog.open()
 						}
@@ -602,7 +650,6 @@
 						title: e
 					});
 				})
-
 			},
 			/**
 			 * 分享
@@ -1040,4 +1087,24 @@
 			}
 		}
 	}
+
+	.popup-content {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		padding: 30rpx;
+		border-radius: 10px;
+		background-color: white;
+
+		.dl-copy-button {
+			text-align: center;
+			margin: auto;
+			border-radius: 40rpx;
+			width: 75%;
+			background-color: #FC1F3E;
+			color: white;
+			padding: 15rpx 0;
+		}
+	}
 </style>