Merge branch 'yufei' of gitadmin/tuoheng_qmhh_web into develop

package_A/pages/riverDetail/index.wxml

@@ -1,14 +1,40 @@
 <!--package_A/pages/riverDetail/index.wxml-->
 <view class="detail_container">
-    <image class="river_img" data-path="{{dataSource.image}}" bindtap="showPreviewImage" src="{{dataSource.image}}"></image>
-    <view class="river_message">
-        <view class="message_item" wx:for="{{messageList}}" wx:key="index">
-            <text class="item_label">{{item.label}}:</text>
-            <view class="item_value">{{dataSource[item.value] || ''}}{{item.unit}}</view>
+    <!-- 头部 -->
+    <view class="river_head">
+        <image class="head_img" mode="widthFix" src="../../img/river_bg.png"></image>
+        <view class="river_info">
+            <view class="river_name">{{dataSource.name}}</view>
+            <view class="info_item">
+                <text style="color: #7A8AA2;">河道长度：</text>
+                <text>{{dataSource.length}}公里</text>
+            </view>
+            <view class="info_item">
+                <text style="color: #7A8AA2;">起讫位置：</text>
+                <text>{{dataSource.location}}</text>
+            </view>
         </view>
-        <view class="note_box">
-            <text class="item_label">河道简介:</text>
-            <view class="note">{{dataSource.note || ''}}</view>
+    </view>
+    <!-- 详细信息 -->
+    <view class="message_detail">
+        <view class="detail_title">详细信息</view>
+        <view class="message_box">
+            <view class="user_info detail_item">
+                <text style="margin-bottom: 10rpx;">{{dataSource.streamAdminName || ''}}</text>
+                <text style="color: #7D8BA1;">责任河长</text>
+            </view>
+            <view class="user_info detail_item">
+                <text style="margin-bottom: 10rpx;">{{dataSource.mobile || ''}}</text>
+                <text style="color: #7D8BA1;">联系电话</text>
+            </view>
+            <view class="area_info detail_item">
+                <text style="margin-bottom: 10rpx;">{{dataSource.cityArea}}</text>
+                <text style="color: #7D8BA1;">河道区域</text>
+            </view>
+        </view>
+        <view class="river_note">
+            {{dataSource.note || ''}}
         </view>
+        <image class="river_img" mode="widthFix" src="{{dataSource.image}}"></image>
     </view>
 </view>

package_A/pages/riverDetail/index.wxss

@@ -6,50 +6,90 @@
    justify-content: flex-start;
    align-items: flex-start; 
 }
