Merge pull request 'dev_yly' (#2) from dev_yly into master

Reviewed-on: http://gitea.wangzhiwen.top/all_you_need/IOReportMgt/pulls/2

IOReportSysMP/miniprogram/components/yinput/yinput.ts

@@ -30,7 +30,7 @@ Component({
   },
   lifetimes: {
     ready:function(){
-      const initValue = this.data.defaultValue || ''
+      const initValue = this.data.value || this.data.defaultValue || ''
       this.dataset[this.data.bindValue] = initValue
       this.setData({ value: initValue })
     },

IOReportSysMP/miniprogram/pages/report/enter/enterReport.scss

@@ -1,19 +1,36 @@
 .card-container {
-  margin: 20px;
+  margin: 20rpx;
   background-color: var(--color-gray-0);
   box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+  font-size: 17px;
+  // font-weight: 550;
 
   .card-col-1 {
+    padding: 24rpx 0;
     display: flex;
+    width: auto;
+
+    & yinput:nth-child(1) {
+      flex: 4 1 50px;
+      margin: 0 5rpx;
+    }
+
+    & yinput:nth-child(2) {
+      flex: 7 1 50px;
+      margin:0 5rpx;
+    }
   }
 
 }
 
+
 .input-container {
   padding-bottom: 80rpx;
+
   .card-col-1 {
     display: flex;
     margin: 0 2px;
+
     :nth-child(n) {
       flex: 1 1 0;
     }

IOReportSysMP/miniprogram/pages/report/enter/enterReport.ts

@@ -37,11 +37,6 @@ Page<IPageData,IPage>({
     this.setData({
       applyTime: e.detail.value,
     });
-  },
-  ioTypeChange (e:any) {
-    this.setData({
-      ioType:this.data.ioTypesArray[e.detail.value],
-    });
   },
     // 获取文本框字数
     inputs: function (e: any) {

IOReportSysMP/miniprogram/pages/report/enter/enterReport.wxml

@@ -1,27 +1,18 @@
 <navigationBar title="进校报备"></navigationBar>
 <view class="card-container">
   <view class="card-col-1">
-      <yinput onlyRead padding="16rpx" label="工号：" bindValue="teacherID" defaultValue="{{teacherID}}"></yinput>
-      <yinput onlyRead padding="16rpx" label="姓名：" bindValue="name" defaultValue="{{name}}"></yinput>
+      <yinput onlyRead padding="16rpx" label="工号：" bindValue="teacherID" value="{{teacherID}}" wx:if=""></yinput>
+      <yinput onlyRead padding="0" label="姓名:" bindValue="name" value="{{'殷梁禹加'}}"></yinput>
+      <yinput onlyRead padding="0" label="报备类型:" bindValue="name" value="进校报备"></yinput>
   </view>
-    <yinput onlyRead padding="16rpx" label="联系方式：" bindValue="mobile" defaultValue="{{mobile}}"></yinput>
-    <yinput onlyRead padding="16rpx" label="学院: " bindValue="dept" defaultValue="{{dept.department}}"></yinput>
+    <yinput onlyRead padding="16rpx" label="联系方式：" bindValue="mobile" value="{{mobile}}"  wx:if="" ></yinput>
+    <yinput onlyRead padding="16rpx" label="学院: " bindValue="dept" value="{{dept.department}}"  wx:if=""></yinput>
 </view>
     
 <form bindsubmit="onSubmit" rules="{{rules}}">
   
-    <view class="weui-cells__title">进出校报备信息填写</view>
+    <view class="weui-cells__title"  wx:if="">进出校报备信息填写</view>
     <view class="weui-cells weui-cells_form">
-      <view class="weui-cell weui-cell_active">
-        <view class="weui-cell__hd">
-          <label class="weui-label" style="width: 5em;">报备类型</label>
-        </view>
-        <view class="weui-cell__bd">
-          <picker aria-role="combobox" bindchange="ioTypeChange" range="{{ioTypesArray}}">
-            <view class="weui-select" style="height:24px;line-height: 24px;">{{ioType}}</view>
-          </picker>
-        </view>
-      </view>
       <view class="weui-cell weui-cell_active">
                   <view class="weui-cell__hd">
                       <view class="weui-label" id="js_date" aria-hidden="true">申请日期</view>