commit 增加用户协议

common/css/iconfont.scss

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4053045 */
-  src: url('//at.alicdn.com/t/c/font_4053045_l7crg3mtuk.woff2?t=1685427677878') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4053045_l7crg3mtuk.woff?t=1685427677878') format('woff'),
-       url('//at.alicdn.com/t/c/font_4053045_l7crg3mtuk.ttf?t=1685427677878') format('truetype'),
-       url('//at.alicdn.com/t/c/font_4053045_l7crg3mtuk.svg?t=1685427677878#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/c/font_4053045_7pcl32qztzq.woff2?t=1689837851670') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4053045_7pcl32qztzq.woff?t=1689837851670') format('woff'),
+       url('//at.alicdn.com/t/c/font_4053045_7pcl32qztzq.ttf?t=1689837851670') format('truetype'),
+       url('//at.alicdn.com/t/c/font_4053045_7pcl32qztzq.svg?t=1689837851670#iconfont') format('svg');
 }
 
 .iconfont {
@@ -14,6 +14,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-gouxuan:before {
+  content: "\e769";
+}
+
+.icon-weigouxuan:before {
+  content: "\e768";
+}
+
 .icon-shanchu2:before {
   content: "\e6b6";
 }

pages.json

@@ -155,6 +155,17 @@
 					"path": "password",
 					"style": {
 						"navigationBarTitleText": "修改密码"
+					} 
+				}
+			]
+		},
+		{
+			"root": "pages/service/", //注册登录模块
+			"pages": [
+				{
+					"path": "service",
+					"style": {
+						"navigationBarTitleText": ""
 					}
 				}
 			]
@@ -267,6 +278,12 @@
 						"navigationBarTitleText": "更换手机号"
 					}
 				},
