艰难得改了一部分

components/subComponents/dmMine.vue

@@ -4,24 +4,24 @@
 			<image class="img_head" v-if="userInfo.head" :src="userInfo.head" mode=""></image>
 			<image class="img_head" v-else src="../../static/icons/icon_default_head.png" mode=""></image>
 			<view class="item_info">
-				<text class="info_title">用户名</text>
-				<text class="info_name">{{userInfo.name||'-'}}</text>
+				<text class="info_title" :style="{color:contentColor}">用户名</text>
+				<text class="info_name" :style="{color:titleColor}">{{userInfo.name||'-'}}</text>
 			</view>
 			<view class="item_info">
-				<text class="info_title">性别</text>
-				<text class="info_name">{{userInfo.sex||'-'}}</text>
+				<text class="info_title" :style="{color:contentColor}">性别</text>
+				<text class="info_name" :style="{color:titleColor}">{{userInfo.sex||'-'}}</text>
 			</view>
 			<view class="item_info">
-				<text class="info_title">手机</text>
-				<text class="info_name">{{userInfo.phone||'-'}}</text>
+				<text class="info_title" :style="{color:contentColor}">手机</text>
+				<text class="info_name" :style="{color:titleColor}">{{userInfo.phone||'-'}}</text>
 			</view>
 			<view class="item_info">
-				<text class="info_title">证件号</text>
-				<text class="info_name">{{userInfo.cardNo||'-'}}</text>
+				<text class="info_title" :style="{color:contentColor}">证件号</text>
+				<text class="info_name" :style="{color:titleColor}">{{userInfo.cardNo||'-'}}</text>
 			</view>
 			<view class="item_info">
-				<text class="info_title">房间信息</text>
-				<text class="info_name">{{userInfo.room||'-'}}</text>
+				<text class="info_title" :style="{color:contentColor}">房间信息</text>
+				<text class="info_name" :style="{color:titleColor}">{{userInfo.room||'-'}}</text>
 			</view>
 			
 		</view>
@@ -48,11 +48,13 @@
 				"cardNo":"",
 				"phone":"",
 				"room":"",
