Merge branch 'xieying' of gitadmin/tuoheng_qmhh_web into develop

environment.js

@@ -1,6 +1,6 @@
 const __request_base_url__ = {
-    // develop: "http://192.168.11.11:9061/api",
-    develop: "https://qmhhapi-test.t-aaron.com/api",
+    develop: "http://192.168.11.11:9061/api",
+    // develop: "https://qmhhapi-test.t-aaron.com/api",
     trial: "https://qmhhapi-test.t-aaron.com/api",
     release: "https://qmhh.t-aaron.com/api"
 }

package_first/pages/ProtectionActivity/index.js

@@ -102,7 +102,7 @@ Page({
         }else{
             const data = { openid }
             api_getIsApply(data).then(res=>{
-                entersList[0].isJoin = !!res.data
+                entersList[0].isJoin = res.data == 1 ? true:false
                 this.setData({ entersList })
             })
         }

package_first/pages/VolunteerActivity/index.wxml

@@ -24,6 +24,6 @@
                 </view>
             </view>
         </view>
-    <view class="bottom">- 更多视频 敬请期待 -</view>
+    <view class="bottom">- 更多活动 敬请期待 -</view>
     </view>
 </view>

package_first/pages/VolunteerActivity/index.wxss

@@ -20,7 +20,6 @@
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
-    text-align: center;
 }
 .activity_name{
     width: 300rpx;

package_first/pages/VolunteerDetail/index.wxml

@@ -3,7 +3,7 @@
     <view class="main">
         <rich-text class="content" type="node" style="width:100%; white-space: pre-wrap;word-break: break-all;"  nodes="{{dataSource.content}}"></rich-text>
         <view >
-            <image class="Volunteer_image" src="{{activityInfo.imageUrl}}" mode=""/>
+            <!-- <image class="Volunteer_image" src="{{activityInfo.imageUrl}}" mode=""/> -->
         </view>
         <view class="apply_time">
             <view class="apply">报名时间:</view>

package_mine/pages/noticeDetail/index.wxml

@@ -1,6 +1,6 @@
 <view class="detail__container">
   <view class="detail__title">
-    消息通知
+    系统信息
   </view>
   <view class="detail__time">
     {{ detail.createTime }}