修改自建物流界面,优化首页icon

app.js

@@ -37,7 +37,7 @@ App({
           })
         };
         if (res.cancel) {
-          console.log('用户点击取消');
+          // console.log('用户点击取消');
         }
       }
     })

app.wxss

@@ -6,12 +6,12 @@ page{
 .box{
   background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1);
   min-height: 1400rpx;
-  padding: 20rpx;
+  padding: 5rpx;
   font-size: 28rpx;
 }
 
 .back{
-  padding: 20rpx;
+  padding: 10rpx;
   border-radius: 5rpx;
   background-color: #fff;
 }

pages/about/about.js

@@ -35,7 +35,6 @@ Page({
           login.bindWechat({
             openid: app.globalData.openid
           }).then(res1 => {
-            console.log('res=' + JSON.stringify(res1));
             this.onLoad()
           })
         }
@@ -122,7 +121,7 @@ Page({
     })
 
     var userInfo = app.globalData.userInfo
-    console.log('userInfo' + JSON.stringify(app.globalData.userInfo));
+    
     if (userInfo != undefined && JSON.stringify(userInfo) != '{}') {
       this.setData({
         username: userInfo.nickname,

pages/about/about.wxml

@@ -15,18 +15,20 @@
         <image src="../../images/binding_wx.png" bindtap="bindWx"></image>
         <view class="text">绑定微信</view>
       </view>
+
       <view class="con" data-id="goQueryme" bindtap="goSelNav">
-        <image src="../../images/统计.png"></image>
+        <image src="../../images/自建物流_查询.png"></image>
-        <view class="text">自建物流查询</view>
+        <view class="text">自建查询</view>
       </view>
       <view class="con" data-id="goQuerythree" bindtap="goSelNav">
-        <image src="../../images/统计.png"></image>
+        <image src="../../images/第三方物流_查询.png"></image>
-        <view class="text">第三方物流查询</view>
+        <view class="text">第三方查询</view>
       </view>
       <view class="con" bindtap="goSelNav" data-id="goQueryfrei">
-        <image src="../../images/统计.png"></image>
+        <image src="../../images/货运物流_查询.png"></image>
-        <view class="text">货运物流查询</view>
+        <view class="text">货运查询</view>
       </view>
+
       <view class="con" bindtap="goFeekback">
         <image src="../../images/意见反馈.png"></image>
         <view class="text">意见反馈</view>

pages/about/about.wxss

@@ -41,8 +41,8 @@
   width: 200rpx;
 }
 .con image{
-  width: 70rpx;
+  width: 100rpx;
-  height: 60rpx;
+  height: 100rpx;
 }
 .con .text{
   font-size: 22rpx;

pages/details/details.js

@@ -23,7 +23,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    console.log(options.sample);
     var item = JSON.parse(options.sample)
     this.setData({
       barCode:item.barCode,

pages/feedback/feedback.js

@@ -49,7 +49,6 @@ Page({
 
   //记录问题
   problemUr(e) {
-    console.log(e.detail.value);
     this.setData({
       problemStr: e.detail.value
     })

pages/freiLogistics/freiLogistics.js

@@ -308,6 +308,7 @@ Page({
     request.post(`/batch/addTranLogistics`, tempData).then(res => {
       console.log(JSON.stringify(res.data));
       if (res.data.code == 200) {
+        this.data.selfOrderCode = res.data.data
         //保存成功后,查询底部列表
         this.selSampleList();
       } else {

pages/handover/handover.js

@@ -1,4 +1,5 @@
 // pages/handover/handover.js
+//样本交接
 const request = require('../../utils/http')
 import drawQrcode from '../../utils/weapp.qrcode.esm.js'
 // var app = getApp();
@@ -38,7 +39,7 @@ Page({
       // this.data.logisticsCodeList = res.data.data
       if (res.data.data.length == 0) {
         wx.showToast({
-          title: '物流单列表无数据',
+          title: '无数据',
           icon: 'error'
         })
       } else {
@@ -51,8 +52,6 @@ Page({
 
   //查询物流单下的样本列表
   selSampleList(e) {
-    var _this = this;
-    // console.log('selSampleList run' + JSON.stringify(e.target.dataset.id));
     var reqData = {
       'logisticsNo': e.target.dataset.id
     }

pages/index/index.js

@@ -37,17 +37,16 @@ function initChart(canvas, width, height, dpr) {
     series: [{
         name: '核收数',
         type: 'bar',
-        data: [10, 20, 46, 120, 90, 80]
+        data: [10, 20, 46, 120, 90, 80, 85, 23, 49, 98, 110, 32]
       },
       {
         name: '接收数',
         type: 'bar',
-        data: [20, 56, 46, 30, 45, 60]
+        data: [20, 56, 46, 30, 45, 60, 10, 20, 46, 120, 90]
       }
     ]
   };
   chart.setOption(option);
-
   return chart;
 };
 

pages/index/index.json

@@ -2,5 +2,5 @@
   "usingComponents": {
     "ec-canvas":"../../components/echarts/ec-canvas"
   },
-  "navigationBarTitleText": "首页"
+  "navigationBarTitleText": "物流管理系统"
 }

pages/index/index.wxml

@@ -1,33 +1,57 @@
 <!--pages/index/index.wxml-->
-<swiper hidden="true" class="banner" autoplay="true" interval="4000" circular="true" indicator-dots='true'>
+<view class="">
-  <swiper-item>
+  <swiper class="banner" autoplay="true" interval="4000" circular="true" indicator-dots='true'>
-    <image src="../../images/banner.png" />
+    <swiper-item>
-  </swiper-item>
+      <image src="../../images/banner.png" />
-</swiper>
+    </swiper-item>
-
+  </swiper>
-<view class="msg">消息：XXX医院样本转运完成，完成时间:2023年6月14日</view>
+
-
+  <view class="msg">消息：丛台医院样本转运完成，完成时间:2023年7月14日</view>
-<view style="padding: 20rpx;">
+
-  <view class="back">
+  <view style="padding: 10rpx;">
-    <view class="produck-type">
+    <view class="back">
-      <view class="item" bindtap="goLogisticsType" data-id="goMelogistics">
+      <view class="produck-type">
-        <image src="../../images/自建物流.png"></image>
+        <view class="item" bindtap="goLogisticsType" data-id="goMelogistics">
-        <view>自建物流</view>
+          <image src="../../images/自建物流.png"></image>
-      </view>
+          <view>自建物流</view>
-      <view class="item" bindtap="goLogisticsType" data-id="goThreelogistics">
+        </view>
-        <image src="../../images/第三方物流.png"></image>
+        <view class="item" bindtap="goLogisticsType" data-id="goThreelogistics">
-        <view>第三方物流</view>
+          <image src="../../images/第三方物流.png"></image>
+          <view>第三方物流</view>
+        </view>
+        <view class="item" bindtap="goLogisticsType" data-id="goLogistics">
+          <image src="../../images/货运物流.png"></image>
+          <view>货运物流</view>
+        </view>
       </view>
-      <view class="item" bindtap="goLogisticsType" data-id="goLogistics">
+    </view>
-        <image src="../../images/货运物流.png"></image>
+  </view>
-        <view>货运物流</view>
+
+
+  <view style="padding: 10rpx;">
+    <view class="back">
+      <view class="produck-type">
+
+        <view class="item" data-id="goQueryme" bindtap="goSelNav">
+          <image src="../../images/自建物流_查询.png"></image>
+          <view class="text">自建查询</view>
+        </view>
+        <view class="item" data-id="goQuerythree" bindtap="goSelNav">
+          <image src="../../images/第三方物流_查询.png"></image>
+          <view class="text">第三方查询</view>
+        </view>
+        <view class="item" bindtap="goSelNav" data-id="goQueryfrei">
+          <image src="../../images/货运物流_查询.png"></image>
+          <view class="text">货运查询</view>
+        </view>
+
+
       </view>
     </view>
   </view>
 
   <button class="btn" bindtap="goLogisticsType" data-id="goHandover">物流交接</button>
 
-  <view class="ec-container">
+  <image src="https://api.wx.bjyytsoft.com/mallStatic/wx/images/time.png" style="width: 100%;height: 200rpx;margin-top: 90rpx;"></image>
-    <ec-canvas canvas-id="echart-pie" ec="{{ec}}"></ec-canvas>
+
-  </view>
 </view>

pages/index/index.wxss

@@ -4,7 +4,7 @@ page {
 }
 .banner{
   width: 100%;
-  height: 350rpx;
+  height: 330rpx;
 }
 .banner image{
   width: 100%;
@@ -12,8 +12,8 @@ page {
 }
 
 .msg{
-  border-radius: 5px;
+  border-radius: 2px;
-  margin: 20rpx 20rpx 0rpx;
+  margin: 10rpx 10rpx 0rpx;
   height: 40rpx;
   background-color: #fff;
   font-size: 26rpx;
@@ -40,15 +40,16 @@ page {
   justify-content: center;
 }
 .item image{
-  width: 80rpx;
+  width: 100rpx;
-  height: 80rpx;
+  height: 100rpx;
 }
 
 .btn{
   background-color: #3ec6c9;
   color: #fff;
-  margin-top: 20rpx;
+  margin-top: 10rpx;
-  width: 100% !important;
+  padding: 30rpx 10rpx;
+  width: 98% !important;
 }
 
 

pages/meLogistics/meLogistics.js

@@ -12,13 +12,15 @@ Page({
     ins: [], //送检机构 服务端获取
     insName: [], //机构列表名称
     insIdx: 0, //当前所选机构下标
-    bushList: ['私家车', '大巴', '顺丰', '其他'], //运输方式 服务端获取
+    bushList: ['自建物流'], //运输方式 服务端获取
-    bush: '', //运输方式下标
+    bush: '0', //运输方式下标
     date: '', //当天日期
     start: '2020-01-01',
     end: '',
 
     boxNum: '', //转运箱号
+    boxList:['ZY1000020041','ZY1000020042','ZY1000020043','ZY1000020044','ZY1000020045'], //查询回来的转运箱列表
+    boxIdx:'', //选择的下标
 
     time: '', //出发时间
     multiArray: [],
@@ -29,8 +31,8 @@ Page({
     multiArray1: [],
     multiIndex1: [0, 0, 0, 0, 0],
     choose_year1: "",
-    numberplate: '', //车牌号
+    numberplate: '京B3333F3', //车牌号
-    logisticsMen: '', //物流员
+    logisticsMen: '检验门诊岳医生', //物流员
     number: '', //数量
     notes: '', //备注
     driverMen: '', //驾驶员
@@ -42,8 +44,8 @@ Page({
     //样本列表
     sampleList: [{
       'id': 1,
-      'number': '2023050002',
+      'barCode': '2023050002',
-      'time': '2023-5-12 11:32',
+      'receiveTime': '2023-5-12 11:32',
       'status': '已签收',
       'name': '张三',
       'num': 'M2023055568'
@@ -110,10 +112,18 @@ Page({
   //物流车、转运箱拍照
   photograph(e) {
     var potoIdx = 0;
-    if (e.target.dataset.id == 'car_1') potoIdx = 0
+    if (e.target.dataset.id == 'car_0') potoIdx = 0
-    if (e.target.dataset.id == 'car_2') potoIdx = 1
+    if (e.target.dataset.id == 'car_1') potoIdx = 1
-    if (e.target.dataset.id == 'box_1') potoIdx = 2
+    if (e.target.dataset.id == 'car_2') potoIdx = 2
-    if (e.target.dataset.id == 'box_2') potoIdx = 3
+    if (e.target.dataset.id == 'car_3') potoIdx = 3
+    if (e.target.dataset.id == 'box_0') potoIdx = 4
+    if (e.target.dataset.id == 'box_1') potoIdx = 5
+    if (e.target.dataset.id == 'box_2') potoIdx = 6
+    if (e.target.dataset.id == 'box_3') potoIdx = 7
+    if (e.target.dataset.id == 'sam_0') potoIdx = 8
+    if (e.target.dataset.id == 'sam_1') potoIdx = 9
+    if (e.target.dataset.id == 'sam_2') potoIdx = 10
+    if (e.target.dataset.id == 'sam_3') potoIdx = 11
 
     //回显所拍摄照片
     var _this = this;
@@ -338,6 +348,15 @@ Page({
     }
   },
 
+  //转运箱号下拉选择
+  bindBoxNumber(e){
+    // console.log(JSON.stringify(e.detail.value))
+    this.setData({
+      boxIdx:e.detail.value,
+      boxNum:this.data.boxList[e.detail.value]
+    })
+  },
+
   //显示必选项为空提示
   showErrInfo(field, errInfo) {
     if (field === undefined || field.length == 0) {
@@ -383,8 +402,8 @@ Page({
       "entryDate": temp.date, //	录入日期
       "endDate": '2023-07-06 14:52:53', //startTime
       "expectedEndTime": endTime, //预计到达时间 endTime
-      "institutionName": temp.ins[temp.insIdx].orgName, //送检机构名称
+      // "institutionName": temp.ins[temp.insIdx].orgName, //送检机构名称
-      "institutionNo": temp.ins[temp.insIdx].id, //送检机构编号
+      // "institutionNo": temp.ins[temp.insIdx].id, //送检机构编号
       "logisticsMen": temp.logisticsMen, //物流员
       "logisticsNo": temp.selfOrderCode, //物流编号
       "logisticsWay": 1, //物流方式 1自建 2第三方 3货运
@@ -417,15 +436,14 @@ Page({
     })
   },
 
-  //查询底部列表数据
+  //查询样本列表数据
   selSampleList() {
     var reqData = {
       'logisticsNo': this.data.selfOrderCode
     }
     request.post(`/logistics/selectTranLogistics`, reqData).then(res => {
-      console.log(res.data);
       this.setData({
-        sampleList: res.data.data,
+        // sampleList: res.data.data,
         sampleCount: res.data.data.length
       })
     })
@@ -462,12 +480,17 @@ Page({
       request.get(`/batch/getBatchsNumber?logisticsWay=1`).then(res => {
         console.log('getBatchsNumber=' + JSON.stringify(res.data))
         if (res.data.code == 200) {
+          this.data.selfOrderCode = res.data.data
           this.setData({
             selfOrderCode: res.data.data
           })
+
+          this.selSampleList(); //查询物流批次列表
         }
       })
 
+
+
     //获取送检机构列表
     request.post(`/institution/selectInstitution`).then(res => {
       var array = res.data.data
@@ -478,13 +501,14 @@ Page({
       this.setData({
         ins: tempArr
       })
-
-      //查询物流批次列表
-      this.selSampleList();
     })
 
     //初始化照片按钮
-    var tempSrc = [this.data.potoSrc, this.data.potoSrc, this.data.potoSrc, this.data.potoSrc]
+    var tempSrc = []
+    for (let index = 0; index < 12; index++) {
+      tempSrc.push(this.data.potoSrc)
+    }
+
     this.setData({
       poto: tempSrc
     })

pages/meLogistics/meLogistics.wxml

@@ -8,110 +8,154 @@
       <!-- <view style="background-color: #23c559; color: #fff;" bindtap="phot" hidden="true">拍 照</view> -->
     </view>
 
-    <view class="form">
+    <!--样本列表-->
-      <view class="from-con">
+    <view class="back" style="padding: 0rpx;">
-        <label>物流单号：</label>
+      <view class="con">
-        <input type="text" placeholder="物流单号" disabled="false" placeholder-class="place" value="{{selfOrderCode}}" />
+        <view style="flex: 1;">总计：{{sampleCount}}/管数</view>
+        <button style="background-color: #ddd;" hidden="ture">修 改</button>
+        <button style="color: #fff;" bindtap="saveInfo">保 存</button>
+      </view>
+
+      <scroll-view scroll-x scroll-y class="tabel" style="height: 400rpx;">
+        <view class="tr tab-top">
+          <view class="td1"></view>
+          <view class="td">样本条码号</view>
+          <view class="td">接收时间</view>
+          <view class="td">样本状态</view>
+          <view class="td">物流员</view>
+          <view class="td">物流单号</view>
+        </view>
+        <view class="tr" wx:for="{{sampleList}}" wx:key="index" data-id="{{index}}" bindtap="goDetail">
+          <view class="td1">{{index + 1}}</view>
+          <view class="td">{{item.barCode}}</view>
+          <view class="td">{{item.receiveTime}}</view>
+          <view wx:if="{{item.status == 0}}" class="td">未采样</view>
+          <view wx:elif="{{item.status == 1}}" class="td">已采样</view>
+          <view wx:elif="{{item.status == 2}}" class="td">已发货</view>
+          <view wx:elif="{{item.status == 3}}" class="td">已接收</view>
+          <view wx:elif="{{item.status == 4}}" class="td">重新采样</view>
+          <view wx:else class="td">其它</view>
+          <view class="td">{{item.logisticsMen}}</view>
+          <view class="td">{{item.logisticsNo}}</view>
+        </view>
+      </scroll-view>
+    </view>
+
+
+    <view class="back_img_box">
+      <view class="bush">
+        <view style="flex: 1;">物流车拍照</view>
+        <!-- <button bindtap="bushPhot">拍 照</button> -->
       </view>
+      <view class="bush-img">
+        <image bindtap="photograph" src="{{poto[0]}}" data-id="car_0"></image>
+        <image bindtap="photograph" src="{{poto[1]}}" data-id="car_1"></image>
+        <image bindtap="photograph" src="{{poto[2]}}" data-id="car_2"></image>
+        <image bindtap="photograph" src="{{poto[3]}}" data-id="car_3"></image>
+      </view>
+
+      <view class="bush">
+        <view style="flex: 1;">转运箱拍照</view>
+        <!-- <button bindtap="bushPhot">拍 照</button> -->
+      </view>
+      <view class="bush-img">
+        <image bindtap="photograph" src="{{poto[4]}}" data-id="box_0"></image>
+        <image bindtap="photograph" src="{{poto[5]}}" data-id="box_1"></image>
+        <image bindtap="photograph" src="{{poto[6]}}" data-id="box_2"></image>
+        <image bindtap="photograph" src="{{poto[7]}}" data-id="box_3"></image>
+      </view>
+
+      <view class="bush">
+        <view style="flex: 1;">样本拍照</view>
+        <!-- <button bindtap="bushPhot">拍 照</button> -->
+      </view>
+      <view class="bush-img">
+        <image bindtap="photograph" src="{{poto[8]}}" data-id="sam_0"></image>
+        <image bindtap="photograph" src="{{poto[9]}}" data-id="sam_1"></image>
+        <image bindtap="photograph" src="{{poto[10]}}" data-id="sam_2"></image>
+        <image bindtap="photograph" src="{{poto[11]}}" data-id="sam_3"></image>
+      </view>
+
+    </view>
+
+    <!-- <view class="back">
+      <view class="bush">
+        <view style="flex: 1;">转运箱拍照</view>
+      </view>
+      <view class="bush-img">
+        <image bindtap="photograph" src="{{poto[2]}}" data-id="box_1"></image>
+        <image bindtap="photograph" src="{{poto[3]}}" data-id="box_2"></image>
+      </view>
+    </view> -->
+
+    <view class="form">
+
       <picker class="from-con" bindchange="bindPickerChange" value="{{insIdx}}" range="{{ins}}">
-        <label>送检机构：</label>
+        <text>送检机构：</text>
         <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{insName}}" />
       </picker>
-      <picker mode="date" value="date" start="start" end="end" bindchange="bindDateChange" class="from-con">
+
+      <view class="from-con">
+        <text>物流单号：</text>
+        <input type="text" placeholder="物流单号" disabled="false" placeholder-class="place" value="{{selfOrderCode}}" />
+      </view>
+
+      <!-- <picker mode="date" value="date" start="start" end="end" bindchange="bindDateChange" class="from-con">
         <label>日期：</label>
         <input type="text" disabled="true" placeholder="请选择日期" placeholder-class="place" value="{{date}}" />
-      </picker>
+      </picker> -->
       <view class="from-con">
-        <label>数量：</label>
+        <text space="nbsp">数      量：</text>
         <input type="number" bindinput="inputTextInfo" data-id="number" placeholder="数量" placeholder-class="place" />
       </view>
+
       <picker class="from-con" bindchange="bindbushChange" range="{{bushList}}">
-        <label>运输方式：</label>
+        <text>运输方式：</text>
         <input type="text" disabled="true" placeholder="请选择运输方式" placeholder-class="place" value="{{bushList[bush]}}" />
       </picker>
-      <view class="from-con">
+
-        <label>转运箱号：</label>
+      <!-- <view class="from-con"> -->
-        <input type="text" bindinput="inputTextInfo" data-id="boxNum" placeholder="转运箱号" placeholder-class="place" value="" />
+        <!-- <text>转运箱号：</text> -->
-      </view>
+        <picker class="from-con" bindchange="bindBoxNumber" range="{{boxList}}">
+        <text>转运箱号：</text>
+        <input type="text" disabled="true" placeholder="转运箱号" placeholder-class="place" value="{{boxList[boxIdx]}}" />
+      </picker>
+
+        <!-- <input type="text" bindinput="inputTextInfo" data-id="boxNum" placeholder="转运箱号" placeholder-class="place" value="" /> -->
+      <!-- </view> -->
+
       <picker class="from-con" mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
-        <label>出发时间：</label>
+        <label>*</label>
+        <text>出发时间：</text>
         <input value='{{time}}' placeholder='请选择出发时间' placeholder-class="place" disabled="true" />
       </picker>
+
       <picker class="from-con" mode="multiSelector" bindchange="bindMultiPickerChange1" bindcolumnchange="bindMultiPickerColumnChange1" value="{{multiIndex1}}" range="{{multiArray1}}">
-        <label>到达时间：</label>
+        <label>*</label>
+        <text>到达时间：</text>
         <input value='{{time1}}' placeholder='请选择到达时间' placeholder-class="place" disabled="true" />
       </picker>
+
       <view class="from-con">
-        <label>车牌号：</label>
+        <text space="nbsp">车 牌 号：</text>
-        <input type="text" bindinput="inputTextInfo" data-id="numberplate" placeholder="车牌号" placeholder-class="place" value="{{carCode}}" />
+        <input type="text" bindinput="inputTextInfo" data-id="numberplate" placeholder="车牌号" placeholder-class="place" value="{{numberplate}}" />
       </view>
+
       <view class="from-con">
-        <label>物流员：</label>
+        <text space="nbsp">驾 驶 员：</text>
-        <input type="text" bindinput="inputTextInfo" data-id="logisticsMen" placeholder="物流员" placeholder-class="place" value="{{logistician}}" />
+        <input type="text" bindinput="inputTextInfo" data-id="driverMen" placeholder="驾驶员" placeholder-class="place" value="{{driver}}" />
       </view>
+
       <view class="from-con">
-        <label>驾驶员：</label>
+        <text space="nbsp">物 流 员：</text>
-        <input type="text" bindinput="inputTextInfo" data-id="driverMen" placeholder="驾驶员" placeholder-class="place" value="{{driver}}" />
+        <input type="text" bindinput="inputTextInfo" data-id="logisticsMen" placeholder="物流员" placeholder-class="place" value="{{logistician}}" />
       </view>
+
       <view class="from-con">
-        <label>备注：</label>
+        <text space="nbsp">备      注：</text>
         <input type="text" bindinput="inputTextInfo" data-id="notes" placeholder="备注" placeholder-class="place" value="{{notes}}" />
       </view>
 
     </view>
   </view>
-
-  <view class="back">
-    <view class="bush">
-      <view style="flex: 1;">物流车拍照</view>
-      <!-- <button bindtap="bushPhot">拍 照</button> -->
-    </view>
-    <view class="bush-img">
-      <image bindtap="photograph" src="{{poto[0]}}" data-id="car_1"></image>
-      <image bindtap="photograph" src="{{poto[1]}}" data-id="car_2"></image>
-    </view>
-  </view>
-
-  <view class="back">
-    <view class="bush">
-      <view style="flex: 1;">转运箱拍照</view>
-      <!-- <button bindtap="boxPhot">拍 照</button> -->
-    </view>
-    <view class="bush-img">
-      <image bindtap="photograph" src="{{poto[2]}}" data-id="box_1"></image>
-      <image bindtap="photograph" src="{{poto[3]}}" data-id="box_2"></image>
-    </view>
-  </view>
-
-  <view class="back">
-    <view class="con">
-      <view style="flex: 1;">总计：{{sampleCount}}/管数</view>
-      <button style="background-color: #ddd;" hidden="ture">修 改</button>
-      <button style="color: #fff;" bindtap="saveInfo">保 存</button>
-    </view>
-
-    <scroll-view scroll-x class="tabel">
-      <view class="tr tab-top">
-        <view class="td1">序号</view>
-        <view class="td">样本条码号</view>
-        <view class="td">接收时间</view>
-        <view class="td">样本状态</view>
-        <view class="td">物流员</view>
-        <view class="td">物流单号</view>
-      </view>
-      <view class="tr" wx:for="{{sampleList}}" wx:key="index" data-id="{{index}}" bindtap="goDetail">
-        <view class="td1">{{index + 1}}</view>
-        <view class="td">{{item.barCode}}</view>
-        <view class="td">{{item.receiveTime}}</view>
-        <view wx:if="{{item.status == 0}}" class="td">未采样</view>
-        <view wx:elif="{{item.status == 1}}" class="td">已采样</view>
-        <view wx:elif="{{item.status == 2}}" class="td">已发货</view>
-        <view wx:elif="{{item.status == 3}}" class="td">已接收</view>
-        <view wx:elif="{{item.status == 4}}" class="td">重新采样</view>
-        <view wx:else class="td">其它</view>
-        <view class="td">{{item.logisticsMen}}</view>
-        <view class="td">{{item.logisticsNo}}</view>
-      </view>
-    </scroll-view>
-  </view>
 </view>

pages/meLogistics/meLogistics.wxss

@@ -39,10 +39,20 @@
 .from-con label{
   position: absolute;
   top: 5rpx;
+  color: red;
+  font-weight: 900;
+  font-size: 28rpx;
+}
+
+.from-con text{
+  position: absolute;
+  padding-left: 20rpx;
+  top: 5rpx;
   font-weight: 900;
   font-size: 28rpx;
   color: #333;
 }
+
 .from-con input{
   text-align: right;
   padding: 10rpx;
@@ -55,6 +65,7 @@
   display: flex;
   justify-content:space-between;
   align-items: center;
+  padding-left: 40rpx;
 }
 .bush button{
   width: 200rpx !important;
@@ -67,23 +78,31 @@
   height: 55rpx;
 }
 .bush-img{
+  
   display: flex;
   flex-wrap: wrap;
   justify-content:space-around;
-  padding: 10rpx 10rpx;
+  padding: 20rpx 10rpx;
   width: 100%;
 }
 .bush-img image{
-  width: 270rpx;
+  width: 100rpx;
-  height: 230rpx;
+  height: 100rpx;
   margin-top: 5rpx;
   border: 1rpx solid #999;
-  border-radius: 15rpx;
+  border-radius: 5rpx;
 }
 .back{
   margin-top: 15rpx;
 }
 
+.back_img_box{
+  margin-top: 20rpx;
+  padding-top: 10rpx;
+  background-color: #e6e6e6;
+  border-radius: 5rpx;
+}
+
 .con{
   display: flex;
   align-items: center;
@@ -138,5 +157,6 @@
   align-items: center;
   flex-wrap: nowrap;
   white-space: nowrap;
-  min-width: 70rpx;
+  padding: 0rpx 2rpx;
+  min-width: 30rpx;
 }

pages/threeLogistics/threeLogistics.js

@@ -347,6 +347,7 @@ Page({
     request.post(`/batch/addTranLogistics`, tempData).then(res => {
       console.log(JSON.stringify(res.data));
       if (res.data.code == 200) {
+        this.data.selfOrderCode = res.data.data
         //保存成功后,查询底部列表
         this.selSampleList();
       } else {

pages/threeLogistics/threeLogistics.wxml

@@ -71,7 +71,7 @@
 
   <view class="back">
     <view class="con">
-      <view style="flex: 1;">总计：200/管数</view>
+      <view style="flex: 1;">总计：{{sampleCount}}/管数</view>
       <button style="background-color: #ddd;" hidden="true">修 改</button>
       <button style="color: #fff;" bindtap="saveInfo">保 存</button>
     </view>

utils/dateSetting.js

@@ -3,7 +3,7 @@
 const date = new Date();
 const year = date.getFullYear();
 const month = date.getMonth() + 1;
-const day = date.getDay() + 9; //不知道为什么 + 1 的话,时间不是当前日
+const day = date.getDay() + 16; //不知道为什么 + 1 的话,时间不是当前日
 const hour = date.getHours();
 const minute = date.getMinutes();
 //确定月份呈现