-				"sex":""
+				"sex":"",
 			}
 		},
 		data(){
 			return {
+				contentColor:"",
+				titleColor:"",
 			}
 		},
 		methods:{
@@ -65,7 +67,8 @@
 			
 		},
 		mounted() {
-			
+			this.titleColor = getApp().globalData.titleColor;
+			this.contentColor = getApp().globalData.contentColor;
 		},
 		
 		components:{

components/subComponents/dmWithDrawal.vue

@@ -2,19 +2,19 @@
 	<dmDialog ref='popView' :isShowTitle="true" title="提现" :isShowClose="true" :isShowConfirm="false" marginSize="60rpx">
 		<view class="content">
 			<view class="report_title">
-				<text class="report_title_">提现到：</text>
+				<text class="report_title_" :style="{color:titleColor}">提现到：</text>
 				<image class="icon_weichart" src="../../static/icons/icon_weichat.png" mode=""></image>
 				<text class="report_title_money">微信零钱</text>
 			</view>
 			<view class="withDrawal_content">
-				<view class="report_title_">
+				<view class="report_title_" :style="{color:titleColor}">
 					提现金额
 				</view>
-				<view class="report_title_desc">
+				<view class="report_title_desc" :style="{color:contentColor}">
 					（可提现金额￥{{canCashOut||'0.00'}}）
 				</view>
 			</view>
-			<view class="input_money">
+			<view class="input_money" :style="{color:titleColor}">
 				<text class="money_bz">￥</text>
 				<input class="money" type="digit" v-model="money" @input="onKeyInput" :maxlength="moneyMaxLeng"/>
 				<image class="icon_close" v-if="money" src="../../static/icons/icon_close_full.png" mode="" @click="clearMoney"></image>
@@ -23,13 +23,13 @@
 				
 			</view>
 			<text class="notice_red" v-if="Number(money)>Number(canCashOut)">输入金额超过可提现金额</text>
-			<text class="notice" v-else>单笔限额200元</text>
+			<text class="notice" :style="{color:contentColor}" v-else>单笔限额200元</text>
 			<view class="btn">
 				<view class="btn_cancel" @click="cancel">
 					取消
 				</view>
 				
-				<view class="btn_confirm" @click="confirmWithDrawal">
+				<view class="btn_confirm" @click="confirmWithDrawal" :style="{background:color1}">
 					确认提现
 				</view>
 			</view>
@@ -48,7 +48,10 @@
 		data(){
 			return {
 				moneyMaxLeng:11,
-				money:""
+				money:"",
+				titleColor:"",
+				contentColor:"",
+				color1:"",
 			}
 		},
 		methods:{
@@ -114,7 +117,9 @@
 			}
 		},
 		mounted() {
-			
+			this.titleColor = getApp().globalData.titleColor;
+			this.contentColor = getApp().globalData.contentColor;
+			this.color1 = getApp().globalData.color1;
 		},
 		components:{
 			dmDialog

components/subComponents/dmWithDrawalRecord.vue

@@ -2,30 +2,30 @@
 	<dmDialog ref='popView' :isShowTitle="true" title="提现记录" :isShowClose="true" :isShowConfirm="false" >
 		<view class="content">
 			<view class="report_title">
-				<text class="report_title_">累计提现</text>
-				<text class="report_title_money">￥{{alreadyCashOut||'0.00'}}</text>
+				<text class="report_title_" :style="{color:contentColor}">累计提现</text>
+				<text class="report_title_money" :style="{color:color2}">￥{{alreadyCashOut||'0.00'}}</text>
 			</view>
 			<view class="withDrawal" v-if="recordList.length>0">
 				<view class="withDrawal_title">
-					<view class="title_item">
+					<view class="title_item" :style="{color:contentColor}">
 						提现金额
 					</view>
-					<view class="title_item">
+					<view class="title_item" :style="{color:contentColor}">
 						提现时间
 					</view>
-					<view class="title_item">
+					<view class="title_item" :style="{color:contentColor}">
 						提现结果
 					</view>
-					<view class="title_item">
+					<view class="title_item" :style="{color:contentColor}">
 						微信到账时间
 					</view>
 				</view>
 				 <scroll-view class="scroll-view"  :scroll-y="true" @scrolltolower="loadMore">
 					 <view class="withDrawal_content" v-for="(item,index) in recordList" :key='item.orderNo'>
-					 	<view class="withDrawal_item">
+					 	<view class="withDrawal_item" :style="{color:titleColor}">
 					 		￥{{item.amount}}
 					 	</view>
-					 	<view class="withDrawal_item">
+					 	<view class="withDrawal_item" :style="{color:titleColor}">
 					 		{{item.applyTime}}
 					 	</view>
 						<view class="withDrawal_item" v-if="item.cashStatus">
@@ -42,7 +42,7 @@
 						<view class="withDrawal_item" v-else>
 	
 						</view>
-					 	<view class="withDrawal_item">
+					 	<view class="withDrawal_item" :style="{color:titleColor}">
 					 		{{item.cashTime}}
 					 	</view>
 					 </view>
@@ -74,6 +74,9 @@
 				total:0,
 				pageNo:1,
 				pageSize:10,
+				titleColor:"",
+				contentColor:"",
+				color2:"",
 			}
 		},
 		methods:{
@@ -112,7 +115,9 @@
 			}
 		},
 		mounted() {
-			
+			this.titleColor = getApp().globalData.titleColor;
+			this.contentColor = getApp().globalData.contentColor;
+			this.color2 = getApp().globalData.color2;
 		},
 		components:{
 			dmDialog

pages/homePage/homePage.vue

@@ -64,9 +64,9 @@
 		<view class="content_body" :style="{background:color4}">
 			<view class="content_beginner_guide" v-if="showGuide">
 				<view class="title">
-					<text class="title_txt">- 新手引导 -</text>
+					<text class="title_txt" :style="{color:contentColor}">- 新手引导 -</text>
 					<view class="title_right">
-						<text class="title_right_txt" @click="upLoadView(false)">收起</text>
+						<text class="title_right_txt" :style="{color:contentColor}" @click="upLoadView(false)">收起</text>
 						<image class="title_right_cion" src="https://dm.static.elab-plus.com/yezhu/icon_shouqi.png"
 							mode=""></image>
 					</view>
@@ -76,67 +76,67 @@
 					<view class="item_guide">
 						<image class="guide_img" src="https://dm.static.elab-plus.com/yezhu/icon_yezhu.png" mode="">
 						</image>
-						<text class="guide_title" @click="clearToken">业主认证</text>
-						<text class="guide_desc">业主认证审核\n实时等级升级</text>
+						<text class="guide_title" :style="{color:titleColor}" @click="clearToken">业主认证</text>
+						<text class="guide_desc" :style="{color:contentColor}">业主认证审核\n实时等级升级</text>
 					</view>
 					<image class="icon_guide" src="https://dm.static.elab-plus.com/yezhu/icon_to_guide.png" mode="">
 					</image>
 					<view class="item_guide">
 						<image class="guide_img" style="width: 72rpx;height: 72rpx;margin-top: 5rpx;"
 							src="https://dm.static.elab-plus.com/yezhu/icon_pyq.png" mode=""></image>
-						<text class="guide_title">分享项目</text>
-						<text class="guide_desc">分享到朋友圈\n自动计算收益</text>
+						<text class="guide_title" :style="{color:titleColor}">分享项目</text>
+						<text class="guide_desc" :style="{color:contentColor}">分享到朋友圈\n自动计算收益</text>
 					</view>
 					<image class="icon_guide" src="https://dm.static.elab-plus.com/yezhu/icon_to_guide.png" mode="">
 					</image>
 					<view class="item_guide">
 						<image class="guide_img" style="width: 58rpx;height: 68rpx;margin-top: 9rpx;"
 							src="https://dm.static.elab-plus.com/yezhu/icon_yz_money.png" mode=""></image>
-						<text class="guide_title">提现到微信</text>
-						<text class="guide_desc">实时查看收益\n快速提现到账</text>
+						<text class="guide_title" :style="{color:titleColor}">提现到微信</text>
+						<text class="guide_desc" :style="{color:contentColor}">实时查看收益\n快速提现到账</text>
 					</view>
 				</view>
 
 			</view>
 			<view class="content_beginner_guide_" v-else @click="upLoadView(true)">
-				<text class="title_txt">展开新手引导</text>
+				<text class="title_txt" :style="{color:contentColor}">展开新手引导</text>
 				<image class="title_right_cion" src="../../static/icons/icon_down_.png"
 					mode=""></image>
 			</view>
 			<view class="content_tab">
 				<view class="tab_item" @click="toYezhu">
 					<image class="icon_tab"  src="../../static/icons/icon_zcyz_user.png" mode=""></image>
-					<text class="txt_tab">业主认证</text>
+					<text class="txt_tab" :style="{color:titleColor}">业主认证</text>
 				</view>
 				<view class="tab_item" @click="toShouYiPage">
 					<image class="icon_tab" src="../../static/icons/icon_shouyi_user.png" mode=""></image>
-					<text class="txt_tab">收益排行榜</text>
+					<text class="txt_tab" :style="{color:titleColor}">收益排行榜</text>
 				</view>
 				<view class="tab_item" @click="goReportPage">
 					<image class="icon_tab" src="../../static/icons/icon_report_user.png" mode=""></image>
-					<text class="txt_tab">效果报表</text>
+					<text class="txt_tab" :style="{color:titleColor}">效果报表</text>
 				</view>
 				<view class="tab_item" @click="showMine">
 					<image class="icon_tab" src="../../static/icons/icon_user_mine.png" mode=""></image>
-					<text class="txt_tab">我的信息</text>
+					<text class="txt_tab" :style="{color:titleColor}">我的信息</text>
 				</view>
 			</view>
 			<view class="content_tuiguang" v-if="userInfo.userId">
 				<view class="content_tuiguang_city">
-					<view class="city_num"><countTo :startVal='0' :endVal='Number(userInfo.taskCount)' :duration='3000'></countTo>个</view>
-					<text class="city_num_desc">推广任务</text>
+					<view class="city_num" :style="{color:titleColor}"><countTo :startVal='0' :endVal='Number(userInfo.taskCount)' :duration='3000'></countTo>个</view>
+					<text class="city_num_desc" :style="{color:contentColor}">推广任务</text>
 					<view class="city_list" @click="showOptions(1)">
-						<text class="city_name">{{city}}</text>
+						<text class="city_name" :style="{color:titleColor}">{{city}}</text>
 						<image class="city_more" src="https://dm.static.elab-plus.com/yezhu/icon_ios_back%402x.png"
 							mode=""></image>
 					</view>
 			
 				</view>
 				<view class="content_tuiguang_money"> 
-					<view class="money_num"> ￥<countTo :startVal='0' :decimals='2' :endVal='Number(userInfo.surplusTaskAmount)' :duration='1000'></countTo></view>
-					<text class="money_num_des">剩余任务金额</text>
+					<view class="money_num" :style="{color:color2}"> ￥<countTo :startVal='0' :decimals='2' :endVal='Number(userInfo.surplusTaskAmount)' :duration='1000'></countTo></view>
+					<text class="money_num_des" :style="{color:contentColor}">剩余任务金额</text>
 					<view class="money_list" @click="showOptions(2)">
-						<text class="money_name" >{{typeName}}</text>
+						<text class="money_name" :style="{color:titleColor}">{{typeName}}</text>
 						<image class="money_more" src="https://dm.static.elab-plus.com/yezhu/icon_ios_back%402x.png"
 							mode=""></image>
 					</view>
@@ -161,7 +161,7 @@
 				</view>
 			</view>
 			<view class="content_list">
-				<view class="content_title">
+				<view class="content_title" :style="{color:titleColor}">
 					<view class="content_title_poi">
 					</view>
 					任务列表
@@ -184,24 +184,24 @@
 					<view class="list_item" @click="goDetailAction(item,1)">
 						<image class="house_img" :src="item.image" mode="aspectFill"></image>
 						<view class="item_content" >
-							<text class="house_name">{{item.name}}</text>
-							<view class="house_hk" v-if="item.taskCategory">
-								<text class="house_hk_" v-for="(item1,index1) in item.taskCategory" :key='index1'>{{item1.category}} ¥{{item1.unitPrice}}/人</text>
+							<text class="house_name" :style="{color:titleColor}">{{item.name}}</text>
+							<view class="house_hk" :style="{color:color2}" v-if="item.taskCategory">
+								<text class="house_hk_"  v-for="(item1,index1) in item.taskCategory" :key='index1'>{{item1.category}} ¥{{item1.unitPrice}}/人</text>
 							</view>
 							<text class="house_hk" v-else></text>
 							<view class="house_address">
 								<image src="https://dm.static.elab-plus.com/yezhu/icon_location.png" mode=""></image>
-								<text style="width: 100%;">{{item.city}} · {{item.minPrice}}-{{item.maxPrice}}元/m²  {{item.bizFormat?'· '+item.bizFormat:''}}</text>
+								<text style="width: 100%;" :style="{color:contentColor}">{{item.city}} · {{item.minPrice}}-{{item.maxPrice}}元/m²  {{item.bizFormat?'· '+item.bizFormat:''}}</text>
 							</view>
 							<view class="house_num">
 								<image src="https://dm.static.elab-plus.com/yezhu/icon_family.png" mode=""></image>
-								<text style="width: 100%;">{{item.projectLayout}}</text>
+								<text style="width: 100%;" :style="{color:contentColor}">{{item.projectLayout}}</text>
 							</view>
-							<text class="house_desc">{{item.taskEndTime}}</text>
+							<text class="house_desc" :style="{color:contentColor}">{{item.taskEndTime}}</text>
 						</view>
 					</view>
 					
-					<view class="item_share" @click="toShareCard(item.projectId,2)">
+					<view class="item_share" :style="{background:color1}" @click="toShareCard(item.projectId,2)">
 						<image class="icon_share" src="https://dm.static.elab-plus.com/yezhu/icon_small_share.png"
 							mode=""></image>
 						<text class="icon_text">分享</text>
@@ -209,7 +209,7 @@
 					<view class="item_bg"></view>
 				</view>
 				
-				<view class="com_noMore_text" v-if="noMore && houseList.length > 0">没有更多了</view>
+				<view class="com_noMore_text" :style="{color:contentColor}" v-if="noMore && houseList.length > 0">没有更多了</view>
 				
 				<view class="empty" v-if="houseList.length == 0">
 					<image class="emptyImg" src="https://dm.static.elab-plus.com/yezhu/h5/icon_empty.png" mode=""></image>
@@ -238,6 +238,10 @@
 		data() {
 			return {
 				color4: '#F5F5F7',
+				color2:"",
+				color1:"",
+				contentColor:"",
+				titleColor:"",
 				houseList: [],
 				userId: "",
 				token: "",
@@ -285,6 +289,10 @@
 			})
 			this.isFirst = true
 			this.color4 = app.globalData.color4;
+			this.color2 = app.globalData.color2;
+			this.color1 = app.globalData.color1;
+			this.contentColor = app.globalData.contentColor;
+			this.titleColor = app.globalData.titleColor;
 			this.getData();
 			uni.$on("request",()=>{
 				this.getData();
@@ -719,7 +727,6 @@
 						font-family: FontName, FontName-Regular;
 						font-weight: 400;
 						text-align: left;
-						color: #b1b1b1;
 						position: absolute;
 						left: 50%;
 						top: 30rpx;
@@ -1083,7 +1090,6 @@
 							font-family: Verdana, Verdana-Bold;
 							font-weight: 700;
 							text-align: left;
-							color: #262626;
 							margin-top: 20rpx;
 							text-overflow: ellipsis;
 							overflow: hidden;
@@ -1096,7 +1102,6 @@
 							font-family: Verdana, Verdana-Regular;
 							font-weight: 400;
 							text-align: left;
-							color: #fd8f3c;
 							margin-top: 8rpx;
 							.house_hk_{
 								margin-right: 10rpx;
@@ -1166,7 +1171,6 @@
 							font-family: Verdana, Verdana-Regular;
 							font-weight: 400;
 							text-align: left;
-							color: #b1b1b1;
 							margin-bottom: 20rpx;
 							word-break:break-all;
 						}
@@ -1178,7 +1182,6 @@
 						flex-direction: column;
 						width: 70rpx;
 						height: 100rpx;
-						background: #f07423;
 						border-radius: 12rpx;
 						position: absolute;
 						right: 0;

pages/ownerCertification/ownerCertification.vue

@@ -5,9 +5,9 @@
 				
 			</view>
 			<view class="user_item">
-				<text class="item_name">姓名</text>
+				<text class="item_name" :style="{color:titleColor}">姓名</text>
 				<view class="item_right">
-					<input placeholder-class="item_right_name_placeholder" class="item_right_name" type="text" v-model="name" @input="onKeyYHKNameInput" placeholder="请输入姓名" @blur='inputName' @confirm='inputName'/>
+					<input placeholder-class="item_right_name_placeholder" :style="{color:titleColor}" class="item_right_name" type="text" v-model="name" @input="onKeyYHKNameInput" placeholder="请输入姓名" @blur='inputName' @confirm='inputName'/>
 					<image class="icon_right" src="../../static/icons/icon_right_yezhu.png" mode=""></image>
 				</view>
 			</view>
@@ -15,9 +15,9 @@
 				
 			</view>
 			<view class="user_item">
-				<text class="item_name">性别</text>
+				<text class="item_name" :style="{color:titleColor}">性别</text>
 				<view class="item_right" @click="showGender">
-					<input placeholder-class="item_right_name_placeholder" class="item_right_name" type="text" :value="genderStr" placeholder="请选择" disabled/>
+					<input placeholder-class="item_right_name_placeholder" :style="{color:titleColor}" class="item_right_name" type="text" :value="genderStr" placeholder="请选择" disabled/>
 				<image class="icon_right" src="../../static/icons/icon_right_yezhu.png" mode=""></image>
 				</view>
 			</view>
@@ -25,11 +25,11 @@
 				
 			</view>
 			<view class="user_item">
-				<text class="item_name">手机号</text>
+				<text class="item_name" :style="{color:titleColor}">手机号</text>
 				<view class="item_right">
-					<input v-if="mobileOld" placeholder-class="item_right_name_placeholder" type='number' maxlength="11"  class="item_right_name" style="color: #b1b1b1;" :value="mobileOld" disabled/>
-					<input v-else placeholder-class="item_right_name_placeholder" type='number' maxlength="11" style="width: calc(100% - 150rpx);" class="item_right_name" :value="mobile" placeholder="请输入" @blur='inputMobile' @confirm='inputMobile'/>
-					<view class="veritify" @click="getVeritify" v-if="!mobileOld">
+					<input v-if="mobileOld"  placeholder-class="item_right_name_placeholder" type='number' maxlength="11"  class="item_right_name" style="color: #b1b1b1;" :value="mobileOld" disabled/>
+					<input v-else placeholder-class="item_right_name_placeholder" type='number' maxlength="11" style="width: calc(100% - 150rpx);" :style="{color:titleColor}" class="item_right_name" :value="mobile" placeholder="请输入" @blur='inputMobile' @confirm='inputMobile'/>
+					<view class="veritify" @click="getVeritify" v-if="!mobileOld"  :style="{color:color1}">
 						{{veritifyTxt}}
 					</view>
 					<image v-if="mobileOld" class="icon_right" src="../../static/icons/icon_right_yezhu.png" mode=""></image>
@@ -37,9 +37,9 @@
 			</view>
 			
 			<view class="user_item" v-if="!mobileOld&&showInputVerifity">
-				<text class="item_name">验证码</text>
+				<text class="item_name" :style="{color:titleColor}">验证码</text>
 				<view class="item_right">
-					<input placeholder-class="item_right_name_placeholder" class="item_right_name" type="text" :value="verifity" placeholder="请输入" @blur='inputVerifity' @confirm='inputVerifity'/>
+					<input placeholder-class="item_right_name_placeholder" :style="{color:titleColor}" class="item_right_name" type="text" :value="verifity" placeholder="请输入" @blur='inputVerifity' @confirm='inputVerifity'/>
 					<image class="icon_right" src="../../static/icons/icon_right_yezhu.png" mode=""></image>
 				</view>
 			</view>
@@ -49,9 +49,9 @@
 				
 			</view>
 			<view class="user_item">
-				<text class="item_name">认证项目</text>
+				<text class="item_name" :style="{color:titleColor}">认证项目</text>
 				<view class="item_right" @click="chooseHouse">
-					<input placeholder-class="item_right_name_placeholder" class="item_right_name" type="text" :value="houseName" placeholder="请选择" disabled/>
+					<input placeholder-class="item_right_name_placeholder"  :style="{color:titleColor}" class="item_right_name" type="text" :value="houseName" placeholder="请选择" disabled/>
 					<image class="icon_right" src="../../static/icons/icon_right_yezhu.png" mode=""></image>
 				</view>
 			</view>
@@ -59,9 +59,9 @@
 				
 			</view>
 			<view class="user_item">
-				<text class="item_name">证件类型</text>
+				<text class="item_name" :style="{color:titleColor}">证件类型</text>
 				<view class="item_right" @click="chooseCertificateType">
-					<input placeholder-class="item_right_name_placeholder" class="item_right_name" type="text" :value="certificateTypeStr" placeholder="请选择" disabled/>
+					<input placeholder-class="item_right_name_placeholder" :style="{color:titleColor}" class="item_right_name" type="text" :value="certificateTypeStr" placeholder="请选择" disabled/>
 				<image class="icon_right" src="../../static/icons/icon_right_yezhu.png" mode=""></image>
 				</view>
 			</view>
@@ -69,9 +69,9 @@
 				
 			</view>
 			<view class="user_item">
-				<text class="item_name">证件号</text>
+				<text class="item_name" :style="{color:titleColor}">证件号</text>
 				<view class="item_right">
-					<input placeholder-class="item_right_name_placeholder" class="item_right_name" type="text"  v-model ="certificateNo" placeholder="请输入" @input="idInput"  @blur='inputId' @confirm='inputId'/>
+					<input placeholder-class="item_right_name_placeholder" :style="{color:titleColor}" class="item_right_name" type="text"  v-model ="certificateNo" placeholder="请输入" @input="idInput"  @blur='inputId' @confirm='inputId'/>
 					<image class="icon_right" src="../../static/icons/icon_right_yezhu.png" mode=""></image>
 				</view>
 			</view>
@@ -79,9 +79,9 @@
 				
 			</view>
 			<view class="user_item">
-				<text class="item_name">填写房号</text>
+				<text class="item_name" :style="{color:titleColor}">填写房号</text>
 				<view class="item_right">
-					<input placeholder-class="item_right_name_placeholder" class="item_right_name" type="text" :value="roomNo" placeholder="请输入" @blur='inputRoomNo' @confirm='inputRoomNo'/>
+					<input placeholder-class="item_right_name_placeholder" :style="{color:titleColor}" class="item_right_name" type="text" :value="roomNo" placeholder="请输入" @blur='inputRoomNo' @confirm='inputRoomNo'/>
 					<image class="icon_right" src="../../static/icons/icon_right_yezhu.png" mode=""></image>
 				</view>
 			</view>
@@ -90,9 +90,9 @@
 	    	<image class="icon_selected" @click="agreeXieyi" v-if="agree" src="../../static/icons/icon_yezhu_selected.png" mode=""></image>
 			<image class="icon_selected" @click="agreeXieyi" v-else src="../../static/icons/icon_yezhu_unselected.png" mode=""></image>
 			<text class="tongyi">我已阅读并同意</text>
-			<text class="xieyi_text" @click="showXieyi">《入驻协议》</text>
+			<text class="xieyi_text" :style="{color:color1}" @click="showXieyi">《入驻协议》</text>
 	    </view>
-		<view class="btn_next" @click="toRegist">
+		<view class="btn_next" @click="toRegist" :style="{background:color1}">
 			下一步
 		</view>
 		<dmAgreeement ref='agreement' @agree='agreeXieyi' :url='proviceUrl'></dmAgreeement>
@@ -150,10 +150,14 @@
 				countdownTimes:120,
 				showInputVerifity:true,
 				proviceUrl:"",
+				color1:"",
+				titleColor:""
 			};
 		},
 		onLoad(param) {
 			this.mobileOld = param.mobile;
+			this.color1 = getApp().globalData.color1;
+			this.titleColor = getApp().globalData.titleColor;
 		},
 		created() {
 			this.queryProjectBox();

pages/shareCardPage/shareCardPage.vue

@@ -56,11 +56,12 @@
 			this.page = param.page;
 			this.projectId =param.projectId;
 			this.type=param.type;
-			if(this.projectId){
+			if(this.type==2){
 				this.queryProjectByH5();
 				this.getShareCard();
 			}else {
 				this.queryProtocolConfigView();
+				this.getShareCard();
 			}
 			
 		},
@@ -71,7 +72,6 @@
 					data: {},
 				})
 				if(res.data.success){
-					this.shareUrl = res.data.single.shareImage;
 					this.shareRemark =  res.data.single.shareRemark||''
 				}
 			},