Merge branch 'master' of https://gitee.com/beiwu/jobslink-user-clent

common/textdata.js

@@ -13,7 +13,7 @@ const companyList = [{
     },
     {
         missionNo: "1",
-        missionTitle: "石家庄环卫清洁",
+        missionTitle: "环卫清洁",
         wage: 1000,
         wageUnitCategory: 1,
         companyName: "用工单位",

pageMy/federation/forMembership/forBook.vue

@@ -25,7 +25,7 @@
 			return{
 				password: false,
 				maxlength: 6,
-				content: '我自愿加入石家庄新业态职工工会联合会，遵守工会章程，执行工会决议，积极参加工会活动，为把我国建设成为富强、民主、文明的社会主义国家而努力奋斗。'
+				content: ''
 			}
 		},
 		

pageMy/federation/forMembership/perfectXin.vue

@@ -60,9 +60,7 @@
 		
 		<view class="checkbox" :class="{'active': checkedValue}" @click="change">
 			<img v-if="checkedValue" src="../../static/img/federation/checkOk.png" alt="" style="width: 30rpx;height:30rpx;margin-right:12rpx;">
-			<view v-else class="checkBoxView"></view>
-			我申请加入石家庄新业态职工工会联合会
-		</view>
+			<view v-else class="checkBoxView"></view></view>
 		
 		<view class="nextBtn" :class="{'nextBtnActive': checkedValue}" @click="submit">
 			下一步
@@ -115,7 +113,7 @@
 			submit(){
 				if(!this.checkedValue) {
 					uni.showToast({
-						title: '请先勾选申请加入石家庄新业态职工工会联合会',
+						title: '',
 						icon: 'none'
 					})
 					return

pageMy/federation/vip/information.vue

@@ -45,7 +45,7 @@
 			return {
 				maskShow: false,
 				labourUnion: {},
-				content: '我自愿加入石家庄新业态职工工会联合会，遵守工会章程，执行工会决议，积极参加工会活动，为把我国建设成为富强、民主、文明的社会主义国家而努力奋斗。'
+				content: ''
 			}
 		},
 		components:{uniMask},