QAQ 陈 4 maanden geleden
bovenliggende
commit
2e11ab42db

+ 3 - 1
app.js

@@ -1,6 +1,7 @@
 // app.js
 const utils = require('/utils/util.js')
 const baseIp= "http://localhost:9747"
+// const baseIp = "http://192.168.0.215:9000/zhsw"  // 根据实际情况调整端口号
 // 图片预览地址
 
 App({
@@ -28,7 +29,7 @@ App({
               dsKey: options.query.deskey
             },
             success(res) {
-      
+              debugger
               wx.hideLoading()
               if (!res.data.code || res.data.code!= "200") {
                 utils.simleInfoWithBack('登录失败,请稍后再试')
@@ -101,6 +102,7 @@ App({
       billList: baseIp+ '/wechat/bill/list', // 首页获取用水量等信息
       accountList: baseIp+ '/wechat/account/list', // 首页获取用水量等信息
       accountUnbind: baseIp+ '/wechat/account/unbind', // 户号解绑方法
+      setDefaultAccount: baseIp+ '/wechat/account/setDefaultAccount', // 设置默认户号
       repairRegistration: baseIp+  '/wechat/registration/repair',//报修登记
       feedback: baseIp+  '/wechat/registration/feedback',//投诉建议
       mineRepair: baseIp+  '/wechat/mine/repair',//报修登记

+ 1 - 23
pages/baoxiuList/baoxiuList.js

@@ -10,7 +10,6 @@ Page({
     imageList: [], // 存储图片路径的数组
     showCustomPreview: false, // 是否显示自定义预览
     currentPreviewImages: [], // 当前预览的图片数组
-    currentPreviewIndex: 0 // 当前预览的图片索引
   },
 
   /**
@@ -27,13 +26,7 @@ Page({
 
   },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-    // 刷新用户信息后再获取列表
-    this.refreshUserAndGetList();
-  },
+
 
   /**
    * 生命周期函数--监听页面隐藏
@@ -202,19 +195,4 @@ Page({
     wx.navigateBack()
   },
 
-  // 添加刷新用户信息并获取列表的方法
-  refreshUserAndGetList() {
-    const _this = this;
-    // 调用全局的获取用户信息方法
-    app.getUserInfo().then(() => {
-      // 用户信息更新后,获取列表数据
-      _this.getNoticeList();
-    }).catch(err => {
-      console.error('获取用户信息失败:', err);
-      wx.showToast({
-        title: '获取用户信息失败',
-        icon: 'none'
-      });
-    });
-  },
 })

+ 1 - 1
pages/baoxiuList/baoxiuList.wxml

@@ -1,4 +1,4 @@
-<view class="container">
+<view class="bxcontainer">
   <!-- 返回按钮 -->
   <view class="custom-nav">
     <view class="fixed-back" bindtap="goBack">←</view>

+ 6 - 7
pages/baoxiuList/baoxiuList.wxss

@@ -1,4 +1,4 @@
-.container {
+.bxcontainer {
   display: flex;
   flex-direction: column;
   height: 100vh;
@@ -17,7 +17,7 @@
   right: 0;
   z-index: 1000;
   padding: 0 20rpx;
-  padding-top: 44px; 
+  padding-top: 88rpx; 
 }
 
 .fixed-back {
@@ -35,9 +35,9 @@
 
 .notice-list {
   width: 100%;
-  height: calc(100vh - 120rpx);
+  /* height: calc(100vh - 120rpx); */
   padding: 20rpx;
-  padding-top: 180rpx; 
+  padding-top: 190rpx; 
   box-sizing: border-box;
 }
 
@@ -53,7 +53,6 @@
 }
 
 .notice-content {
-  flex: 1;
   margin-right: 20rpx;
   margin-bottom: 16rpx;
   width: 90%;
@@ -102,9 +101,9 @@ vertical-align: top;
   flex-direction: column;
   align-items: center;
   position: absolute;
-  right: 30rpx;
+  right: 20rpx;
   top: 30rpx;
-  width: 10%;
+  width: 12%;
 }
 
 .preview-icon {

+ 1 - 1
pages/baoxiudj/baoxiudj.wxml

@@ -10,7 +10,7 @@
   <!-- 第一个卡片:地址、联系人、联系电话 -->
   <view class="bill-card first-card">
     <view class="bill-row">
-      <text>地址</text>
+      <text style="flex: 0 1 30%">地址</text>
       <textarea auto-height='true' class="bill-row-address" value="{{address}}" 
                bindinput="inputAddress" data-field="address" disabled="{{isPreviewMode}}">
       </textarea>

+ 8 - 17
pages/homepage/homepage.js

@@ -100,7 +100,7 @@ Page({
           let data= apiReturnData.data.swNotificationAnnouncementDos.filter(data=>{
             return data.homepageslider=='1';
           });
-      
+
           _this.setData({
             billInfo:{
               totalAmount:apiReturnData.data.duFees,  // 总计应缴
@@ -140,7 +140,7 @@ Page({
     wx.showLoading({
       title: '加载中...',
     });
-    
+
     // 检查token是否存在
     if(!app.globalData.userWxInfo.token){
       wx.hideLoading();
@@ -158,7 +158,7 @@ Page({
       success(res) {
         wx.hideLoading();
         let apiReturnData = res.data;
-        
+
         // 更新页面数据
         _this.setData({
           billInfo: {
@@ -247,10 +247,10 @@ Page({
       amountDue:this.data.billInfo.totalAmount,  // 总计应缴
       balance: this.data.billInfo.balance   // 账户余额
     };
-    
+
     // 编码账单信息并传递到缴费页面
     const billInfoStr = encodeURIComponent(JSON.stringify(billInfo));
-    
+
     wx.navigateTo({
       url: `/pages/lijijiaofei/lijijiaofei?billInfo=${billInfoStr}`
     });
@@ -266,18 +266,9 @@ Page({
   // 跳转到通知详情页面
   goToNoticeDetail: function() {
     const currentNotice = this.data.noticeList[this.data.currentIndex];
-    // 将整个通知对象序列化并编码
-    const noticeData = encodeURIComponent(JSON.stringify({
-      id: currentNotice.id,
-      title: currentNotice.title,
-      content: currentNotice.scrollingcontent,
-      date: currentNotice.date,
-      type: currentNotice.type,
-      source: currentNotice.source
-    }));
 
     wx.navigateTo({
-      url: `/pages/tzxq/tzxq?noticeData=${noticeData}`
+      url: `/pages/tzxq/tzxq?id=${currentNotice.id}`
     });
   },
 
@@ -292,7 +283,7 @@ Page({
     let data= (this.data.noticeList||[]).filter(data=>{
        return data.homepageslider=='1';
      });
-   
+
     const content = data[this.data.currentIndex].scrollingcontent;
     const title = data[this.data.currentIndex].noticetitle;
     // 将系数从0.3减小到0.1以加快滚动速度
@@ -323,7 +314,7 @@ Page({
   // 加载账户和账单信息
   loadAccountInfo: function() {
     const accountInfo = app.globalData.currentAccountInfo || {};
-    
+
     this.setData({
       currentAccountInfo: accountInfo
     });

+ 71 - 19
pages/huhaoguanli/huhaoguanli.js

@@ -10,10 +10,6 @@ Page({
   },
 
   onLoad: function (options) {
-    console.log('页面加载时的全局数据:', {
-      currentAccountInfo: app.globalData.currentAccountInfo,
-      userWxInfo: app.globalData.userWxInfo
-    });
     this.getAccountList();
   },
 
@@ -36,35 +32,28 @@ Page({
       success(res) {
         wx.hideLoading();
         let apiReturnData = res.data;
-        
         // 从全局获取当前账户的信息currentAccountInfo
         const currentUsernumber = app.globalData.currentAccountInfo.usernumber;
-        
-        console.log('当前用户信息:', {
-          currentUsernumber: currentUsernumber,
-          currentAccountInfo: app.globalData.currentAccountInfo
-        });
-        
         _this.setData({
           huHaoList: apiReturnData.data.map(item => {
             const isCurrent = item.usernumber === currentUsernumber;
-            console.log('比较户号:', {
-              itemNumber: item.usernumber,
-              currentNumber: currentUsernumber,
-              isCurrent: isCurrent,
-              username: item.username
-            });
-            
             return {
               ...item,
               isCurrentUser: isCurrent
             };
           })
+        }, () => {
         });
+        debugger
+        
       },
       fail(error) {
         wx.hideLoading();
-        utils.simleInfo('获取数据失败,请稍后再试');
+        console.error('获取列表失败:', error);
+        wx.showToast({
+          title: '获取数据失败,请稍后再试',
+          icon: 'none'
+        });
       }
     });
   },
@@ -205,4 +194,67 @@ Page({
       });
     }, 1500);
   },
+
+  // 设置默认户号
+  setDefaultHuHao: function(e) {
+    const id = e.currentTarget.dataset.id;
+    wx.showModal({
+      title: '提示',
+      content: '是否将此户号设为默认户号?',
+      success: (res) => {
+        debugger
+        if (res.confirm) {
+          this.setDefaultAccount(id);
+        }
+      }
+    });
+  },
+  
+  // 调用设置默认户号接口
+  setDefaultAccount: function(id) {
+    wx.showLoading({
+      title: '设置中...',
+    });
+    const unbindInfo = this.data.huHaoList.filter(item => {
+      return item.id === id;
+    })[0];
+    wx.request({
+      url: app.globalData.interfaceUrls.setDefaultAccount,
+      method: 'POST',
+      data: {
+        account: unbindInfo.usernumber,
+        deKey: unbindInfo.dsKey,
+        refresh: false,
+        otherDsKeys: []
+      },
+      header: {
+        'content-type': 'application/json', // 默认值
+        'token': app.globalData.userWxInfo.token,
+      },
+      success: (res) => {
+        debugger
+        if (res.data.code === "200") {
+          wx.showToast({
+            title: '切换成功',
+            icon: 'success'
+          });
+          this.getAccountList();
+        } else {
+          wx.showToast({
+            title: res.data.msg || '设置失败',
+            icon: 'none'
+          });
+        }
+      },
+      fail: () => {
+        wx.showToast({
+          title: '网络异常',
+          icon: 'none'
+        });
+      },
+      complete: () => {
+        wx.hideLoading();
+      }
+    });
+  },
 }) 

+ 6 - 2
pages/huhaoguanli/huhaoguanli.wxml

@@ -12,7 +12,7 @@
   
   <scroll-view scroll-y="true" class="scroll-area">
     <view class="card-list">
-      <view class="card {{item.isCurrentUser ? 'current-user-card' : ''}}" wx:for="{{huHaoList}}" wx:key="id" bindtap="switchHuHao" data-item="{{item}}">
+      <view class="card {{item.isCurrentUser ? 'current-user-card' : ''}} {{item.defaultAccount == '0' ? 'default-account-card' : ''}}" wx:for="{{huHaoList}}" wx:key="id" bindtap="switchHuHao" data-item="{{item}}">
         <view class="card-inner">
           <image class="card-background" src="/static_file/card.png" mode="aspectFill" />
           <view class="card-header">
@@ -26,7 +26,11 @@
             <text class="address">{{item.address}}</text>
           </view>
           <view class="card-footer">
-            <button class="unbind-btn" bindtap="unbindHuHao" data-id="{{item.id}}">解除绑定</button>
+            <view class="button-group">
+              <button class="unbind-btn" catchtap="unbindHuHao" data-id="{{item.id}}">解除绑定</button>
+              <button class="default-btn" wx:if="{{item.defaultAccount == '1'}}" catchtap="setDefaultHuHao" data-id="{{item.id}}">设为默认</button>
+              <text class="default-tag" wx:if="{{item.defaultAccount == '0'}}" catchtap="switchHuHao" data-item="{{item}}">默认户号</text>
+            </view>
           </view>
         </view>
       </view>

+ 55 - 6
pages/huhaoguanli/huhaoguanli.wxss

@@ -136,16 +136,49 @@
 .card-footer {
   display: flex;
   justify-content: flex-start;
+  align-items: center;
+  margin-top: 20rpx;
+}
+
+.button-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20rpx;
 }
 
 .unbind-btn {
-  height: 64rpx;
-  line-height: 64rpx;
   font-size: 28rpx;
-  color: #fff;
-  background-color: #ff4d4f;
-  border-radius: 32rpx;
-  padding: 0 30rpx;
+  padding: 8rpx 20rpx;
+  background-color: rgba(239, 93, 93, 1);
+  color: rgba(255, 255, 255, 1);
+  border-radius: 30rpx;
+  border: 1px solid #ddd;
+  min-width: auto;
+  line-height: 1.8;
+  margin: 0;
+}
+
+.default-btn {
+  font-size: 28rpx;
+  padding: 8rpx 20rpx;
+  background-color: #f0f8ff;
+  color: #1976d2;
+  border-radius: 30rpx;
+  border: 1px solid #bbdefb;
+  min-width: auto;
+  line-height: 1.8;
+  margin: 0;
+}
+
+.default-tag {
+  font-size: 28rpx;
+  padding: 8rpx 20rpx;
+  background-color: transparent;
+  color: #2e7d32;
+  min-width: auto;
+  border: 1px solid #2e7d32;
+  border-radius: 30rpx;
+  line-height: 1.8;
   margin: 0;
 }
 
@@ -316,3 +349,19 @@
   z-index: 10;
   box-sizing: border-box;
 }
+
+.current-user-card::after {
+  content: "";
+  position: absolute;
+  top: 10rpx;
+  right: 10rpx;
+  width: 40rpx;
+  height: 40rpx;
+  background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="%233580f1"><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41L9 16.17z"/></svg>') no-repeat;
+  background-size: contain;
+  z-index: 10;
+}
+
+.default-account-card {
+  position: relative;
+}

+ 1 - 1
pages/jiaofeiList/jiaofeiList.wxml

@@ -16,7 +16,7 @@
       </view>
       <view class="user-address">
         <image src="/static_file/location.png" class="address-icon"></image>
-        <text>{{userInfo.address}}</text>
+        <text style="flex: 0 1 100%">{{userInfo.address}}</text>
       </view>
     </view>
   </view>

+ 22 - 25
pages/lijijiaofei/lijijiaofei.js

@@ -205,36 +205,33 @@ Page({
   onCustomAmountInput: function(e) {
     let value = e.detail.value;
     
-    // 限制只能输入小数点后两位
-    if (value.indexOf('.') !== -1) {
+    // 只允许数字和小数点,且小数点后最多两位
+    if (value) {
+      // 移除非数字和小数点字符
+      value = value.replace(/[^\d.]/g, '');
+      
+      // 确保只有一个小数点
       const parts = value.split('.');
-      if (parts[1].length > 2) {
+      if (parts.length > 2) {
+        value = parts[0] + '.' + parts.slice(1).join('');
+      }
+      
+      // 限制小数点后最多两位
+      if (parts.length === 2 && parts[1].length > 2) {
         value = parts[0] + '.' + parts[1].substring(0, 2);
       }
-    }
-    
-    // 验证输入是否为有效数字
-    if (value) {
-      const inputAmount = parseFloat(value);
-      if (!isNaN(inputAmount) && inputAmount >= 0) {
-        // 更新实缴金额和自定义金额
-        this.setData({
-          amount: inputAmount,
-          customAmount: value,
-          selectedAmount: null // 取消快捷金额的选中状态
-        });
-      } else {
-        this.setData({
-          customAmount: value
-        });
+      
+      // 限制总长度小于8位(包含小数点)
+      if (value.length > 7) {
+        value = value.substring(0, 7);
       }
-    } else {
-      // 输入框为空时
-      this.setData({
-        customAmount: '',
-        amount: 0
-      });
     }
+    
+    this.setData({
+      customAmount: value,
+      selectedAmount: 0, // 清除其他金额选择
+      amount: value || '0.00' // 更新显示金额
+    });
   },
 
   // 输入框获得焦点

+ 2 - 1
pages/lijijiaofei/lijijiaofei.wxml

@@ -51,7 +51,8 @@
             <text class="yuan-symbol">¥</text>
             <input class="custom-amount-input" type="digit" bindinput="onCustomAmountInput"
                    value="{{customAmount}}" placeholder="自定义金额"
-                   bindfocus="onInputFocus" bindblur="onInputBlur"/>
+                   bindfocus="onInputFocus" bindblur="onInputBlur"
+                   maxlength="9"/>
           </view>
         </view>
       </view>

+ 1 - 1
pages/mine/mine.wxml

@@ -16,7 +16,7 @@
       </view>
       <view class="user-address">
         <image src="/static_file/location.png" class="address-icon"></image>
-        <text>{{userInfo.address}}</text>
+        <text style="flex: 0 1 100%">{{userInfo.address}}</text>
       </view>
     </view>
   </view>

+ 0 - 23
pages/tousujianyiList/tousujianyiList.js

@@ -32,14 +32,6 @@ Page({
     this.getNoticeList()
   },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-    // 刷新用户信息后再获取列表
-    this.refreshUserAndGetList();
-  },
-
   /**
    * 生命周期函数--监听页面隐藏
    */
@@ -211,19 +203,4 @@ Page({
     }
   },
 
-  // 添加刷新用户信息并获取列表的方法
-  refreshUserAndGetList() {
-    const _this = this;
-    // 调用全局的获取用户信息方法
-    app.getUserInfo().then(() => {
-      // 用户信息更新后,获取列表数据
-      _this.getNoticeList();
-    }).catch(err => {
-      console.error('获取用户信息失败:', err);
-      wx.showToast({
-        title: '获取用户信息失败',
-        icon: 'none'
-      });
-    });
-  }
 })

+ 1 - 1
pages/tousujianyiList/tousujianyiList.wxml

@@ -1,4 +1,4 @@
-<view class="container">
+<view class="jfcontainer">
   <!-- 返回按钮 -->
   <view class="custom-nav">
     <view class="fixed-back" bindtap="goBack">←</view>

+ 6 - 6
pages/tousujianyiList/tousujianyiList.wxss

@@ -1,4 +1,4 @@
-.container {
+.jfcontainer {
   display: flex;
   flex-direction: column;
   height: 100vh;
@@ -17,7 +17,7 @@
   right: 0;
   z-index: 1000;
   padding: 0 20rpx;
-  padding-top: 44px; 
+  padding-top: 88rpx; 
 }
 
 .fixed-back {
@@ -35,9 +35,9 @@
 
 .notice-list {
   width: 100%;
-  height: calc(100vh - 120rpx);
+  /* height: calc(100vh - 120rpx); */
   padding: 20rpx;
-  padding-top: 180rpx; 
+  padding-top: 190rpx; 
   box-sizing: border-box;
 }
 
@@ -90,9 +90,9 @@
   flex-direction: column;
   align-items: center;
   position: absolute;
-  right: 30rpx;
+  right: 20rpx;
   top: 30rpx;
-  width: 10%;
+  width: 12%;
 }
 
 .preview-icon {

+ 15 - 15
pages/tzxq/tzxq.js

@@ -3,25 +3,25 @@ Page({
    * 页面的初始数据
    */
   data: {
-    noticeId: '',
-    noticeDetail: null
+    noticeDetail: {}
   },
 
   onLoad: function (options) {
+    const app = getApp();
+    // 如果传入了完整的通知数据,则直接使用
     if (options.noticeData) {
-      try {
-        // 解码并解析传递的数据
-        const noticeData = JSON.parse(decodeURIComponent(options.noticeData));
-        this.setData({
-          noticeId: noticeData.id,
-          noticeDetail: noticeData
-        });
-      } catch (error) {
-        wx.showToast({
-          title: '数据解析失败',
-          icon: 'none'
-        });
-      }
+      this.setData({
+        noticeDetail: JSON.parse(decodeURIComponent(options.noticeData))
+      });
+      return;
+    }
+    
+    // 如果只传入了id,则从全局notices中获取
+    if (options.id) {
+      const noticeDetail = app.globalData.notices.find(notice => notice.id === options.id);
+      this.setData({
+        noticeDetail
+      });
     }
   },
 

+ 20 - 17
pages/tzxq/tzxq.wxml

@@ -10,23 +10,26 @@
     <view class="nav-title">通知公告</view>
   </view>
 
-  <view class="notice-detail-wrapper">
-    <view class="notice-detail">
-      <view class="notice-title">{{noticeDetail.noticetitle}}</view>
-      <!-- 标题下方的分隔线 -->
-      <view class="title-divider"></view>
-      <!-- 通知内容 -->
-      <view class="notice-content">
-        <rich-text nodes="{{noticeDetail.noticecontent}}"></rich-text>
+  <!-- 使用scroll-view包裹通知详情卡片 -->
+  <scroll-view scroll-y="true" class="notice-scroll-view">
+    <view class="notice-detail-wrapper">
+      <view class="notice-detail">
+        <view class="notice-title">{{noticeDetail.noticetitle}}</view>
+        <!-- 标题下方的分隔线 -->
+        <view class="title-divider"></view>
+        <!-- 通知内容 -->
+        <view class="notice-content">
+          <rich-text nodes="{{noticeDetail.noticecontent}}"></rich-text>
+        </view>
+        
+        <!-- 落款和日期放在右下角 -->
+        <view class="notice-footer">
+          <!-- 
+            <view class="notice-signature">{{noticeDetail.source}}</view> 
+            <view class="notice-footer-date">{{noticeDetail.date}}</view>
+          -->
+        </view> 
       </view>
-      
-      <!-- 落款和日期放在右下角 -->
-      <view class="notice-footer">
-        <!-- 
-          <view class="notice-signature">{{noticeDetail.source}}</view> 
-          <view class="notice-footer-date">{{noticeDetail.date}}</view>
-        -->
-      </view> 
     </view>
-  </view>
+  </scroll-view>
 </view> 

+ 30 - 46
pages/tzxq/tzxq.wxss

@@ -48,17 +48,23 @@
   color: #fff;
 }
 
-/* 通知详情卡片样式 */
-.notice-detail-wrapper {
-  position: relative;
-  z-index: 5; /* 确保在背景之上 */
-  margin-top: calc(180rpx + env(safe-area-inset-top)); /* 适配不同顶部安全区域 */
-  padding: 0 30rpx;
-  flex: 1;
+/* 滚动区域样式 */
+.notice-scroll-view {
+  height: calc(100vh - 180rpx - 44px); /* 减去导航栏高度和状态栏高度 */
   width: 100%;
+  position: relative;
+  z-index: 1;
+  margin-top: calc(90rpx + 44px); 
+}
+
+/* 通知详情卡片容器样式 */
+.notice-detail-wrapper {
+  padding: 30rpx;
   box-sizing: border-box;
+  width: 100%;
 }
 
+/* 通知详情卡片样式 */
 .notice-detail {
   background-color: #fff;
   border-radius: 20rpx;
@@ -68,65 +74,43 @@
   box-sizing: border-box;
 }
 
-/* 标题居中 */
+/* 通知标题样式 */
 .notice-title {
-  font-size: 40rpx;
+  font-size: 36rpx;
   font-weight: bold;
-  color: #333;
   text-align: center;
-  margin-bottom: 20rpx;
-  position: relative;
-  word-wrap: break-word;
-  line-height: 1.4;
+  margin-bottom: 30rpx;
 }
 
-/* 标题下方分隔线 */
+/* 标题下方分隔线 */
 .title-divider {
-  width: 90%;
-  height: 4rpx;
-  opacity: 1;
-  margin: 20rpx auto;
-  background-color: rgba(242, 246, 250, 1);
+  height: 2rpx;
+  background-color: #eee;
+  margin: 20rpx 0 30rpx;
 }
 
 /* 通知内容样式 */
 .notice-content {
-  font-size: 32rpx;
-  color: rgba(46, 48, 56, 1);
-  line-height: 1.6;
-  margin-bottom: 60rpx;
-  word-wrap: break-word;
-}
-
-/* rich-text内部的段落也有缩进 */
-.notice-content rich-text {
-  display: block;
-  width: 100%;
-}
-
-/* 确保富文本中的图片自适应 */
-.notice-content rich-text image {
-  max-width: 100% !important;
-  height: auto !important;
+  font-size: 28rpx;
+  line-height: 1.8;
+  color: #333;
+  margin-bottom: 40rpx;
 }
 
-/* 落款和日期放在右下角 */
+/* 通知底部落款样式 */
 .notice-footer {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  margin-top: 40rpx;
+  text-align: right;
+  font-size: 26rpx;
+  color: #666;
+  margin-top: 30rpx;
 }
 
 .notice-signature {
-  font-size: 32rpx;
-  color: #333;
   margin-bottom: 10rpx;
 }
 
 .notice-footer-date {
-  font-size: 28rpx;
-  color: #666;
+  color: #999;
 }
 
 /* 适配小屏设备 */

+ 1 - 1
pages/zhangdanlist/zhangdanlist.wxml

@@ -16,7 +16,7 @@
       </view>
       <view class="user-address">
         <image src="/static_file/location.png" class="address-icon"></image>
-        <text>{{userInfo.address}}</text>
+        <text style="flex: 0 1 100%">{{userInfo.address}}</text>
       </view>
     </view>
   </view>