+				{
+					"path": "setting/protocol",
+					"style": {
+						"navigationBarTitleText": "用户协议"
+					}
+				},
 				{
 					"path": "collection/collection",
 					"style": {

pages/login/register.vue

@@ -2,19 +2,15 @@
 	<view class="container register" :style="{ paddingTop: CustomBar + 'px' }">
 		<cu-custom :navbar-data="nvabarData" @navigateBack="modal = true"></cu-custom>
 		<view class="register-tabs">
-			<view class="tabs-item" :class="stepNum === 0 ? 'active' : '' ">
-				<text class="iconfont icon-1_round_solid"></text>
-				<text>账户信息</text>
+			<view class="tabs-item" :class="stepNum === 0 ? 'active' : ''">
+				<text class="iconfont icon-1_round_solid"></text> <text>账户信息</text>
 			</view>
-			<view class="tabs-item line">
-				<text class="iconfont icon-hr"></text>
-			</view>	
-			<view class="tabs-item" :class="stepNum === 1 ? 'active' : '' ">
-				<text class="iconfont icon-2_round_solid"></text>
-				<text>机构信息</text>
+			<view class="tabs-item line"> <text class="iconfont icon-hr"></text> </view>
+			<view class="tabs-item" :class="stepNum === 1 ? 'active' : ''">
+				<text class="iconfont icon-2_round_solid"></text> <text>机构信息</text>
 			</view>
 		</view>
-		<view class="register-main clearfix" v-if="stepNum  === 0">
+		<view class="register-main clearfix" v-if="stepNum === 0">
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">手机号:</view>
@@ -82,7 +78,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="register-main clearfix" v-if="stepNum  === 1">
+		<view class="register-main clearfix last" v-if="stepNum === 1">
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label"><text>*</text>联系人</view>
@@ -119,15 +115,9 @@
 				</view>
 			</view>
 			<view class="register-row text-textarea clearfix">
-				<view
-					class="textarea"
-					v-if="isShowInput"
-					placeholder-class="placeholder"
-					@click="showTextareaFocus"
-					>{{
-						params.address ? params.address : '详细地址：如道路、门牌号、小区等'
-					}}</view
-				>
+				<view class="textarea" v-if="isShowInput" placeholder-class="placeholder" @click="showTextareaFocus">{{
+					params.address ? params.address : '详细地址：如道路、门牌号、小区等'
+				}}</view>
 				<textarea
 					v-else
 					class="textarea"
@@ -147,11 +137,14 @@
 					<view class="label"><text>*</text>营业执照</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="!params.businessLicense" @click="uploadFileImage(1)">
-							<text class="iconfont icon-shangchuantupian"></text>
-							<text>选择图片</text>
+							<text class="iconfont icon-shangchuantupian"></text> <text>选择图片</text>
 						</view>
 						<view class="upload-image" v-else>
-							<image :src="params.businessLicense" mode="" @click="handleViewImage(params.businessLicense)"></image>
+							<image
+								:src="params.businessLicense"
+								mode=""
+								@click="handleViewImage(params.businessLicense)"
+							></image>
 							<view class="upload-del" @click="handleDelete(1)">
 								<text class="iconfont icon-shanchu"></text>
 							</view>
@@ -163,12 +156,15 @@
 				<view class="register-picture">
 					<view class="label"><text>*</text>医疗执业许可证</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="!params.medicalPracticeLicense"  @click="uploadFileImage(3)">
-							<text class="iconfont icon-shangchuantupian"></text>
-							<text>选择图片</text>
+						<view class="upload-none" v-if="!params.medicalPracticeLicense" @click="uploadFileImage(3)">
+							<text class="iconfont icon-shangchuantupian"></text> <text>选择图片</text>
 						</view>
 						<view class="upload-image" v-else>
-							<image :src="params.medicalPracticeLicense" mode="" @click="handleViewImage(params.medicalPracticeLicense)"></image>
+							<image
+								:src="params.medicalPracticeLicense"
+								mode=""
+								@click="handleViewImage(params.medicalPracticeLicense)"
+							></image>
 							<view class="upload-del" @click="handleDelete(3)">
 								<text class="iconfont icon-shanchu"></text>
 							</view>
@@ -176,11 +172,21 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row ">
+			<view class="register-row fixed">
+				<view class="register-agree" @tap.stop="handleAgreeCheck">
+					<text class="checkbox iconfont" :class="[isCheck ? 'icon-yixuanze' : 'icon-weixuanze']"></text>
+					勾选代表阅读并同意
+					<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1045&title=用户协议')"
+						>《用户协议》</text
+					>和
+					<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1046&title=隐私权政策')"
+						>《隐私权政策》</text
+					>
+				</view>
 				<view class="register-btn sub" @click.stop="handleConfirm">提交审核</view>
 				<view class="register-btn sub none" @click.stop="handleStep(0)">上一步</view>
 			</view>
-		</view>	
+		</view>
 		<!-- 地址  -->
 		<mpvue-city-picker
 			:themeColor="themeColor"
@@ -188,10 +194,9 @@
 			:pickerValueDefault="cityPickerValueDefault"
 			@onCancel="onCancel"
 			@onConfirm="onConfirm"
-		>
-		</mpvue-city-picker>
+		/>
 		<!-- 提交审核提示弹窗 -->
-		<tui-modal :show="modal1" @cancel="modal1 = false" :custom="true" fadeIn >
+		<tui-modal :show="modal1" @cancel="modal1 = false" :custom="true" fadeIn>
 			<view class="tui-modal-custom">
 				<view class="tui-prompt-title">提交成功！</view>
 				<view class="tui-modal-custom-text">您的资料将会在1-3个工作日内进行审核，审核通过后才能进行采购。</view>
@@ -209,8 +214,7 @@
 			:size="32"
 			shape="circle"
 			:maskClosable="false"
-		>
-		</tui-modal>
+		/>
 	</view>
 </template>
 
@@ -235,8 +239,8 @@ export default {
 				textLeft: this.$store.state.isIphone
 			},
 			isPreviewImage: false, // 预览图片开关
-			modal1:false, // 提交弹窗控制
-			modal:false,
+			modal1: false, // 提交弹窗控制
+			modal: false,
 			modalButton: [
 				{
 					text: '取消',
@@ -252,7 +256,7 @@ export default {
 					plain: false
 				}
 			],
-			stepNum:0,
+			stepNum: 0,
 			textareaFocus: false,
 			isMobileDisabled: false, //手机验证码按钮控制
 			mobilCount: '', //倒计时
@@ -266,25 +270,27 @@ export default {
 				avatarUrl: '',
 				nickName: '',
 				unionId: '',
-				name:'',
+				name: '',
 				provinceId: '',
 				cityId: '',
-				townId:'',
+				townId: '',
 				address: '',
-				organizeType:1, //外部商城机构类型 0内部机构 1外部机构
-				shopPhoto:'',
-				businessLicense:'',
-				medicalPracticeLicense:'',
+				isAgreed: 0,
+				organizeType: 1, //外部商城机构类型 0内部机构 1外部机构
+				shopPhoto: '',
+				businessLicense: '',
+				medicalPracticeLicense: ''
 			},
-			codeParams:{
+			codeParams: {
 				mobile: '',
 				isCheckCaptcha: 1,
 				activateCodeType: 8,
 				platformType: 2
 			},
-			handleAddress:'请选择机构所在地区',
-			isCheckedCode:false,
-			isSubLoading:false
+			handleAddress: '请选择机构所在地区',
+			isCheckedCode: false,
+			isSubLoading: false,
+			isCheck: false //是否勾选协议
 		}
 	},
 	onLoad(option) {},
@@ -297,16 +303,16 @@ export default {
 		handleStep(step) {
 			this.stepNum = step
 		},
-		async handleCheckRegist(){
-			if(this.isCheckedCode){
+		async handleCheckRegist() {
+			if (this.isCheckedCode) {
 				this.stepNum = 1
-			}else{
-				try{
+			} else {
+				try {
 					this.handleCheck()
 					await this.UserService.checkRegisterClub(this.params)
 					this.isCheckedCode = true
 					this.stepNum = 1
-				}catch(error){
+				} catch (error) {
 					this.$util.msg(error.msg, 2000)
 				}
 			}
@@ -344,11 +350,12 @@ export default {
 				this.$util.msg('两次输入的密码不一致', 2000)
 				return
 			}
-			
 		},
-		handleConfirm(){
+		handleConfirm() {
 			// 提交审核
-			if(this.isSubLoading) { return }
+			if (this.isSubLoading) {
+				return
+			}
 			if (this.params.name == '') {
 				this.$util.msg('请输入机构名称', 2000)
 				return
@@ -364,11 +371,15 @@ export default {
 			if (this.params.businessLicense == '') {
 				this.$util.msg('请上传营业执照', 2000)
 				return
-			}	
+			}
 			if (this.params.medicalPracticeLicense == '') {
 				this.$util.msg('请上传医疗执业许可证', 2000)
 				return
 			}
+			if (this.params.isAgreed == 0) {
+				this.$util.msg('请勾选同意协议', 2000)
+				return
+			}
 			this.params.unionId = uni.getStorageSync('unionId')
 			this.userProfile()
 		},
@@ -392,13 +403,13 @@ export default {
 		},
 		async userAccountRegister(params) {
 			// 注册
-			try{
+			try {
 				this.isSubLoading = true
 				await this.UserService.userAccountRegister(params)
 				wxLogin.wxLoginAuthorize()
 				this.isSubLoading = false
 				this.modal1 = true
-			}catch(error){
+			} catch (error) {
 				this.$util.msg(error.msg, 2000)
 				this.isSubLoading = false
 			}
@@ -421,9 +432,9 @@ export default {
 			this.codeParams.mobile = this.params.bindMobile
 			this.getMobileCode(this.codeParams)
 		},
-		async getMobileCode(params){
+		async getMobileCode(params) {
 			//获取短信
-			try{
+			try {
 				this.isMobileDisabled = true
 				await this.PublicService.GetRegisterMobileCode(params)
 				this.$util.msg('验证短信已发送', 2000)
@@ -433,7 +444,7 @@ export default {
 					this.isMobileDisabled = true
 					this.mobilTime = setInterval(() => {
 						if (this.mobilCount > 1 && this.mobilCount <= TIME_COUNT) {
-					this.mobilCount--
+							this.mobilCount--
 							this.mobileCodeText = this.mobilCount + 's重新发送'
 						} else {
 							this.isMobileDisabled = false
@@ -443,7 +454,7 @@ export default {
 						}
 					}, 1000)
 				}
-			}catch(error){
+			} catch (error) {
 				this.$util.msg(error.msg, 2000)
 				this.isMobileDisabled = false
 			}
@@ -474,25 +485,24 @@ export default {
 			this.textareaFocus = false
 		},
 		//上传
-		async uploadFileImage(type){
-			try{
+		async uploadFileImage(type) {
+			try {
 				const res = await uploadFileImage()
 				const data = JSON.parse(res.data).data
-				switch (type){
+				switch (type) {
 					case 1:
 						this.params.businessLicense = data
-						break;
+						break
 					case 2:
 						this.params.shopPhoto = data
-						break;
+						break
 					case 3:
 						this.params.medicalPracticeLicense = data
-						break;
+						break
 				}
-			}catch(error){
-				console.log('error',error)
+			} catch (error) {
+				console.log('error', error)
 			}
-			
 		},
 		//预览
 		handleViewImage(url) {
@@ -503,26 +513,33 @@ export default {
 				urls: mentuzArray,
 				current: 0
 			})
-			
 		},
 		//删除
-		handleDelete(type){
-			switch (type){
+		handleDelete(type) {
+			switch (type) {
 				case 1:
 					this.$util.modal('', '确定删除营业执照图片吗？', '确定', '取消', true, () => {
 						this.params.businessLicense = ''
 					})
-					break;
+					break
 				case 2:
 					this.$util.modal('', '确定删除门头照图片吗？', '确定', '取消', true, () => {
 						this.params.shopPhoto = ''
 					})
-					break;
+					break
 				case 3:
 					this.$util.modal('', '确定删除资质图片吗？', '确定', '取消', true, () => {
 						this.params.medicalPracticeLicense = ''
 					})
-					break;
+					break
+			}
+		},
+		handleAgreeCheck() {
+			this.isCheck = !this.isCheck
+			if (this.isCheck) {
+				this.params.isAgreed = 1
+			} else {
+				this.params.isAgreed = 0
 			}
 		},
 		handleClick(e) {
@@ -532,10 +549,10 @@ export default {
 			}
 			this.modal = false
 		},
-		handleClick1(){
-			setTimeout(()=>{
+		handleClick1() {
+			setTimeout(() => {
 				this.$api.switchTabTo('/pages/tabBar/user/user')
-			},1000)
+			}, 1000)
 		}
 	},
 	onShow() {
@@ -553,28 +570,28 @@ export default {
 	height: 100%;
 	box-sizing: border-box;
 	background-size: contain;
-	.register-tabs{
+	.register-tabs {
 		width: 100%;
 		height: 40rpx;
 		box-sizing: border-box;
-		padding:0 160rpx;
+		padding: 0 160rpx;
 		margin: 110rpx 0 40rpx 0;
-		.tabs-item{
+		.tabs-item {
 			float: left;
 			line-height: 40rpx;
 			font-size: $font-size-30;
-			color: #B2B2B2;
-			.iconfont{
+			color: #b2b2b2;
+			.iconfont {
 				font-size: 40rpx;
 			}
-			&.active{
+			&.active {
 				color: $color-system;
 			}
-			&.line{
+			&.line {
 				width: 50rpx;
 				height: 40rpx;
 				margin: 0 20rpx;
-				.iconfont{
+				.iconfont {
 					font-size: 58rpx;
 				}
 			}
@@ -584,6 +601,9 @@ export default {
 		width: 100%;
 		height: auto;
 		position: relative;
+		&.last {
+			padding-bottom: 366rpx;
+		}
 		.register-consult {
 			width: 110rpx;
 			height: 68rpx;
@@ -619,6 +639,14 @@ export default {
 			padding: 0 24rpx;
 			margin-bottom: 30rpx;
 			box-sizing: border-box;
+			&.fixed {
+				position: fixed;
+				bottom: 0;
+				left: 0;
+				z-index: 999;
+				background-color: #ffffff;
+				padding: 24rpx;
+			}
 			&.none {
 				margin-bottom: 0;
 			}
@@ -634,8 +662,8 @@ export default {
 					color: #666666;
 					line-height: 80rpx;
 					float: left;
-					text{
-						color: #F85050;
+					text {
+						color: #f85050;
 					}
 				}
 				.row-input {
@@ -702,7 +730,7 @@ export default {
 				.textarea {
 					width: 100%;
 					height: 120rpx;
-					padding:24rpx 0 ;
+					padding: 24rpx 0;
 					font-size: $font-size-28;
 					color: $text-color;
 					z-index: 1;
@@ -715,6 +743,23 @@ export default {
 					color: #999999;
 				}
 			}
+			.register-agree {
+				text-align: center;
+				.checkbox {
+					margin: 0 6rpx 0 0;
+					color: #999999;
+					font-size: $font-size-26;
+					&.icon-yixuanze {
+						color: $color-system;
+					}
+				}
+				font-size: $font-size-22;
+				line-height: 44rpx;
+				color: #999999;
+				text {
+					color: #1890f9;
+				}
+			}
 		}
 		.register-picture {
 			width: 100%;
@@ -727,8 +772,8 @@ export default {
 				line-height: 80rpx;
 				width: 100%;
 				text-align: left;
-				text{
-					color: #F85050;
+				text {
+					color: #f85050;
 				}
 			}
 			.upload-picture {
@@ -737,14 +782,14 @@ export default {
 				.upload-none {
 					width: 210rpx;
 					height: 210rpx;
-					border: 1px dashed #B2B2B2;
+					border: 1px dashed #b2b2b2;
 					border-radius: 10rpx;
 					display: flex;
 					justify-content: center;
 					flex-direction: column;
 					align-items: center;
 					font-size: $font-size-28;
-					color: #B2B2B2;
+					color: #b2b2b2;
 					line-height: 50rpx;
 					.iconfont {
 						font-size: $font-size-28;
@@ -771,7 +816,7 @@ export default {
 						text-align: center;
 						.iconfont {
 							font-size: $font-size-40;
-							color: #F85050;
+							color: #f85050;
 						}
 					}
 				}
@@ -802,11 +847,11 @@ export default {
 			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #ffffff;
-			margin: 40rpx auto;
+			margin: 24rpx auto;
 			text-align: center;
 			background: $btn-confirm;
 			&.none {
-				background: #FFF4E6;
+				background: #fff4e6;
 				color: $color-system;
 				margin-top: 0;
 			}
@@ -847,7 +892,7 @@ export default {
 			color: #666666;
 			text-align: justify;
 			.red {
-				color: #F3B574;
+				color: #f3b574;
 			}
 		}
 		.tui-alert-btn {
@@ -873,12 +918,12 @@ export default {
 	padding: 30rpx 0 50rpx;
 }
 
-.tui-button-custom{
+.tui-button-custom {
 	width: 420rpx;
 	height: 84rpx;
 	line-height: 84rpx;
 	text-align: center;
-	color: #FFFFFF;
+	color: #ffffff;
 	background: $btn-confirm;
 	font-size: $font-size-28;
 	margin: 15rpx auto;

pages/service/service.vue

@@ -0,0 +1,38 @@
+<template>
+	<view class="container clearfix rich-text-temp">
+		<rich-text-template ref="childTemplate"></rich-text-template>
+	</view>
+</template>
+
+<script>
+	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
+	
+	export default{
+		components: {
+		   richTextTemplate
+		},
+		data() {
+			return{
+				
+			}
+		},
+		onLoad(option){
+			this.initData(option)
+		},
+		methods:{
+			initData(option){
+				uni.setNavigationBarTitle({title:option.title})
+				this.PublicService.getProtocol({helpPageId:option.id}).then(response =>{
+					let data =response.data.content
+					this.$refs.childTemplate.html = this.$api.adaptRichTextImg(data)
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/tabBar/user/user.vue

@@ -499,9 +499,9 @@ page {
 		text-align: center;
 		position: absolute;
 		right: 24rpx;
-		top: 0;
+		top: 20rpx;
 		.iconfont {
-			font-size: 32rpx;
+			font-size: 36rpx;
 			color: #fff;
 		}
 	}

pages/user/setting/protocol.vue

@@ -0,0 +1,94 @@
+<template>
+	<view class="container clearfix">
+		<view class="foot-list">
+			<view class="list-cell-item">
+				<view class="list-cell" @click="navigator('/pages/service/service?id=1045&title=用户协议')" hover-class="cell-hover" :hover-stay-time="50">
+					<text class="cell-tit">用户协议</text>
+					<text class="cell-more iconfont icon-xiangyou"></text>
+				</view>
+				<view class="list-cell" @click="navigator('/pages/service/service?id=1046&title=隐私权政策')" hover-class="cell-hover" :hover-stay-time="50">
+					<text class="cell-tit">隐私权政策</text>
+					<text class="cell-more iconfont icon-xiangyou"></text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad(option) {
+			
+		},
+		methods:{
+			navigator(url){
+				this.$api.navigateTo(url)
+			}
+		},
+		onShow() {}
+	}
+</script>
+
+<style lang='scss'>
+	page {
+		height: auto;
+	}
+	page,.container{
+		/* padding-bottom: 120upx; */
+		background: #fff;
+		/* border-top: 1px solid #EBEBEB; */
+	}
+	.foot-list{
+		width: 100%;
+		margin-top: 30rpx;
+	}	
+	.list-cell-item{
+		width: 702rpx;
+		height: auto;
+		margin-bottom: 24rpx;
+		padding:0 24rpx;
+		background: $bg-color;
+	}
+	.list-cell{
+		display:flex;
+		width: 100%;
+		align-items:baseline;
+		line-height:100rpx;
+		position:relative;
+		background: $bg-color;
+		justify-content: center;
+		border-bottom: 1px solid #EBEBEB;
+		&.cell-hover{
+			background:#fafafa;
+		}
+		.cell-more{
+			align-self: baseline;
+			font-size:$font-size-28;
+			color:#b2b2b2;
+			margin-left:10rpx;
+			.txt{
+				color: #999999;
+				padding-right: 10rpx;
+			}
+		}
+		.cell-tit{
+			flex: 1;
+			font-size: $font-size-28;
+			color: #666666;
+			margin-right:10rpx;
+		}
+		.cell-tip{
+			font-size: $font-size-28;
+			color: $text-color;
+		}
+	}	
+	.list-cell.last{
+		border-bottom: none;
+	}
+</style>
+

pages/user/setting/setting.vue

@@ -9,11 +9,17 @@
 						<text class="iconfont icon-xiangyou"></text>
 					</text>
 				</view>
-				<view class="list-cell" @click="navigator('/pages/login/password')" hover-class="cell-hover" :hover-stay-time="50">
+				<view class="list-cell none" @click="navigator('/pages/login/password')" hover-class="cell-hover" :hover-stay-time="50">
 					<text class="cell-tit">修改密码</text>
 					<text class="cell-more iconfont icon-xiangyou"></text>
 				</view>
 			</view>
+			<view class="list-cell-item last">
+				<view class="list-cell" @click="navigator('/pages/user/setting/protocol')" hover-class="cell-hover" :hover-stay-time="50">
+					<text class="cell-tit">用户协议</text>
+					<text class="cell-more iconfont icon-xiangyou"></text>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -64,9 +70,11 @@
 	.list-cell-item{
 		width: 702rpx;
 		height: auto;
-		margin-bottom: 24rpx;
 		padding:0 24rpx;
 		background: $bg-color;
+		&.last{
+			border-top: 20rpx solid #F7F7F7;
+		}
 	}
 	.list-cell{
 		display:flex;
@@ -77,6 +85,9 @@
 		background: $bg-color;
 		justify-content: center;
 		border-bottom: 1px solid #EBEBEB;
+		&.none{
+			border-bottom: none;
+		}
 		&.cell-hover{
 			background:#fafafa;
 		}

services/public.service.js

@@ -9,10 +9,10 @@ export default class PublicService {
     /**
 	 * 获取地址
 	 */
-    GetAllAddressData (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/order/address/select/all', 
-            data, 
+    GetAllAddressData(data = {}) {
+        return this.AjaxService.get({
+            url: '/order/address/select/all',
+            data,
             isLoading: false,
         })
     }
@@ -20,34 +20,34 @@ export default class PublicService {
 	 * 获取图形验证码
 	 * platformType:小程序 2  WWW 0  CRM 1 
 	 */
-    GetImgVerifyCode (data = {platformType:2}) {
-        return this.AjaxService.get({ 
-            url:'/user/captcha', 
-            data, 
+    GetImgVerifyCode(data = { platformType: 2 }) {
+        return this.AjaxService.get({
+            url: '/user/captcha',
+            data,
             isLoading: true,
-			  
+
         })
     }
     /**
 	 * 获取图形验证码
 	 * activateCodeType:机构 2  供应商 3 找回密码 1 
 	 */
-    GetMobileCode (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/user/activateCodeByReg', 
-            data, 
-            isLoading: true 
+    GetMobileCode(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/activateCodeByReg',
+            data,
+            isLoading: true
         })
     }
     /**
 	 * 获取图形验证码
 	 * activateCodeType:机构 2  供应商 3 找回密码 1 
 	 */
-    GetMobileCode (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/user/activateCodeByReg', 
-            data, 
-            isLoading: true 
+    GetMobileCode(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/activateCodeByReg',
+            data,
+            isLoading: true
         })
     }
     /**
@@ -59,12 +59,12 @@ export default class PublicService {
 	 * token            图片验证码token
 	 * platformType: 	来源：0:www，1:crm/h5，2:小程序
 	 */
-    GetRegisterMobileCode (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/user/sms/code', 
-            data, 
+    GetRegisterMobileCode(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/sms/code',
+            data,
             isLoading: true,
-			  
+
         })
     }
     /**
@@ -72,12 +72,12 @@ export default class PublicService {
 	 * email 	邮箱
 	 * status	1:绑定邮箱,2邮箱注册,3邮箱找回秘密
 	 */
-    GetUserEmailCode (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/user/mail/code', 
-            data, 
+    GetUserEmailCode(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/mail/code',
+            data,
             isLoading: true,
-			  
+
         })
     }
     /**
@@ -90,12 +90,22 @@ export default class PublicService {
 	 * token            图片验证码token
 	 * platformType: 	来源：0:www，1:crm/h5，2:小程序
 	 */
-    GetBindMobileCode (data = {}) {
+    GetBindMobileCode(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/sms/bind',
+            data,
+            isLoading: true,
+
+        })
+    }
+    /**
+	 * 协议
+	 */
+    getProtocol(data) {
         return this.AjaxService.get({ 
-            url:'/user/sms/bind', 
+            url: '/user/center/protocol', 
             data, 
-            isLoading: true,
-			  
+            isLoading: true ,
         })
     }
-}	
+}