Merge branch 'master' of http://121.37.83.100:3000/sooka_edyj/sooka_edyj_minapp

app.json

@@ -33,9 +33,8 @@
     "pages/warehouselist/details/warehouse_details",
     "pages/material/serch/material_serch",
     "pages/warehouselist/serch/warehouse_serch",
-    "pages/teamlist/serch/team_serch"
- 
-  
+    "pages/teamlist/serch/team_serch",
+    "pages/maillist/maillist"
   ],
   "requiredPrivateInfos": [
     "getLocation"
@@ -75,6 +74,5 @@
   "style": "v2",
   "sitemapLocation": "sitemap.json",
   "lazyCodeLoading": "requiredComponents",
-  "onReachBottomDistance":50
-
+  "onReachBottomDistance": 50
 }

app.wxss

@@ -67,7 +67,10 @@ page{
   /* 列表 */
   .list_vi{
     margin: 40rpx 30rpx 20rpx 30rpx;
-    height:101vh;
+    /* height:101vh; */
+  }
+  .list_vi2{
+    margin: 40rpx 30rpx 20rpx 30rpx;
   }
   .list_vi .list_li{
     display: flex;
@@ -280,4 +283,36 @@ flex-direction: column;
 .notice_tit .icon-dian{
   font-size: 38rpx;
   color: #f94b0e;
+}
+
+/* 通讯录列表 */
+.list_li4{
+  display: flex;
+  flex-direction:row ;
+  height: 130rpx;
+  justify-content: center;
+  align-items: center;
+}
+.list_li4 .txl_img .iconfont{
+  font-size: 100rpx;
+  color: #fff1e8;
+}
+.list_li4 .txl_txt{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  border-bottom: 1px solid #f7f7f7;
+  width: 100%;
+  padding-left: 5rpx;
+  height: 100%;
+}
+.list_li4 .txl_txt text{
+  font-size: 34rpx;
+  font-weight: 500;
+  color: #181818;
+  padding-bottom: 10rpx;
+}
+.list_li4 .txl_txt i{
+  font-size: 32rpx;
+  color: #666;
 }

iconfont.wxss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3264694 */
-  src: url('//at.alicdn.com/t/c/font_3264694_dnngszco0u.woff2?t=1673329063637') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3264694_dnngszco0u.woff?t=1673329063637') format('woff'),
-       url('//at.alicdn.com/t/c/font_3264694_dnngszco0u.ttf?t=1673329063637') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3264694_c16807h1x3f.woff2?t=1673399002024') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3264694_c16807h1x3f.woff?t=1673399002024') format('woff'),
+       url('//at.alicdn.com/t/c/font_3264694_c16807h1x3f.ttf?t=1673399002024') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yonghutouxiang:before {
+  content: "\e606";
+}
+
 .icon-route-fill:before {
   content: "\e680";
 }

pages/maillist/maillist.js

@@ -0,0 +1,66 @@
+// pages/maillist.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/maillist/maillist.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "通讯录"
+}

pages/maillist/maillist.wxml

@@ -0,0 +1,42 @@
+<!--pages/maillist.wxml-->
+<view class="container">
+  <!-- 搜索 -->
+  <view class="search-container">
+    <view class="search-left">
+      <input type="text" bindinput="searchEnterprise" placeholder="搜索" />
+    </view>
+    <button bindtap="bindViewSearchEnd" class="search-right">
+      <text class="iconfont icon-sousuo"></text>
+    </button>
+  </view>
+
+  <!-- 列表 -->
+  <view class="list_vi2">
+    <view class="list_li4" >
+      <view class="txl_img"><i class="iconfont icon-yonghutouxiang"></i></view>
+      <view class="txl_txt">
+        <text>艾庆志</text>
+        <i>15956566666</i>
+      </view>
+    </view>
+    <view class="list_li4" >
+      <view class="txl_img"><i class="iconfont icon-yonghutouxiang"></i></view>
+      <view class="txl_txt">
+        <text>卜志楼</text>
+        <i>15956566666</i>
+      </view>
+    </view>
+    <view class="list_li4" >
+      <view class="txl_img"><i class="iconfont icon-yonghutouxiang"></i></view>
+      <view class="txl_txt">
+        <text>陈玲玲</text>
+        <i>15956566666</i>
+      </view>
+    </view>
+
+  </view>
+
+
+
+
+</view>

pages/maillist/maillist.wxss

@@ -0,0 +1 @@
+/* pages/maillist.wxss */

pages/me/me.js

@@ -71,6 +71,11 @@ bindViewClear(){
     }
   })
 },
+GoMailList(){
+  wx.navigateTo({
+    url: '../maillist/maillist',
+  })
+},
 
 clear(){
   wx.clearStorage({

pages/me/me.wxml

@@ -16,7 +16,7 @@
 <view class="me_tit">
   
 
-  <view class="tit_one" wx:if="{{isBindSuccess}}" >
+  <view class="tit_one" wx:if="{{isBindSuccess}}" bindtap="GoMailList">
     <image src="../images/metit1.png" class="metit" />
     <view class="meline">
       <i class="iconfont icon-tongxunlu"></i>

pages/notice/notice_details.wxml

@@ -18,8 +18,9 @@
 
       
       <view class="notice_new">
-        <span>内容：</span>
-        <i>{{noticeContent}}</i>
+        <!-- <span>内容：</span> -->
+        <!-- <i>{{noticeContent}}</i> -->
+        <rich-text space="nbsp" nodes="{{noticeContent}}"></rich-text>
       </view>
 
 </view>