【bug】 样式修改

pages/companyList/companyList.wxss

@@ -73,14 +73,15 @@ page {
 /* 新建企业  */
 .create-company {
   width: 100%;
-  position: relative;
+  position: fixed;
-  height: 80rpx;
+  height: 100rpx;
   line-height: 50rpx;
   text-align: center;
   border-top: 1px solid #eee;
-  padding: 20rpx;
+  padding: 20rpx 20rpx 40rpx 20px;
   box-sizing: border-box;
   bottom: 0;
+  background-color: #fff;
 }
 .bg-f5 {
   background-color: #f5f5f5;

pages/home/home.wxml

@@ -78,12 +78,19 @@
       <view class="title">{{clickItem.currentTarget.dataset.message.titile_dictText}}</view>
       <!-- rich-text 会解析html模板中的html标签 -->
       <view>     <rich-text nodes="{{content}}"></rich-text></view>
-      <text wx:if="{{signUpBool}}" style="color:#069f99" bindtap="goSignUpPage"> 去报名 </text>
     </view>
-    <view class="modal-footer">
+    <!-- 普通消息的显示 -->
+    <view class="modal-footer" wx:if="{{!signUpBool}}">
       <view class="btn-cancel" bindtap="hideModal" data-status="cancel">我知道了</view>
       <image src="../../assets/images/close.png" class="close-img" bindtap="hideModal"></image>
     </view>
+
+    <!-- 会议报名的显示这个 -->
+    <view class="modal-footer" wx:if="{{signUpBool}}">
+      <view  class="btn-cancel-meeting"  bindtap="goSignUpPage">去报名</view>
+      <view class="sing-up-meeting" bindtap="hideModal" data-status="cancel">我知道了</view>
+      <image src="../../assets/images/close.png" class="close-img" bindtap="hideModal"></image>
+    </view>
   </view>
 
 </view>

pages/home/home.wxss

@@ -195,6 +195,24 @@ page{
   text-align: center;
   border-right: 1px solid #dedede;
 }
+.btn-cancel-meeting {
+  width: 45%;
+  color: #fff;
+  border-radius: 10rpx;
+  background: #069F99;
+  text-align: center;
+  float: left;
+  border-right: 1px solid #dedede;
+}
+.sing-up-meeting {
+  width: 45%;
+  color: #000;
+  border-radius: 10rpx;
+  /* background: #069F99; */
+  float: right;
+  text-align: center;
+  border: 1px solid #dedede;
+}
 .modal-img {
   position: relative;
 }

pages/login/login.js

@@ -34,7 +34,7 @@ Page({
         if (res.success) {
           this.countDown()
           wx.showToast({
-            title: '发送成功',
+            title: '发送成功' + res.result,
             icon: 'none',
             duration: 2000
           })

pages/meetingDetailSigned/meetingDetailSigned.js

@@ -289,7 +289,7 @@ Page({
   },
   // 报名
   joinMeeting(e){
-    
+    const that = this
     // 如果是去报名页面需要在缓存中存储会议信息 当报名结束后 需要清除缓存中的当前会议信息 meetingSignUpType 1 可报名 2报名
     let meetingItem = this.data.meetingInfo
     if (meetingItem.meetingSignUpType === 1) {
@@ -300,14 +300,14 @@ Page({
       })
       wx.setStorage({
         key: "currentMeetingInfo",
-        data: this.data.meetingInfo,
+        data: that.data.meetingInfo,
         success() {
           // 国际研讨会去国际研讨会的报名页面
           if (meetingItem.meetingType !== 3) {
             wx.navigateTo({
               url: `../signUpPage/signUpPage?type=indexMsg`
             })
-          } else if (meetingItem.meetingSignUpType === 2) {
+          } else {
             wx.navigateTo({
               url: `../signUpPageGuoji/signUpPageGuoji`
             })
@@ -324,7 +324,7 @@ Page({
 
     // 获取上一个页面的会议数据
     const meetingInfo = JSON.parse(options.meetingInfo)
-    console.log(meetingInfo);
+ 
     const that = this
     this.setData({
       paymentQrCodeSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + meetingInfo.paymentQrCode

pages/meetingDetailSigned/meetingDetailSigned.wxml

@@ -118,8 +118,7 @@
 		wx:if="{{!(meetingInfo.meetingType == '3' && singInPersonInfo.identity === 1)}}">
 		<view class="title to-signup">
 			<text>报名信息</text>
-			<!-- 不需要花钱的会议、打包的会议 报名完显示  花钱的会议 现场缴费需要审核凭证通过显示 汇款的报完名显示 -->
+
-			<view style="color:#069f99" bindtap="toSignUp" wx:if="{{showSignInBtn}}">去签到</view>
 		</view>
 		<view>
 			<text>参会单位</text>
@@ -470,10 +469,17 @@
 
 	</view>
 	<!-- 会议状态未可报名 并且会议类型是未开始 或者进行中  -->
-	<view class="join-meeting" wx:if="{{meetingInfo.meetingSignUpType === 1 && (meetingInfo.meetingStatus === 2 || eetingInfo.meetingStatus === 3)}}">
+	<view class="join-meeting" wx:if="{{meetingInfo.meetingSignUpType === 1 && (meetingInfo.meetingStatus === 2 || meetingInfo.meetingStatus === 3)}}">
 	<text bindtap='joinMeeting'>报名</text>
 	</view>
 
+	<view class="join-meeting"  wx:if="{{showSignInBtn}}">
+ 				<!-- 不需要花钱的会议、打包的会议 报名完显示  花钱的会议 现场缴费需要审核凭证通过显示 汇款的报完名显示 -->
+				 <text bindtap="toSignUp">去签到</text>
+	</view>
+
+
+
 	<!-- 缴费凭证 begin -->
 	<view class="payment-record" wx:if="{{singInPersonInfo.payMode === 2 ||  singInPersonInfo.payMode === 1}}">
 		<view class="p-20">

pages/mine/mine.wxml

@@ -46,13 +46,13 @@
           </view>
           <image src="../../assets/images/more.png"></image>
         </view>
-        <view class="list-item" bindtap="mineData">
+        <!-- <view class="list-item" bindtap="mineData">
           <view class="item-title">
             <image src="../../assets/images/data.png"></image>
             <text>我的资料</text>
           </view>
           <image src="../../assets/images/more.png"></image>
-        </view>
+        </view> -->
         <view class="list-item" bindtap="mineContract">
           <view class="item-title">
             <image src="../../assets/images/contract.png"></image>

pages/personList/personList.wxss

@@ -66,14 +66,15 @@
 /* 新建企业  */
 .create-company {
   width: 100%;
-  position: relative;
+  position: fixed;
-  height: 80rpx;
+  height: 100rpx;
   line-height: 50rpx;
   text-align: center;
   border-top: 1px solid #eee;
-  padding: 20rpx;
+  padding: 20rpx 20rpx 40rpx 20px;
   box-sizing: border-box;
   bottom: 0;
+  background-color: #fff;
 }
 .bg-f5 {
   background-color: #f5f5f5;