智慧农业后台管理页面
zhongrj
2022-07-29 444ad1454ecb6df5dc748f5d991c16d58d278604
溯源码页面冲突解决
2 files modified
908 ■■■■ changed files
public/traceablityInfo.html 451 ●●●● patch | view | raw | blame | history
public/traceablityInfos.html 457 ●●●● patch | view | raw | blame | history
public/traceablityInfo.html
@@ -1,6 +1,7 @@
<!-- 手机扫描页 -->
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="divport" content="width=device-width, initial-scale=1.0">
@@ -8,11 +9,7 @@
        .top-log {
            position: relative;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .top-log .btn-grounp {
            position: absolute;
            left: 0;
@@ -24,22 +21,14 @@
            justify-content: space-around;
            background: transparent;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content {
            display: flex;
            flex-direction: column;
            align-items: center;
            justify-content: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .logo {
            position: relative;
            margin-top: 56px;
@@ -48,11 +37,7 @@
            border-radius: 50%;
            overflow: hidden;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .logo .btn {
            position: absolute;
            bottom: 0;
@@ -64,22 +49,14 @@
            font-size: 24px;
            color: #fff;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .title {
            margin-top: 30px;
            font-size: 48px;
            font-weight: bold;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .type {
            display: flex;
            margin-top: 10px;
@@ -91,22 +68,14 @@
            border-radius: 8px;
            overflow: hidden;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .type .sub {
            flex: 1;
            display: flex;
            align-items: center;
            justify-content: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .type .icon {
            width: 36px;
            display: flex;
@@ -114,11 +83,7 @@
            justify-content: center;
            background: #6AC077;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .date {
            display: flex;
            align-items: center;
@@ -131,62 +96,38 @@
            font-size: 34px;
            color: #5ABF78;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box {
            margin-top: 60px;
            padding: 0 30px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title {
            display: flex;
            align-items: center;
            height: 50px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title .l {
            width: 5px;
            height: 36px;
            background: #5ABF78;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title .title {
            margin-left: 20px;
            font-size: 36px;
            font-weight: bold;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title .border {
            flex: 1;
            margin: 13px;
            border-top: 1px dashed #D4DBE8;
            border-bottom: 1px dashed #D4DBE8;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title .status {
            display: flex;
            align-items: center;
@@ -194,29 +135,17 @@
            font-size: 24px;
            color: #5ABF78;
        }
<<<<<<< HEAD
        .model-box .model-title .statu.no {
            color: #EC9144;
        }
=======
        .model-box .model-title .statu.no {
            color: #EC9144;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title .status view {
            display: flex;
            align-items: center;
            justify-content: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content {
            display: flex;
            flex-direction: column;
@@ -224,90 +153,54 @@
            background: #fff;
            border-radius: 30px;
        }
<<<<<<< HEAD
        .model-box.qw .model-content .box:first-child {
            border: 2px solid #EEEEEE;
        }
=======
        .model-box.qw .model-content .box:first-child {
            border: 2px solid #EEEEEE;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box {
            flex: 1;
            display: flex;
            padding: 30px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box>.r {
            margin-left: 26px;
            flex: 1;
            font-size: 24px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box>.r .title {
            font-size: 32px;
            font-weight: bold;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box>.r .line-box {
            margin-top: 16px;
            display: flex;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box>.r .line-box .sub {
            width: 120px;
            color: #333333;
            line-height: 36px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box>.r .line-box .content {
            flex: 1;
            color: #666666;
            line-height: 36px;
        }
        /* 容器 */
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content {
            margin-top: 30px;
            background: #fff;
            border-radius: 30px;
        }
        /* 头部 */
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content .content-header {
            display: flex;
            align-items: center;
@@ -316,57 +209,33 @@
            font-size: 30px;
            color: #5ABF78;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-header {
            color: #A255B5;
            border-bottom: 2px solid #ECECEC;
        }
        /* 中间 */
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.dk .content-body {
            height: 450px;
            background: greenyellow;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jksp .content-body {
            height: 385px;
            background: #A255B5;
        }
<<<<<<< HEAD
        .model-box.cd .model-content.jk .content-body {
            border-bottom: 1px solid transparent;
        }
=======
        .model-box.cd .model-content.jk .content-body {
            border-bottom: 1px solid transparent;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box {
            margin: 26px 22px;
            border-radius: 28px;
            border: 2px solid #E3E3E3;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-title {
            padding: 0 22px;
            margin-top: 10px;
@@ -378,11 +247,7 @@
            font-weight: bold;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-date {
            display: flex;
            align-items: center;
@@ -391,11 +256,7 @@
            height: 2px;
            background: #ECECEC;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-date .site-date-text {
            padding: 0 18px;
            height: 36px;
@@ -404,22 +265,14 @@
            font-size: 24px;
            color: #929292;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content {
            padding: 24px 22px;
            display: flex;
            flex-wrap: wrap;
            justify-content: space-between;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view {
            display: flex;
            align-items: center;
@@ -431,77 +284,43 @@
            border-radius: 8px;
            box-sizing: border-box;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(1),
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(2) {
            margin-top: 0;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view .type {
            font-size: 28px;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view .unit {
            margin-top: 4px;
            font-size: 24px;
            color: #84898F;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view .r {
            font-size: 38px;
            color: #5ABF78;
        }
        /* 底部 */
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content .content-footer {
            display: flex;
            align-items: center;
            height: 120px;
            font-size: 24px;
        }
<<<<<<< HEAD
        .model-box.cd .model-content.dk .content-footer {
            padding: 0 26px;
        }
=======
        .model-box.cd .model-content.dk .content-footer {
            padding: 0 26px;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.dk .content-footer .l {
            width: 480px;
            color: #666666;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.dk .content-footer .r {
            flex: 1;
            display: flex;
@@ -509,19 +328,11 @@
            justify-content: center;
            color: #5ABF78;
        }
<<<<<<< HEAD
        .model-box.cd .model-content.jksp .content-footer {
            padding: 0 30px;
        }
=======
        .model-box.cd .model-content.jksp .content-footer {
            padding: 0 30px;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jksp .content-footer .equi-btn {
            display: flex;
            align-items: center;
@@ -535,48 +346,28 @@
            font-size: 24px;
            color: #697580;
        }
<<<<<<< HEAD
        .model-box.cd .model-content.jksp .content-footer .equi-btn:first-child {
            margin-left: 0;
        }
=======
        .model-box.cd .model-content.jksp .content-footer .equi-btn:first-child {
            margin-left: 0;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jksp .content-footer .equi-btn.on {
            background: linear-gradient(90deg, #5ABB82 0%, #7BDA8F 100%);
            border: none;
            color: #fff;
        }
        /* 种植环节 */
<<<<<<< HEAD
        .model-box.zz .model-content {
            margin-top: 30px;
        }
=======
        .model-box.zz .model-content {
            margin-top: 30px;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .msg {
            display: flex;
            align-items: center;
            height: 126px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .msg .r {
            margin-left: 30px;
            padding: 10px 26px;
@@ -587,29 +378,17 @@
            color: #999999;
            border-radius: 16px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .msg .r text {
            font-weight: bold;
            color: #EC9144;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .msg .r .r-b-msg {
            margin-top: 10px;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .msg .r .point-to {
            position: absolute;
            top: 0;
@@ -624,20 +403,12 @@
            border-bottom: 14px solid transparent;
            z-index: -1;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box {
            display: flex;
            align-items: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .l {
            margin-left: 40px;
            display: flex;
@@ -645,92 +416,56 @@
            align-items: center;
            justify-content: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .l .point {
            width: 20px;
            height: 20px;
            background: #5ABF78;
            border-radius: 50%;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .l .line {
            width: 2px;
            height: 150px;
            background: #DEE3E7;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .l .line.one {
            width: 2px;
            height: 100px;
            background: #DEE3E7;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .l .line.two {
            width: 2px;
            height: 100px;
            background: #DEE3E7;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r {
            margin-left: 64px;
            flex: 1;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r .record-item {
            margin-top: 30px;
            padding: 32px 30px 42px;
            background: #FFFFFF;
            border-radius: 30px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r .record-item .type {
            font-size: 32px;
            font-weight: bold;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r .record-item .date-pel {
            margin-top: 10px;
            display: flex;
            justify-content: space-between;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r .record-item .date-pel .date {
            padding: 2px 20px;
            font-size: 24px;
@@ -738,32 +473,20 @@
            background: linear-gradient(89deg, #60BA84 0%, #73DB90 100%);
            border-radius: 10px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r .record-item .date-pel .pel {
            font-size: 28px;
            color: #666666;
        }
        /* 生产企业 */
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content {
            margin-top: 30px;
            /* padding-bottom: 30px; */
            background: #fff;
            border-radius: 30px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-header {
            display: flex;
            align-items: center;
@@ -773,46 +496,26 @@
            font-weight: bold;
            color: #000000;
        }
<<<<<<< HEAD
        .model-box.sc .model-content .content-body {
            height: 390px;
        }
=======
        .model-box.sc .model-content .content-body {
            height: 390px;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-body .swiper {
            height: 100%;
            width: 100%;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-body .swiper-image {
            height: 100%;
            width: 100%;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-body .slide-image {
            height: 100%;
            width: 100%;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .text-intro {
            margin: 0 25px;
            padding: 20px 0 34px;
@@ -821,42 +524,26 @@
            color: #818592;
            border-bottom: 2px solid #EAEEF4;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-footer {
            margin-top: 24px;
            display: flex;
            align-items: flex-start;
            justify-content: space-around;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-footer>view {
            display: flex;
            flex-direction: column;
            align-items: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-footer>view .type {
            margin-top: 6px;
            font-size: 24px;
            color: #697580;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-footer>view .msg {
            margin-top: 2px;
            padding: 2px 6px;
@@ -865,22 +552,14 @@
            font-size: 20px;
            color: #697580;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .btn-grounp {
            margin-top: 84px;
            display: flex;
            height: 148px;
            background: #FFFFFF;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .btn-grounp .l {
            margin-right: 76px;
            width: 194px;
@@ -889,31 +568,19 @@
            align-items: center;
            justify-content: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .btn-grounp .l .plan {
            font-size: 34px;
            font-weight: bold;
            color: #D55B26;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .btn-grounp .l .text {
            margin-top: 2px;
            font-size: 20px;
            color: #A5AEB5;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .btn-grounp .r {
            flex: 1;
            display: flex;
@@ -923,15 +590,15 @@
    <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
    <script src="https://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
</head>
<body>
    <div class="page-main-container" style="background: #F1F9F8;width:100%;height: 100%;">
        <!-- <scroll-div scroll-top="{{scrollTop}}" refresher-enabled="{{true}}" bindrefresherrefresh="refresh" refresher-triggered="{{triggered}}" style="height: {{clientHeight}}" scroll-y bindscrolltolower="upcroll"> -->
        <!-- </scroll-div> -->
    </div>
    <script>
        var getData = function(name) {
@@ -941,13 +608,13 @@
            return null;
        };
        var code = getData("code");
        // var code = "22070000001";
        axios.get('https://dev.jxpskj.com:8023/api/traceability/getTraceabilityDetailInfos?code=' + code).then(function(res) {
            // axios.get('http://192.168.0.114:89/traceability/getTraceabilityDetailInfo?code=' + code).then(function(res) {
            var data = res.data.data;
            var farm = data.farm;
            var land = data.landVO;
@@ -955,7 +622,7 @@
            var paperList = data.paperVOList;
            var recordVOList = data.recordVOList;
            var recovery = data.recoveryVO;
            var str0 = `<div class="top-log">
            <img width="100%" height="405px" src="http://182.106.212.58:8014/assets/images/sym/2.png" />
            <div class="btn-grounp">
@@ -965,30 +632,30 @@
                <img bindtap="scrollTo" data-class=".sc" width="176px" height="80px" src="http://182.106.212.58:8014/assets/images/sy/1414.png" />
            </div>
        </div>
        <div class="main-content">
            <div class="logo">
                <img width="100%" height="100%" src="${recovery.url}" />
                <!-- <div class="btn">更换图片</div> -->
            </div>
            <div class="title">${recovery.strainName}</div>
            <div class="type">
                <div class="sub">${recovery.lx}</div>
                <!-- <div class="icon">
                <van-icon name="play" />
              </div> -->
            </div>
            <div class="date">
                采收时间:${recovery.time.replaceAll("-",".")}
            </div>
        </div>
        <div class="qw model-box">
        <div class="model-title">
            <div class="l"></div>
            <div class="title">权威检测</div>
@@ -1000,7 +667,7 @@
                可追溯
            </div>
        </div>
        <div class="model-content">`
            var str1 = '';
            if (paperList.length > 0) {
@@ -1032,17 +699,12 @@
            } else {
                str1 = str1 + `<div class="box"></div>`
            }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
            var str2 = `
            </div>
        </div>
        <div class="cd model-box">
            <div class="model-title">
                <div class="l"></div>
@@ -1055,7 +717,7 @@
                    可追溯
                </div>
            </div>
            <div class="dk model-content">
                <div class="content-header">
                    <van-icon style="margin-right: 12px;" name="http://182.106.212.58:8014/assets/images/sy/1267.png" /> 种植地块
@@ -1073,7 +735,7 @@
                </div> -->
                </div>
            </div>
            <div class="jksp model-content">
                <div class="content-header">
                    <van-icon style="margin-right: 12px;" name="http://182.106.212.58:8014/assets/images/sy/1272.png" /> 良心生产,不怕监督,24小时视频监控
@@ -1083,13 +745,13 @@
                    <div class="equi-btn on">
                        3号摄像头
                    </div>
                    <div class="equi-btn">
                        3号摄像头
                    </div>
                </div>
            </div>
            <div class="jk model-content">
                <div class="content-header">
                    物联网监控保证产地养分充足,且不被污染
@@ -1108,7 +770,7 @@
                            <div class="site-date-text">6分钟前更新</div>
                        </div>
                        <div class="site-content">
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1120,7 +782,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1132,7 +794,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1144,7 +806,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1156,7 +818,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1168,7 +830,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1180,7 +842,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1192,7 +854,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1204,7 +866,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1216,7 +878,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1228,7 +890,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1240,13 +902,13 @@
                                    33.92
                                </div>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <div class="zz model-box">
            <div class="model-title">
                <div class="l"></div>
@@ -1259,9 +921,9 @@
                </div> -->
                </div>
            </div>
            <div class="model-content">
                <div class="msg">
                    <div class="l">
                        <img width="126px" height="126px" src="http://182.106.212.58:8014/assets/images/sy/zz-log.png" />
@@ -1274,25 +936,25 @@
                        <div class="r-b-msg">
                            以下农事操作,是在我的监督下完成
                        </div>
                        <div class="point-to"></div>
                    </div>
                </div>`
            var str3 = '';
            recordVOList.forEach((item, index) => {
                str3 = str3 + `<div class="record-box">
                    <div class="l">
                        <div class="one  line" style="${ index == 0 ? 'background: transparent !important;' : '' }">
                        </div>
                        <div class="point">
                        </div>
                        <div class="two line" style="${ index == recordVOList.length - 1 ? 'background: transparent !important;' : '' }">
                        </div>
                    </div>
                    <div class="r">
                        <div class="record-item">
@@ -1302,14 +964,14 @@
                                <div class="pel">操作人:${item.realName}</div>
                            </div>
                        </div>
                    </div>
                </div>`
            });
            var str4 = `</div>
        </div>
        <div class="sc model-box">
            <div class="model-title">
                <div class="l"></div>
@@ -1322,7 +984,7 @@
                </div> -->
                </div>
            </div>
            <div class="model-content">
                <div class="content-header">
                    ${farm.farmName}
@@ -1340,7 +1002,7 @@
                })
            }
            var str6 = `</block></swiper>
                </div>
                <div class="text-intro">
                    ${farm.introduce}
@@ -1349,7 +1011,7 @@
                </div>
            </div>
        </div>`
            // <div class="btn-grounp">
            //     <div class="l">
            //         <div class="plan">
@@ -1361,21 +1023,16 @@
            //     </div>
            //     <div class="r">
            //         <van-button bind:click="editTracability" round custom-style="margin-right: 40px; width: 200px; height: 72px; border: 2px solid #5ABF78; background: #fff; color: #5ABF78; font-size: 30px;">编辑溯源</van-button>
            //         <van-button bind:click="submit" round custom-style="width: 200px; height: 72px; border: none; background: #5ABF78; color: #fff; font-size: 30px;">分享</van-button>
            //     </div>
            // </div>
            var dom = $('.page-main-container');
            dom.empty();
            dom.append(str0 + str1 + str2 + str3 + str4 + str5 + str6);
        });
    </script>
</body>
<<<<<<< HEAD
</html>
=======
</html>
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
public/traceablityInfos.html
@@ -1,6 +1,7 @@
<!-- WEB 详情页 -->
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="divport" content="width=device-width, initial-scale=1.0">
@@ -8,11 +9,7 @@
        .top-log {
            position: relative;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .top-log .btn-grounp {
            position: absolute;
            left: 0;
@@ -24,22 +21,14 @@
            justify-content: space-around;
            background: transparent;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content {
            display: flex;
            flex-direction: column;
            align-items: center;
            justify-content: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .logo {
            position: relative;
            margin-top: 56px;
@@ -48,11 +37,7 @@
            border-radius: 50%;
            overflow: hidden;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .logo .btn {
            position: absolute;
            bottom: 0;
@@ -64,22 +49,14 @@
            font-size: 24px;
            color: #fff;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .title {
            margin-top: 30px;
            font-size: 48px;
            font-weight: bold;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .type {
            display: flex;
            margin-top: 10px;
@@ -91,22 +68,14 @@
            border-radius: 8px;
            overflow: hidden;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .type .sub {
            flex: 1;
            display: flex;
            align-items: center;
            justify-content: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .type .icon {
            width: 36px;
            display: flex;
@@ -114,11 +83,7 @@
            justify-content: center;
            background: #6AC077;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .main-content .date {
            display: flex;
            align-items: center;
@@ -131,62 +96,38 @@
            font-size: 34px;
            color: #5ABF78;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box {
            margin-top: 60px;
            padding: 0 30px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title {
            display: flex;
            align-items: center;
            height: 50px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title .l {
            width: 5px;
            height: 36px;
            background: #5ABF78;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title .title {
            margin-left: 20px;
            font-size: 36px;
            font-weight: bold;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title .border {
            flex: 1;
            margin: 13px;
            border-top: 1px dashed #D4DBE8;
            border-bottom: 1px dashed #D4DBE8;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title .status {
            display: flex;
            align-items: center;
@@ -194,121 +135,72 @@
            font-size: 24px;
            color: #5ABF78;
        }
<<<<<<< HEAD
        .model-box .model-title .statu.no {
            color: #EC9144;
        }
=======
        .model-box .model-title .statu.no {
            color: #EC9144;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box .model-title .status view {
            display: flex;
            align-items: center;
            justify-content: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content {
            display: flex;
            flex-direction: column;
            margin-top: 30px;
            /* height: 642px; */
            background: #fff;
            border-radius: 30px;
        }
<<<<<<< HEAD
        .model-box.qw .model-content .box:first-child {
            border: 2px solid #EEEEEE;
        }
=======
        .model-box.qw .model-content .box:first-child {
            border: 2px solid #EEEEEE;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box {
            flex: 1;
            display: flex;
            padding: 30px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box>.r {
            margin-left: 26px;
            flex: 1;
            font-size: 24px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box>.r .title {
            font-size: 32px;
            font-weight: bold;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box>.r .line-box {
            margin-top: 16px;
            display: flex;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box>.r .line-box .sub {
            width: 120px;
            color: #333333;
            line-height: 36px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.qw .model-content .box>.r .line-box .content {
            flex: 1;
            color: #666666;
            line-height: 36px;
        }
        /* 容器 */
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content {
            margin-top: 30px;
            background: #fff;
            border-radius: 30px;
        }
        /* 头部 */
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content .content-header {
            display: flex;
            align-items: center;
@@ -317,57 +209,33 @@
            font-size: 30px;
            color: #5ABF78;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-header {
            color: #A255B5;
            border-bottom: 2px solid #ECECEC;
        }
        /* 中间 */
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.dk .content-body {
            height: 450px;
            background: greenyellow;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jksp .content-body {
            height: 385px;
            background: #A255B5;
        }
<<<<<<< HEAD
        .model-box.cd .model-content.jk .content-body {
            border-bottom: 1px solid transparent;
        }
=======
        .model-box.cd .model-content.jk .content-body {
            border-bottom: 1px solid transparent;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box {
            margin: 26px 22px;
            border-radius: 28px;
            border: 2px solid #E3E3E3;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-title {
            padding: 0 22px;
            margin-top: 10px;
@@ -379,11 +247,7 @@
            font-weight: bold;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-date {
            display: flex;
            align-items: center;
@@ -392,11 +256,7 @@
            height: 2px;
            background: #ECECEC;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-date .site-date-text {
            padding: 0 18px;
            height: 36px;
@@ -405,22 +265,14 @@
            font-size: 24px;
            color: #929292;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content {
            padding: 24px 22px;
            display: flex;
            flex-wrap: wrap;
            justify-content: space-between;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view {
            display: flex;
            align-items: center;
@@ -432,77 +284,43 @@
            border-radius: 8px;
            box-sizing: border-box;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(1),
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(2) {
            margin-top: 0;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view .type {
            font-size: 28px;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view .unit {
            margin-top: 4px;
            font-size: 24px;
            color: #84898F;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jk .content-body .site-box .site-content>view .r {
            font-size: 38px;
            color: #5ABF78;
        }
        /* 底部 */
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content .content-footer {
            display: flex;
            align-items: center;
            height: 120px;
            font-size: 24px;
        }
<<<<<<< HEAD
        .model-box.cd .model-content.dk .content-footer {
            padding: 0 26px;
        }
=======
        .model-box.cd .model-content.dk .content-footer {
            padding: 0 26px;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.dk .content-footer .l {
            width: 480px;
            color: #666666;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.dk .content-footer .r {
            flex: 1;
            display: flex;
@@ -510,19 +328,11 @@
            justify-content: center;
            color: #5ABF78;
        }
<<<<<<< HEAD
        .model-box.cd .model-content.jksp .content-footer {
            padding: 0 30px;
        }
=======
        .model-box.cd .model-content.jksp .content-footer {
            padding: 0 30px;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jksp .content-footer .equi-btn {
            display: flex;
            align-items: center;
@@ -536,48 +346,28 @@
            font-size: 24px;
            color: #697580;
        }
<<<<<<< HEAD
        .model-box.cd .model-content.jksp .content-footer .equi-btn:first-child {
            margin-left: 0;
        }
=======
        .model-box.cd .model-content.jksp .content-footer .equi-btn:first-child {
            margin-left: 0;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.cd .model-content.jksp .content-footer .equi-btn.on {
            background: linear-gradient(90deg, #5ABB82 0%, #7BDA8F 100%);
            border: none;
            color: #fff;
        }
        /* 种植环节 */
<<<<<<< HEAD
        .model-box.zz .model-content {
            margin-top: 30px;
        }
=======
        .model-box.zz .model-content {
            margin-top: 30px;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .msg {
            display: flex;
            align-items: center;
            height: 126px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .msg .r {
            margin-left: 30px;
            padding: 10px 26px;
@@ -588,29 +378,17 @@
            color: #999999;
            border-radius: 16px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .msg .r text {
            font-weight: bold;
            color: #EC9144;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .msg .r .r-b-msg {
            margin-top: 10px;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .msg .r .point-to {
            position: absolute;
            top: 0;
@@ -625,20 +403,12 @@
            border-bottom: 14px solid transparent;
            z-index: -1;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box {
            display: flex;
            align-items: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .l {
            margin-left: 40px;
            display: flex;
@@ -646,92 +416,56 @@
            align-items: center;
            justify-content: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .l .point {
            width: 20px;
            height: 20px;
            background: #5ABF78;
            border-radius: 50%;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .l .line {
            width: 2px;
            height: 150px;
            background: #DEE3E7;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .l .line.one {
            width: 2px;
            height: 100px;
            background: #DEE3E7;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .l .line.two {
            width: 2px;
            height: 100px;
            background: #DEE3E7;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r {
            margin-left: 64px;
            flex: 1;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r .record-item {
            margin-top: 30px;
            padding: 32px 30px 42px;
            background: #FFFFFF;
            border-radius: 30px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r .record-item .type {
            font-size: 32px;
            font-weight: bold;
            color: #333333;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r .record-item .date-pel {
            margin-top: 10px;
            display: flex;
            justify-content: space-between;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r .record-item .date-pel .date {
            padding: 2px 20px;
            font-size: 24px;
@@ -739,32 +473,20 @@
            background: linear-gradient(89deg, #60BA84 0%, #73DB90 100%);
            border-radius: 10px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.zz .model-content .record-box .r .record-item .date-pel .pel {
            font-size: 28px;
            color: #666666;
        }
        /* 生产企业 */
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content {
            margin-top: 30px;
            /* padding-bottom: 30px; */
            background: #fff;
            border-radius: 30px;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-header {
            display: flex;
            align-items: center;
@@ -774,46 +496,26 @@
            font-weight: bold;
            color: #000000;
        }
<<<<<<< HEAD
        .model-box.sc .model-content .content-body {
            height: 390px;
        }
=======
        .model-box.sc .model-content .content-body {
            height: 390px;
        }
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-body .swiper {
            height: 100%;
            width: 100%;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-body .swiper-image {
            height: 100%;
            width: 100%;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-body .slide-image {
            height: 100%;
            width: 100%;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .text-intro {
            margin: 0 25px;
            padding: 20px 0 34px;
@@ -822,42 +524,26 @@
            color: #818592;
            border-bottom: 2px solid #EAEEF4;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-footer {
            margin-top: 24px;
            display: flex;
            align-items: flex-start;
            justify-content: space-around;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-footer>view {
            display: flex;
            flex-direction: column;
            align-items: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-footer>view .type {
            margin-top: 6px;
            font-size: 24px;
            color: #697580;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .model-box.sc .model-content .content-footer>view .msg {
            margin-top: 2px;
            padding: 2px 6px;
@@ -866,22 +552,14 @@
            font-size: 20px;
            color: #697580;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .btn-grounp {
            margin-top: 84px;
            display: flex;
            height: 148px;
            background: #FFFFFF;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .btn-grounp .l {
            margin-right: 76px;
            width: 194px;
@@ -890,31 +568,19 @@
            align-items: center;
            justify-content: center;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .btn-grounp .l .plan {
            font-size: 34px;
            font-weight: bold;
            color: #D55B26;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .btn-grounp .l .text {
            margin-top: 2px;
            font-size: 20px;
            color: #A5AEB5;
        }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        .btn-grounp .r {
            flex: 1;
            display: flex;
@@ -924,15 +590,15 @@
    <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
    <script src="https://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
</head>
<body>
    <div class="page-main-container" style="background: #F1F9F8;width:100%;height: 100%;">
        <!-- <scroll-div scroll-top="{{scrollTop}}" refresher-enabled="{{true}}" bindrefresherrefresh="refresh" refresher-triggered="{{triggered}}" style="height: {{clientHeight}}" scroll-y bindscrolltolower="upcroll"> -->
        <!-- </scroll-div> -->
    </div>
    <script>
        var getData = function(name) {
@@ -942,20 +608,13 @@
            return null;
        };
        var code = getData("code");
<<<<<<< HEAD
        // var code = "22070000002";
        // var code = "22070000001";
=======
        // var code = "22070000002";
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
        axios.get('https://dev.jxpskj.com:8023/api/traceability/getTraceabilityDetailInfo?code=' + code).then(function(res) {
            // axios.get('http://192.168.0.114:89/traceability/getTraceabilityDetailInfo?code==22060000002').then(function(res) {
            // axios.get('http://192.168.0.114:89/traceability/getTraceabilityDetailInfo?code=' + code).then(function(res) {
            var data = res.data.data;
            var farm = data.farm;
            var land = data.landVO;
@@ -963,7 +622,7 @@
            var paperList = data.paperVOList;
            var recordVOList = data.recordVOList;
            var recovery = data.recoveryVO;
            var str0 = `<div class="top-log">
            <img width="100%" height="405px" src="http://182.106.212.58:8014/assets/images/sym/2.png" />
            <div class="btn-grounp">
@@ -973,30 +632,30 @@
                <img bindtap="scrollTo" data-class=".sc" width="176px" height="80px" src="http://182.106.212.58:8014/assets/images/sy/1414.png" />
            </div>
        </div>
        <div class="main-content">
            <div class="logo">
                <img width="100%" height="100%" src="${recovery.url}" />
                <!-- <div class="btn">更换图片</div> -->
            </div>
            <div class="title">${recovery.strainName}</div>
            <div class="type">
                <div class="sub">${recovery.lx}</div>
                <!-- <div class="icon">
                <van-icon name="play" />
              </div> -->
            </div>
            <div class="date">
                采收时间:${recovery.time.replaceAll("-",".")}
            </div>
        </div>
        <div class="qw model-box">
        <div class="model-title">
            <div class="l"></div>
            <div class="title">权威检测</div>
@@ -1008,7 +667,7 @@
                可追溯
            </div>
        </div>
        <div class="model-content">`
            var str1 = '';
            if (paperList.length > 0) {
@@ -1040,17 +699,12 @@
            } else {
                str1 = str1 + `<div class="box"></div>`
            }
<<<<<<< HEAD
=======
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
            var str2 = `
            </div>
        </div>
        <div class="cd model-box">
            <div class="model-title">
                <div class="l"></div>
@@ -1063,7 +717,7 @@
                    可追溯
                </div>
            </div>
            <div class="dk model-content">
                <div class="content-header">
                    <van-icon style="margin-right: 12px;" name="http://182.106.212.58:8014/assets/images/sy/1267.png" /> 种植地块
@@ -1081,7 +735,7 @@
                </div> -->
                </div>
            </div>
            <div class="jksp model-content">
                <div class="content-header">
                    <van-icon style="margin-right: 12px;" name="http://182.106.212.58:8014/assets/images/sy/1272.png" /> 良心生产,不怕监督,24小时视频监控
@@ -1091,13 +745,13 @@
                    <div class="equi-btn on">
                        3号摄像头
                    </div>
                    <div class="equi-btn">
                        3号摄像头
                    </div>
                </div>
            </div>
            <div class="jk model-content">
                <div class="content-header">
                    物联网监控保证产地养分充足,且不被污染
@@ -1116,7 +770,7 @@
                            <div class="site-date-text">6分钟前更新</div>
                        </div>
                        <div class="site-content">
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1128,7 +782,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1140,7 +794,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1152,7 +806,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1164,7 +818,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1176,7 +830,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1188,7 +842,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1200,7 +854,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1212,7 +866,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1224,7 +878,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1236,7 +890,7 @@
                                    33.92
                                </div>
                            </div>
                            <div>
                                <div class="l">
                                    <div class="type">空气温度</div>
@@ -1248,13 +902,13 @@
                                    33.92
                                </div>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <div class="zz model-box">
            <div class="model-title">
                <div class="l"></div>
@@ -1267,9 +921,9 @@
                </div> -->
                </div>
            </div>
            <div class="model-content">
                <div class="msg">
                    <div class="l">
                        <img width="126px" height="126px" src="http://182.106.212.58:8014/assets/images/sy/zz-log.png" />
@@ -1282,25 +936,25 @@
                        <div class="r-b-msg">
                            以下农事操作,是在我的监督下完成
                        </div>
                        <div class="point-to"></div>
                    </div>
                </div>`
            var str3 = '';
            recordVOList.forEach((item, index) => {
                str3 = str3 + `<div class="record-box">
                    <div class="l">
                        <div class="one  line" style="${ index == 0 ? 'background: transparent !important;' : '' }">
                        </div>
                        <div class="point">
                        </div>
                        <div class="two line" style="${ index == recordVOList.length - 1 ? 'background: transparent !important;' : '' }">
                        </div>
                    </div>
                    <div class="r">
                        <div class="record-item">
@@ -1310,14 +964,14 @@
                                <div class="pel">操作人:${item.realName}</div>
                            </div>
                        </div>
                    </div>
                </div>`
            });
            var str4 = `</div>
        </div>
        <div class="sc model-box">
            <div class="model-title">
                <div class="l"></div>
@@ -1330,7 +984,7 @@
                </div> -->
                </div>
            </div>
            <div class="model-content">
                <div class="content-header">
                    ${farm.farmName}
@@ -1348,7 +1002,7 @@
                })
            }
            var str6 = `</block></swiper>
                </div>
                <div class="text-intro">
                    ${farm.introduce}
@@ -1357,7 +1011,7 @@
                </div>
            </div>
        </div>`
            // <div class="btn-grounp">
            //     <div class="l">
            //         <div class="plan">
@@ -1369,21 +1023,16 @@
            //     </div>
            //     <div class="r">
            //         <van-button bind:click="editTracability" round custom-style="margin-right: 40px; width: 200px; height: 72px; border: 2px solid #5ABF78; background: #fff; color: #5ABF78; font-size: 30px;">编辑溯源</van-button>
            //         <van-button bind:click="submit" round custom-style="width: 200px; height: 72px; border: none; background: #5ABF78; color: #fff; font-size: 30px;">分享</van-button>
            //     </div>
            // </div>
            var dom = $('.page-main-container');
            dom.empty();
            dom.append(str0 + str1 + str2 + str3 + str4 + str5 + str6);
        });
    </script>
</body>
<<<<<<< HEAD
</html>
=======
</html>
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356