提交

msg/pages/detail/index.wxml

@@ -1,12 +1,13 @@
 <!--msg/pages/detail/index.wxml-->
 <view class="container-msg">
   <view class="msg-header">
-    <view class="tag">
+    <!-- <view class="tag">
       {{detail.type == 0 ? '系统消息' :'消息'}}
-    </view>
+    </view> -->
     <text>{{detail.title}}</text>
+    <view class="msg-time">{{detail.sendTime}}</view>
+    <view class="msg-time">系统消息</view>
   </view>
-  <view class="msg-time"><i class="iconfont1 icon-date date-icon"></i>{{detail.sendTime}}</view>
   <view class="msg-content">
     {{detail.content}}
   </view>

msg/pages/detail/index.wxss

@@ -7,7 +7,7 @@ page {
 .container-msg {
   width: 100%;
   height: 100%;
-  padding: 58rpx;
+  /* padding: 58rpx; */
   font-size: 24rpx;
   box-sizing: border-box;
   font-family: FZZhunYuan-M02S, FZZhunYuan-M02S-Regular;
@@ -15,11 +15,15 @@ page {
 }
 
 .msg-header {
-  margin-bottom: 17rpx;
   color: #999999;
   line-height: 55rpx;
+  padding: 30rpx 53rpx;
+  border-bottom: 1rpx solid #E6E6E6;
+  margin-bottom: 20rpx;
+}
+.mb6{
+  margin-bottom: 6rpx;
 }
-
 .msg-header .tag {
   display: inline-block;
   width: 127rpx;
@@ -33,15 +37,19 @@ page {
 }
 
 .msg-header text {
-  color: #333333;
-  font-size: 38rpx;
-  font-family: FZCuYuan-M03, FZCuYuan-M03-Regular;
+  font-size: 34rpx;
+font-family: PingFang SC, PingFang SC-Bold;
+font-weight: 700;
+text-align: center;
+color: #1a1a1a;
+line-height: 36rpx;
 }
 
 .msg-time {
-  display: flex;
-  align-items: center;
-  margin-bottom: 36rpx;
+  font-size: 24rpx;
+font-family: PingFang SC, PingFang SC-Regular;
+color: #666666;
+line-height: 36rpx;
 }
 
 .msg-time .date-icon {
@@ -51,6 +59,9 @@ page {
 
 .msg-content {
   color: #808080;
-  text-indent: 2em;
   line-height: 55rpx;
+  padding:0 53rpx;
+}
+.head{
+  display: flex;
 }

msg/pages/index/index.wxml

@@ -2,15 +2,13 @@
 <view class="container-msg">
   <view class="msgs">
     <view class="msg" bindtap='handleMsgDetail' data-id="{{item.id}}" wx:for="{{list}}" wx:key="{{item.id}}">
-      <view class="tag">系统消息</view>
-      <view class="icon">
-        <image class='micons' wx:if="{{item.isRead}}" src="{{appAssetsUrl2}}new/msg-icon.png"></image>
-        <image class='micons-active' wx:else src="{{appAssetsUrl2}}new/msg-active-icon.png"></image>
-      </view>
       <view class="body">
-        <view class="msg-label">{{item.title}}</view>
+        <view class="msg-label  {{item.isRead?'':'active'}}">
+          <image src="/assets/images/online/icon_5.png"></image>{{item.title}}
+        </view>
         <view class="msg-content">{{item.content}}</view>
-        <view class="msg-time">{{item.sendTime}}</view>
+        <view class="msg-time mb6">{{item.sendTime}}</view>
+        <view class="msg-time">系统消息</view>
       </view>
     </view>
     <block wx:if="{{list.length<=0}}">

msg/pages/index/index.wxss

@@ -20,10 +20,10 @@ page {
 .msgs .msg {
   position: relative;
   display: flex;
-  padding: 53rpx 30rpx;
+  padding: 34rpx 0;
   margin-bottom: 20rpx;
   background-color: #fff;
-  border-radius: 16rpx;
+  border-radius: 20rpx;
   font-weight: 400;
   font-family: FZZhunYuan-M02S, FZZhunYuan-M02S-Regular;
 }
@@ -64,21 +64,51 @@ page {
 }
 
 .msgs .msg .body .msg-label {
-  font-size: 28rpx;
+  font-size: 30rpx;
   color: #1a1a1a;
+  padding: 0 25rpx 25rpx;
+  color:#1A1A1A;
+  font-weight: 700;
+  border-bottom: 1rpx solid #E6E6E6;
   margin-bottom: 20rpx;
 }
-
+.msg-label image{
+  width: 32rpx;
+  height: 29rpx;
+  margin-right: 8rpx;
+  margin-bottom: 9rpx;
+  vertical-align: middle;
+  position: relative;
+}
+.active image::after{
+  content: "";
+  display: block;
+  position: absolute;
+  width: 12rpx;
+  height: 12rpx;
+  background: #FF0000;
+  right: 4rpx;
+  top: 0rpx;
+  border-radius: 50%;
+}
 .msgs .msg .body .msg-content {
-  font-size: 24rpx;
-  color: #808080;
-  margin-bottom: 20rpx;
+  font-size: 26rpx;
+font-family: PingFang SC, PingFang SC-Regular;
+color: #1a1a1a;
+line-height: 33rpx;
+letter-spacing: -0.52rpx;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  padding: 0 25rpx;
 }
 
 .msgs .msg .body .msg-time {
-  font-size: 24rpx;
-  color: #808080;
+ font-size: 26rpx;
+font-family: PingFang SC, PingFang SC-Regular;
+color: #808080;
+line-height: 33rpx;
+letter-spacing: -0.52rpx;
+padding: 0 25rpx;
+margin-top: 10rpx;
 }

pages/my/myStudy/myStudy.js

@@ -46,45 +46,45 @@ Page({
     consultingTeacher: "",
     inviteTeacher: "",
   },
-  facultyInput(e) {
+  facultyInput (e) {
     this.setData({
       facultyName: e.detail.value,
     });
   },
-  proInput(e) {
+  proInput (e) {
     this.setData({
       professionalTitle: e.detail.value,
     });
   },
-  messageInput(e) {
+  messageInput (e) {
     this.setData({
       consultingTeacher: e.detail.value,
     });
   },
-  guidanceInput(e) {
+  guidanceInput (e) {
     this.setData({
       inviteTeacher: e.detail.value,
     });
   },
-  schoolInput(e) {
+  schoolInput (e) {
     this.setData({
       searchName: e.detail.value,
     });
     this.searchSchool();
     console.log(e.detail.value);
   },
-  userNameInput(e) {
+  userNameInput (e) {
     this.setData({
       userName: e.detail.value,
     });
   },
-  idInput(e) {
+  idInput (e) {
     this.setData({
       identityNumber: e.detail.value,
     });
   },
   //搜索学校
-  searchSchool() {
+  searchSchool () {
     App._get(
       "areainfo/selectSchoolInfoByParams/",
       {
@@ -114,7 +114,7 @@ Page({
       }
     );
   },
-  submit() {
+  submit () {
     // return this.popup2.showPopup()
     if (!this.data.allData.region) {
       return App.showError("请选择地址!");
@@ -203,11 +203,11 @@ Page({
             that.popup2.showPopup();
           }
         },
-        function (res) {}
+        function (res) { }
       );
     }
   },
-  getInfo() {
+  getInfo () {
     let that = this;
     App._get(`studentstatus/info/${util.getUserId()}`, {}, (res) => {
       if (res.code === 0) {
@@ -286,7 +286,7 @@ Page({
       }
     });
   },
-  _error() {
+  _error () {
     console.log("返回");
     this.popup2.hidePopup();
     wx.navigateBack({
@@ -294,7 +294,7 @@ Page({
     });
   },
 
-  _success() {
+  _success () {
     console.log("查看");
     this.popup2.hidePopup();
     this.getInfo();
@@ -303,16 +303,17 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad(options) {
+  onLoad (options) {
     // this.getSchool()
-
+    console.log("options", App.sexList)
+    this.data.sexArray = App.sexList
     this.setData({
-      sexArray: App.sexList,
+      sexArray: this.data.sexArray,
     });
     this.getInfo();
   },
   // 上传学籍
-  upImg() {
+  upImg () {
     if (this.data.disabled) {
       return;
     }
@@ -320,13 +321,13 @@ Page({
     var tempFile;
     wx.showActionSheet({
       itemList: ["拍照上传", "从相册中选择"],
-      success(res) {
+      success (res) {
         if (res.tapIndex === 0) {
           wx.chooseImage({
             count: 1,
             sizeType: ["original", "compressed"],
             sourceType: ["camera"],
-            success(res) {
+            success (res) {
               const tempFilePaths = res.tempFilePaths;
               wx.uploadFile({
                 url: App.apiRoot + "file/upload",
@@ -346,7 +347,7 @@ Page({
                     });
                   }
                 },
-                function() {
+                function () {
                   wx.showToast({
                     title: "上传失败",
                     icon: "none",
@@ -363,7 +364,7 @@ Page({
             count: 1,
             sizeType: ["original", "compressed"],
             sourceType: ["album"],
-            success(res) {
+            success (res) {
               const tempFilePaths = res.tempFilePaths;
               wx.uploadFile({
                 url: App.apiRoot + "file/upload",
@@ -383,16 +384,16 @@ Page({
                     });
                   }
                 },
-                function() {
+                function () {
                   wx.showToast({
                     title: "上传失败",
                     icon: "none",
                     image: "",
                     duration: 1500,
                     mask: false,
-                    success: (result) => {},
-                    fail: () => {},
-                    complete: () => {},
+                    success: (result) => { },
+                    fail: () => { },
+                    complete: () => { },
                   });
                 },
               });
@@ -400,13 +401,13 @@ Page({
           });
         }
       },
-      fail(res) {},
+      fail (res) { },
     });
   },
   /**
    * 加载省份
    */
-  searchProvince() {
+  searchProvince () {
     let _this = this;
     let proId = "";
     let prov = "";
@@ -446,7 +447,7 @@ Page({
   },
 
   //获取市级
-  loadCity(cid) {
+  loadCity (cid) {
     let _this = this;
     App._post_form("areainfo/city/" + cid, "", null, function (res) {
       if (res.code === 0) {
@@ -484,16 +485,16 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady() {
+  onReady () {
     this.popup2 = this.selectComponent("#popup2");
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow() {},
+  onShow () { },
   // 获取学校列表
-  getSchool(id) {
+  getSchool (id) {
     App._get("areainfo/Schoolinfo/" + id, {}, (res) => {
       if (res.code === 0) {
         this.setData({
@@ -503,7 +504,7 @@ Page({
     });
   },
 
-  schoolChange(e) {
+  schoolChange (e) {
     let that = this;
     this.setData({
       schoolIndex: e.detail.value,
@@ -512,7 +513,7 @@ Page({
     console.log(this.data.college);
   },
   //学校change
-  bindChangeSchool(e) {
+  bindChangeSchool (e) {
     console.log(e);
     this.setData({
       schoolIndex: e.detail.value,
@@ -520,17 +521,17 @@ Page({
     });
     console.log(this.data.schoolIndex, "mmmmm");
   },
-  pickstart() {
+  pickstart () {
     this.setData({
       pickMove: true,
     });
   },
-  pickend() {
+  pickend () {
     this.setData({
       pickMove: false,
     });
   },
-  confirmSchool() {
+  confirmSchool () {
     if (this.data.pickMove) {
       return;
     }
@@ -551,7 +552,7 @@ Page({
     console.log(this.data.college, "college");
   },
   // 性别change
-  sexChange(e) {
+  sexChange (e) {
     let that = this;
     this.setData({
       sexIndex: e.detail.value,
@@ -559,7 +560,7 @@ Page({
     });
   },
   // 地区change
-  areaChange(e) {
+  areaChange (e) {
     this.data.load = false;
     let _this = this;
     _this.data.multiIndex[0] = e.detail.value[0];
@@ -598,7 +599,7 @@ Page({
     console.log(1111111111111);
     console.log(e);
   },
-  schoolName() {
+  schoolName () {
     if (this.data.disabled) {
       return;
     }
@@ -617,7 +618,7 @@ Page({
     console.log(this.data.allData.region, "0000000");
     console.log(this.data.schoolIndex, "ffff");
   },
-  hiddenAddress() {
+  hiddenAddress () {
     this.setData({
       schoolPopup: false,
     });
@@ -626,25 +627,25 @@ Page({
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide() {},
+  onHide () { },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload() {},
+  onUnload () { },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh() {},
+  onPullDownRefresh () { },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom() {},
+  onReachBottom () { },
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage() {},
+  onShareAppMessage () { },
 });

pages/my/myStudy/myStudy.wxml

@@ -17,7 +17,9 @@
                   <text class="iconfont icon-xiayibu font35 right-icon"></text>
                 </view>
               </picker> -->
-              <picker disabled="{{disabled}}" mode="multiSelector" bindchange="areaChange" bindcolumnchange="MultiPickerAreaChange" value="{{multiIndex}}" range="{{multiArray}}" range-key="areaname">
+              <picker disabled="{{disabled}}" mode="multiSelector" bindchange="areaChange"
+                bindcolumnchange="MultiPickerAreaChange" value="{{multiIndex}}" range="{{multiArray}}"
+                range-key="areaname">
                 <view wx:if="{{allData.province}}" class="picker">
                   {{multiArray[0][multiIndex[0]].areaname}} {{multiArray[1][multiIndex[1]].areaname}}
                   <text class="iconfont icon-xiayibu font35 right-icon"></text>
@@ -56,12 +58,14 @@
         <view class="address-popup" style="bottom: {{bottomLeft}}px;" wx:if="{{schoolPopup}}">
           <view class="title-box">
             <view class="search-box">
-              <input class="input-s" confirm-type="search" bindinput="schoolInput" placeholder-class="plac-search" bindconfirm="searchSchool" type="text" value="{{searchName}}" placeholder="请输入学校名称" />
+              <input class="input-s" confirm-type="search" bindinput="schoolInput" placeholder-class="plac-search"
+                bindconfirm="searchSchool" type="text" value="{{searchName}}" placeholder="请输入学校名称" />
             </view>
             <view class="cancel-word" bindtap="hiddenAddress">取消</view>
           </view>
           <!-- <view class="line-popup"></view> -->
-          <picker-view value="{{schoolIndex}}" immediate-change="{{true}}" bindchange="bindChangeSchool" bindpickstart="pickstart" bindpickend="pickend" indicator-class="type-item" class="picker-view">
+          <picker-view value="{{schoolIndex}}" immediate-change="{{true}}" bindchange="bindChangeSchool"
+            bindpickstart="pickstart" bindpickend="pickend" indicator-class="type-item" class="picker-view">
             <picker-view-column>
               <view class="pick-item" wx:for="{{schoolList}}">
                 <view class="item {{ schoolIndex == index ? 'active-type' : ''}}">{{item.itemname}}</view>
@@ -75,44 +79,50 @@
         <block>
           <view class="label">所属院系</view>
           <view class="input-box">
-            <input disabled="{{disabled}}" class="input-label" bindinput="facultyInput" type="text" value="{{facultyName}}" placeholder="请输入院系名称" />
+            <input disabled="{{disabled}}" class="input-label" bindinput="facultyInput" type="text"
+              value="{{facultyName}}" placeholder="请输入院系名称" />
           </view>
         </block>
         <block>
           <view class="label">所学专业</view>
           <view class="input-box">
-            <input disabled="{{disabled}}" class="input-label" bindinput="proInput" type="text" value="{{professionalTitle}}" placeholder="请输入专业名称" />
+            <input disabled="{{disabled}}" class="input-label" bindinput="proInput" type="text"
+              value="{{professionalTitle}}" placeholder="请输入专业名称" />
           </view>
         </block>
         <block>
           <view class="label">邀约老师</view>
           <view class="input-box">
-            <input disabled="{{disabled}}" class="input-label" bindinput="messageInput" type="text" value="{{consultingTeacher}}" placeholder="请输入邀约老师" />
+            <input disabled="{{disabled}}" class="input-label" bindinput="messageInput" type="text"
+              value="{{consultingTeacher}}" placeholder="请输入邀约老师" />
           </view>
         </block>
         <block>
           <view class="label">指导老师</view>
           <view class="input-box">
-            <input disabled="{{disabled}}" class="input-label" bindinput="guidanceInput" type="text" value="{{inviteTeacher}}" placeholder="请输入指导老师" />
+            <input disabled="{{disabled}}" class="input-label" bindinput="guidanceInput" type="text"
+              value="{{inviteTeacher}}" placeholder="请输入指导老师" />
           </view>
         </block>
       </view>
     </i-cell-group>
 
     <i-cell-group>
-      <view class="box">
+      <view class="box noBtr">
         <view class="title">个人基本信息</view>
         <block>
           <view class="label">真实姓名：</view>
           <view class="input-box">
-            <input disabled="{{disabled}}" class="input-label" bindinput="userNameInput" type="text" value="{{userName}}" placeholder="请输入真实姓名" />
+            <input disabled="{{disabled}}" class="input-label" bindinput="userNameInput" type="text"
+              value="{{userName}}" placeholder="请输入真实姓名" />
           </view>
         </block>
         <block>
           <view class="label">性别</view>
           <view class="input-box">
             <view class="section txt-color">
-              <picker disabled="{{disabled}}" mode="selector" bindchange="sexChange" value="{{sexIndex}}" range="{{sexArray}}" range-key="itemname">
+              <picker disabled="{{disabled}}" mode="selector" bindchange="sexChange" value="{{sexIndex}}"
+                range="{{sexArray}}" range-key="itemname">
                 <view wx:if="{{sexIndex !== null}}" class="picker">
                   {{sexArray[sexIndex]['itemname']}}
                   <text class="iconfont icon-xiayibu font35 right-icon"></text>
@@ -128,14 +138,15 @@
         <block>
           <view class="label">身份证号</view>
           <view class="input-box">
-            <input disabled="{{disabled}}" class="input-label" bindinput="idInput" type="idcard" value="{{identityNumber}}" placeholder="请输入身份证号码" />
+            <input disabled="{{disabled}}" class="input-label" bindinput="idInput" type="idcard"
+              value="{{identityNumber}}" placeholder="请输入身份证号码" />
           </view>
         </block>
       </view>
     </i-cell-group>
 
     <i-cell-group>
-      <view class="box last">
+      <view class="box last noBtr">
         <view class="title">学历证明上传（选填）</view>
         <view class="notice">
           ① 证件可以为图书馆馆卡、饭卡、学生卡、录取通知书
@@ -159,7 +170,7 @@
 
     </i-cell-group>
   </form>
-  <view style="bottom: {{bottomLeft}}px;margin-bottom: 0;" id="bot-box" class="box footer">
+  <view style="bottom: {{bottomLeft}}px;margin-bottom: 0;" id="bot-box" class=" footer">
     <view class="tip">
       <view class="tip-item" wx:if="{{ obj.auditStatus == 0 }}">审核需要5-10分钟，请耐心等待</view>
       <view class="tip-item" wx:elif="{{ obj.auditStatus == 1 }}">审核通过 {{ obj.auditTime }}</view>
@@ -168,9 +179,11 @@
     <button class="btn" wx:if="{{ obj.auditStatus == 2 || obj.auditStatus === null }}" bindtap="submit">立即提交</button>
   </view>
   <view style="height: {{tipHeight}}px;width: 100%;background: white;z-index: 1000;"></view>
-  <popup2 id='popup2' title='提交完成' content="{{['']}}" btn_no='返回' btn_ok='查看' bind:error="_error" bind:success="_success" data-name="popup2">
+  <popup2 id='popup2' title='提交完成' content="{{['']}}" btn_no='返回' btn_ok='查看' bind:error="_error"
+    bind:success="_success" data-name="popup2">
     <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">
-      认证资料已提交完成， 请您耐心等待审核！
+      <view>认证资料已提交完成，</view>
+      <view>请您耐心等待审核！</view>
     </view>
   </popup2>
   <view style="height: {{bottomLeft}}px;width: 100%;position: fixed;bottom: 0;background: white;z-index: 1000;"></view>

pages/my/myStudy/myStudy.wxss

@@ -31,12 +31,15 @@
 .study-container {
   width: 100%;
   height: 100%;
+  padding-bottom: 100rpx;
 }
 
 .box {
-  padding: 30rpx;
+  padding: 30rpx !important;
   margin-bottom: 10rpx;
   background-color: #fff;
+  box-sizing: border-box;
+  border-top: 1px solid #d9d9d9;
 }
 
 .box .title {
@@ -44,7 +47,7 @@
   position: relative;
   margin-bottom: 25rpx;
   font-size: 32rpx;
-  font-family: "PingFang SC, PingFang SC-Bold";
+  font-family: PingFang SC, PingFang SC-Bold;
   font-weight: 700;
   color: #1a1a1a;
   z-index: 1;
@@ -160,7 +163,7 @@
 .btn {
   width: 690rpx;
   height: 85rpx;
-  background: #ffdc2f;
+  background: #2B58A5;
   border-radius: 43rpx;
   font-size: 30rpx;
   font-family: "PingFang SC, PingFang SC-Regular";
@@ -234,7 +237,7 @@
   font-size: 28rpx;
   font-family: PingFang SC, PingFang SC-Regular;
   font-weight: 400;
-  color: #ffc12f;
+  color: #2B58A5;
   /* position: absolute;
 	right: 60rpx;
 	top: 5rpx; */
@@ -301,13 +304,13 @@
 .pick-btn {
   width: 630rpx;
   height: 85rpx;
-  background: #ffdc2f;
+  background: #2B58A5;
   border-radius: 43rpx;
   font-size: 30rpx;
   font-family: PingFang SC, PingFang SC-Regular;
   font-weight: 400;
   text-align: center;
-  color: #1a1a1a;
+  color: #fff;
   margin-left: 60rpx;
   line-height: 85rpx;
 }
@@ -341,5 +344,9 @@
 #bot-box {
   position: fixed;
   z-index: 10;
-  width: 750rpx;
+  width: 100%;
+  background: #fff;
+}
+.noBtr{
+border-top: none !important;
 }

project.private.config.json

@@ -3,36 +3,15 @@
     "miniprogram": {
       "list": [
         {
-          "name": "/msg/pages/index/index",
-          "pathName": "/msg/pages/index/index",
+          "name": "pages/my/myStudy/myStudy",
+          "pathName": "pages/my/myStudy/myStudy",
           "query": "",
           "scene": null,
           "launchMode": "default"
         },
         {
-          "name": "pages/home/index/activityDetail/activityDetail",
-          "pathName": "pages/home/index/activityDetail/activityDetail",
-          "query": "id=96",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/my/myCollection/myCollection",
-          "pathName": "pages/my/myCollection/myCollection",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/my/myCustomer/myCustomer",
-          "pathName": "pages/my/myCustomer/myCustomer",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/checkin/index",
-          "pathName": "pages/checkin/index",
+          "name": "/msg/pages/index/index",
+          "pathName": "/msg/pages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null

static/style.wxss

@@ -16,6 +16,14 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 } */
+.iconfont1 {
+  font-family: "iconfont1" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
 .icon-a-shijiannaozhongriliriqijishiqi-11:before {
   content: "\e7ff";
 }