-.river_img {
+.river_head {
+    width: 100%;
+    color: #000000;
+}
+.head_img {
     width: 100%;
-    height: 300rpx;
 }
-.river_message {
+.river_info {
     width: 100%;
-    padding: 20rpx 0;
+    padding: 78rpx 50rpx;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
     align-items: flex-start;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+.river_name {
+    margin-bottom: 50rpx;
+    font-size: 40rpx;
+    font-family: Source Han Sans CN;
+    font-weight: bold;
 }
-.message_item {
+.info_item {
     width: 100%;
-    padding: 20rpx 30rpx;
     display: flex;
-    justify-content: space-between;
-}
-.item_label {
-    width: 170rpx;
-    flex-shrink: 0;
-    font-size: 30rpx;
-    color: #666666;
-}
-.item_value {
-    flex: 1;
-    text-align: end;
-    word-wrap: break-word;
-    word-break: break-all;
+    justify-content: flex-start;
+    align-items: center;
     font-size: 26rpx;
-    color: #333333;
+    margin-bottom: 36rpx;
 }
-.note_box {
+
+.message_detail {
     width: 100%;
-    padding: 20rpx 30rpx;
+    margin-top: -70rpx;
+    padding: 30rpx;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
     align-items: flex-start;
+    background-color: #ffffff;
+    border-top-left-radius: 30rpx;
+    border-top-right-radius: 30rpx;
+}
+.detail_title {
+    margin-bottom: 50rpx;
+    padding-left: 20rpx;
+    border-left: 8rpx solid #0089FF;
+    font-size: 30rpx;
+    font-weight: bold;
+    line-height: 30rpx;
 }
-.note {
+.message_box {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: flex-start;
     font-size: 26rpx;
-    color: #333333;
-    margin-top: 20rpx;
-    text-align: start;
-    word-break: break-all;
+    color: #1A253E;
+}
+.detail_item {
+    padding: 30rpx 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    border: 1rpx solid #0089FF;
+    border-radius: 10rpx;
+    background-color: #F1F9FF;
+    margin-bottom: 20rpx;
+}
+.user_info {
+    width: 48%;
+}
+.area_info {
+    width: 100%;
+}
+.river_note {
+    font-size: 28rpx;
+    color: #1A253E;
+}
+.river_img {
+    width: 100%;
+    border-radius: 10rpx;
 }

package_first/pages/announceList/index.wxml

@@ -4,7 +4,7 @@
         <view class="announ_item" data-item="{{item}}" bindtap="showDetail" wx:for="{{list}}" wx:key="index">
             <view class="announ_info">
                 <text class="title_box">{{item.title}}</text>
-                <text style="color: #0000007F;font-size: 26rpx;">{{item.createTime  || ''}}</text>
+                <text style="color: #5C5C5C;font-size: 26rpx;">{{item.createTime  || ''}}</text>
             </view>
             <image class="announ_img" src="{{item.image}}"></image>
         </view>

package_first/pages/announceList/index.wxss

@@ -2,6 +2,7 @@
 .announ_container {
     width: 100%;
     height: 100vh;
+    padding: 20rpx 30rpx;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
@@ -16,11 +17,12 @@
 .announ_item {
     width: 100%;
     padding: 30rpx;
-    margin-top: 20rpx;
+    margin-bottom: 20rpx;
     background-color: #ffffff;
     display: flex;
     justify-content: space-between;
     align-items: flex-end;
+    border-radius: 4rpx;
 }
 .announ_info {
     width: 450rpx;
@@ -32,16 +34,20 @@
 }
 .title_box {
     width: 100%;
+    display: -webkit-box;
     overflow: hidden;
-    white-space: nowrap;
     text-overflow: ellipsis;
+    word-wrap: break-word;
+    white-space: normal !important;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    font-size: 30rpx;
+    color: title_box;
+    font-weight: bold;
 }
 
 .announ_img {
-    width: 200rpx;
-    height: 150rpx;
-    border-radius: 4rpx;
-}
-.info_box {
-    flex: 1;
+    width: 184rpx;
+    height: 148rpx;
+    border-radius: 6rpx;
 }

package_first/pages/askAdmin/index.wxml

@@ -4,7 +4,7 @@
         <view class="ask_item" data-item="{{item}}" bindtap="showDetail" wx:for="{{list}}" wx:key="index">
             <view class="ask_info">
                 <text class="title_box">{{item.title}}</text>
-                <text style="color: #0000007F;font-size: 26rpx;">{{item.createTime || ''}}</text>
+                <text style="color: #5C5C5C;font-size: 26rpx;">{{item.createTime || ''}}</text>
             </view>
             <image class="ask_img" src="{{item.image}}"></image>
         </view>

package_first/pages/askAdmin/index.wxss

@@ -2,6 +2,7 @@
 .ask_container {
     width: 100%;
     height: 100vh;
+    padding: 20rpx 30rpx;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
@@ -21,6 +22,7 @@
     display: flex;
     justify-content: space-between;
     align-items: flex-end;
+    border-radius: 4rpx;
 }
 .ask_info {
     width: 450rpx;
@@ -32,15 +34,19 @@
 }
 .title_box {
     width: 100%;
+    display: -webkit-box;
     overflow: hidden;
-    white-space: nowrap;
     text-overflow: ellipsis;
+    word-wrap: break-word;
+    white-space: normal !important;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    font-size: 30rpx;
+    color: title_box;
+    font-weight: bold;
 }
 .ask_img {
-    width: 200rpx;
-    height: 150rpx;
-    border-radius: 4rpx;
-}
-.info_box {
-    flex: 1;
+    width: 184rpx;
+    height: 148rpx;
+    border-radius: 6rpx;
 }

pages/mine/index.js

@@ -9,12 +9,12 @@ Page({
     data: {
         userInfo: {}, // 用户授权信息
         list: [
-            {title: '个人信息', type: 'userinfo', path: '/package_mine/pages/userInfo/index'},
-            {title: '护河身份', type: 'myid', path: '/package_mine/pages/myId/index'},
-            // {title: '我的兑换', type: 'exchange', path: '/package_mine/pages/exchange/index'},
-            {title: '河湖问题反馈', type: 'feedback', path: '/package_mine/pages/records/index'},
-            // {title: '我的美拍', type: 'beauty', path: '/package_mine/pages/beauties/index'},
-            {title: '消息通知', type: 'notice', path: '/package_mine/pages/notice/index',showNumbers: true},
+            {title: '个人信息', type: 'userinfo', path: '/package_mine/pages/userInfo/index', info: '修改个人信息'},
+            {title: '护河身份', type: 'myid', path: '/package_mine/pages/myId/index', info: '全民护河 全民参与'},
+        ],
+        otherList: [
+            {title: '河湖问题反馈', type: 'feedback', path: '/package_mine/pages/records/index', info: '问题反馈'},
+            {title: '消息通知', type: 'notice', path: '/package_mine/pages/notice/index',info: '', showNumbers: true},
         ],
         myId: '', // 身份
         integral: 0, // 积分

pages/mine/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {},
   "navigationBarTitleText": "我的",
-  "navigationBarBackgroundColor": "#2C83E4"
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#008CFF"
 }

pages/mine/index.wxml

@@ -3,29 +3,51 @@
     <view class="user_massage">
         <view class="message_box">
             <image class="user_avatar" src="{{userInfo.headimgurl}}"></image>
-            <view class="id_box">
-                <text class="user_name">{{userInfo.nickname}}</text>
+            <view class="approve_box">
+                <view class="id_box">
+                    <text class="user_name">{{userInfo.nickname}}</text>
+                    <view wx:if="{{userInfo.identityName}}" class="approve_btn">{{userInfo.identityName}}</view>
+                </view>
                 <view class="integral">
-                    <text style="color: #ffffff;font-size: 20rpx;">护河积分</text>
-                    <text style="font-size: 40rpx;color: #FFC65E;" bindtap="handlePointDetail">{{userInfo.mallPoints || 0}}</text>
+                    <image style="width: 26rpx;height: 26rpx;margin-right: 10rpx;" src="../../assets/img/gold.png"></image>
+                    <text style="font-size: 24rpx;color: #ffffff;margin-right: 20rpx;" bindtap="handlePointDetail">{{userInfo.mallPoints || 0}}</text>
+                    <text style="color: rgba(255, 255, 255, 0.6);font-size: 24rpx;">护河积分可兑换礼物！快来加入我们吧～</text>
                 </view>
             </view>
         </view>
-        <view class="approve_box">
-            <view wx:if="{{userInfo.identityName}}" class="approve_btn">{{userInfo.identityName}}</view>
-            <view wx:else class="approve_btn" bindtap="goApprove">申请护河身份</view>
-            <text style="color: #ffffff;font-size: 20rpx;">护河积分可兑换礼物！快来加入我们吧</text>
-        </view>
     </view>
     <view class="function_list">
+        <!-- 标题 -->
+        <view class="apply_head" wx:if="{{!userInfo.identityName}}">
+            <view class="item_title">
+                <image style="height: 33rpx;width: 42rpx;margin-right: 20rpx;" src="../../assets/img/apply.png"></image>
+                <view style="font-size: 28rpx;z-index:99;color: #FFFFFF;">申请成为护河身份</view>
+            </view>
+            <view class="apply_btn">立即申请</view>
+        </view>
         <view class="function_item" wx:for="{{list}}" wx:key="index" bindtap="goRecords" data-path="{{item.path}}">
             <view class="item_title">
-                <image style="height: 60rpx;width: 60rpx;margin-right: 20rpx;" src="{{'../../assets/img/'+ item.type +'.png'}}"></image>
-                <view style="font-size: 26rpx;z-index:99">{{item.title}}</view>
+                <image style="height: 40rpx;width: 40rpx;margin-right: 14rpx;" src="{{'../../assets/img/'+ item.type +'.png'}}"></image>
+                <view style="font-size: 30rpx;z-index:99">{{item.title}}</view>
+            </view>
+            <view class="enter_box">
+                <text style="font-size: 26rpx; color: #C6C6C6;margin-top: -2rpx;">{{item.info}}</text>
+                <image style="height: 30rpx;width: 30rpx;margin-left: 20rpx;" src="../../assets/img/more.png"></image>
+            </view>
+        </view>
+    </view>
+    <view class="tag"></view>
+    <view class="function_list">
+        <view class="function_item" wx:for="{{otherList}}" wx:key="index" bindtap="goRecords" data-path="{{item.path}}">
+            <view class="item_title">
+                <image style="height: 40rpx;width: 40rpx;margin-right: 14rpx;" src="{{'../../assets/img/'+ item.type +'.png'}}"></image>
+                <view style="font-size: 30rpx;z-index:99">{{item.title}}</view>
                 <text wx:if="{{item.showNumbers && numbers > 0}}" class="badge">{{numbers > 99 ? '99+' : numbers }}</text>
             </view>
-            <image style="height: 30rpx;width: 30rpx;" src="../../assets/img/more.png"></image>
+            <view class="enter_box">
+                <text style="font-size: 26rpx; color: #C6C6C6;margin-top: -2rpx;">{{item.info}}</text>
+                <image style="height: 30rpx;width: 30rpx;margin-left: 20rpx;" src="../../assets/img/more.png"></image>
+            </view>
         </view>
-
     </view>
 </view>

pages/mine/index.wxss

@@ -2,8 +2,8 @@
 .mine_container {
     width: 100%;
     height: 100vh;
-    padding: 0 30rpx;
-    background: linear-gradient(180deg, #2A82E4 0%, rgba(255,255,255,0) 100%);
+    background: linear-gradient(180deg, #008CFF 0%, #008CFF 21%, rgba(255,255,255,0) 35%);
+    /* background-color: #ffffff; */
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
@@ -11,9 +11,16 @@
 }
 .user_massage {
     width: 100%;
-    padding: 60rpx 40rpx;
+    padding: 60rpx 30rpx;
     display: flex;
-    justify-content: space-between;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: flex-start;
+}
+.approve_box {
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
     align-items: flex-start;
 }
 .message_box {
@@ -22,43 +29,41 @@
     align-items: flex-start;
 }
 .user_avatar {
-    width: 100rpx;
-    height: 100rpx;
-    border-radius: 16rpx;
-    margin-right: 30rpx;
+    width: 86rpx;
+    height: 86rpx;
+    border-radius: 50%;
 }
 .id_box {
     display: flex;
-    flex-direction: column;
     justify-content: flex-start;
-    align-items: flex-start;
+    align-items: center;
 }
 .user_name {
-    width: 170rpx;
-    font-size: 30rpx;
+    max-width: 180rpx;
+    margin-right: 20rpx;
+    font-size: 36rpx;
     color: #ffffff;
-    font-weight: bold;
+    font-weight: 400;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
 }
 .approve_box {
-    margin-left: 20rpx;
+    margin-left: 28rpx;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
-    align-items: center;
+    align-items: flex-start;
 }
 .approve_btn {
-    width: 250rpx;
-    height: 80rpx;
-    padding: 0 20rpx;
-    margin-bottom: 20rpx;
+    width: 173rpx;
+    height: 43rpx;
     text-align: center;
-    line-height: 80rpx;
+    line-height: 43rpx;
     font-size: 24rpx;
     color: #ffffff;
-    background-color: #2A82E4;
+    background-color: rgba(255,255,255,0.2);
+    border: 1rpx solid #ffffff;
     border-radius: 40rpx;
     overflow: hidden;
     white-space: nowrap;
@@ -67,28 +72,48 @@
 .integral {
     margin-top: 20rpx;
     display: flex;
-    flex-direction: column;
     justify-content: flex-start;
-    align-items: flex-start;
+    align-items: center;
 }
 
 .function_list {
     width: 100%;
-    flex: 1;
-    border-radius: 16rpx;
-    background-color: #ffffff;
+    padding: 0 30rpx;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
     align-items: center;
+    overflow: hidden;
+}
+.apply_head {
+    width: 100%;
+    padding: 23rpx 30rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: #0761A8;
+    border-top-left-radius: 20rpx;
+    border-top-right-radius: 20rpx;
+}
+.apply_btn {
+    width: 130rpx;
+    height: 46rpx;
+    line-height: 46rpx;
+    text-align: center;
+    background-color: #FFFFFF;
+    color: #0081FF;
+    font-size: 24rpx;
+    border-radius: 23rpx;
 }
 .function_item {
     width: 100%;
-    padding: 40rpx 60rpx;
+    padding: 33rpx;
     display: flex;
     justify-content: space-between;
     align-items: center;
-    border-bottom: 2rpx solid #eeeeee;
+    color: #626262;
+    background-color: #ffffff;
+
 }
 .item_title {
     display: flex;
@@ -96,6 +121,12 @@
     align-items: center;
 }
 
+.enter_box {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+}
+
 .badge{
     background: #E73F3F;
     border-radius: 10px;
@@ -105,4 +136,9 @@
     position: relative;
     top: -10rpx;
     right: 10rpx;
+}
+.tag {
+    width: 100%;
+    height: 10rpx;
+    background-color: #ededed;
 }

project.private.config.json

@@ -198,15 +198,15 @@
                     "scene": null
                 },
                 {
-                    "name": "",
-                    "pathName": "package_first/pages/videoDetail/index",
-                    "query": "data=%257B%2522id%2522%253A4%252C%2522createUser%2522%253A10%252C%2522createTime%2522%253A%25222023-06-08%252015%253A02%253A47%2522%252C%2522updateUser%2522%253A0%252C%2522updateTime%2522%253Anull%252C%2522mark%2522%253A1%252C%2522tenantId%2522%253A1%252C%2522videoTitle%2522%253A%2522%25E7%25AB%25AF%25E5%258D%2588%25E8%258A%2582%25E7%259A%2584%25E7%2594%25B1%25E6%259D%25A5%2522%252C%2522videoBrief%2522%253A%2522%25E7%25AB%25AF%25E5%258D%2588%25E8%258A%2582%25E5%258D%25B3%25E5%25B0%2586%25E6%259D%25A5%25E4%25B8%25B4%25EF%25BC%258C%25E6%25B2%25B3%25E9%2595%25BF%25E5%2588%25B6%25E6%2595%25B4%25E7%2590%2586%25E4%25BA%2586%25E5%2585%25B3%25E4%25BA%258E%25E7%25AB%25AF%25E5%258D%2588%25E4%25B9%25A0%25E4%25BF%2597%25E7%259A%2584%25E5%25AD%25A6%25E4%25B9%25A0%25E8%25A7%2586%25E9%25A2%2591%2522%252C%2522videoUrl%2522%253A%2522http%253A%252F%252Fvod.play.t-aaron.com%252FcustomerTrans%252Fedc96ea2115a0723a003730956208134%252F3507f116-18899d07d1c-0004-f90c-f2c-7ec68.mp4%2522%252C%2522imageUrl%2522%253A%2522https%253A%252F%252Fimage.t-aaron.com%252Fimagedir%252Fmk6te6rob9s_1686207766029.jpg%2522%252C%2522status%2522%253A0%257D",
+                    "name": "河道详情",
+                    "pathName": "package_A/pages/riverDetail/index",
+                    "query": "data=%7B%22id%22%3A88%2C%22code%22%3A%2281%22%2C%22name%22%3A%22%E4%BA%94%E5%9F%8E%E5%9C%A9%E4%B8%AD%E5%BF%83%E6%B2%9F%22%2C%22provinceCode%22%3A%22320000%22%2C%22cityCode%22%3A%22320100%22%2C%22districtCode%22%3A%22320115%22%2C%22streetCode%22%3A%22320115004000%22%2C%22villageCode%22%3Anull%2C%22streamAdminId%22%3A30%2C%22streamAdminName%22%3A%22%E8%A1%97%E9%81%93%E6%B2%B3%E6%B9%96%E9%95%BF%22%2C%22longitude%22%3A%22119.076515%22%2C%22latitude%22%3A%2231.926426%22%2C%22location%22%3A%22%E6%B1%9F%E5%AE%81%E5%8C%BA%E6%B7%B3%E5%8C%96%E8%A1%97%E9%81%93%E5%90%B4%E9%9F%B5%E8%B7%AF%22%2C%22length%22%3A%221.1%22%2C%22note%22%3Anull%2C%22status%22%3A1%2C%22createUserName%22%3A%22admin%22%2C%22updateUserName%22%3A%22admin%22%2C%22cityArea%22%3A%22%E6%B1%9F%E8%8B%8F%E7%9C%81%E5%8D%97%E4%BA%AC%E5%B8%82%E6%B1%9F%E5%AE%81%E5%8C%BA%E6%B7%B3%E5%8C%96%E8%A1%97%E9%81%93%22%2C%22provinceName%22%3A%22%E6%B1%9F%E8%8B%8F%E7%9C%81%22%2C%22cityName%22%3A%22%E5%8D%97%E4%BA%AC%E5%B8%82%22%2C%22districtName%22%3A%22%E6%B1%9F%E5%AE%81%E5%8C%BA%22%2C%22streetName%22%3A%22%E6%B7%B3%E5%8C%96%E8%A1%97%E9%81%93%22%2C%22villageName%22%3Anull%2C%22createUser%22%3A0%2C%22createTime%22%3A%222022-07-18%2013%3A44%3A19%22%2C%22updateUser%22%3A0%2C%22updateTime%22%3A%222022-11-07%2013%3A41%3A06%22%2C%22mark%22%3A1%2C%22image%22%3A%22https%3A%2F%2Fimage.t-aaron.com%2Fimagedir%2Fg6cqtgjby2m_1658123057918.jpg%22%2C%22streamGisNumber%22%3Anull%2C%22mobile%22%3Anull%7D",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
-                    "name": "护河活动",
-                    "pathName": "package_first/pages/ProtectionActivity/index",
+                    "name": "护河行动",
+                    "pathName": "package_first/pages/announceList/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null