Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/api/agriculturalTrusteeship/index.js

@@ -280,6 +280,17 @@ export function supplyorderReject(id) {
   })
 }
 
+// 接单
+export function supplyorderFinish(id) {
+  return request({
+    url: '/depositm/supplyorder/finish/'+id,
+    headers: {
+      "ACCESS-SESSION-ID": Cookies.get('ACCESS-SESSION-ID')
+    },
+    method: 'post',
+  })
+}
+
 //订单列表
 export function supplyorderList(query) {
   return request({
@@ -295,7 +306,7 @@ export function supplyorderList(query) {
 //服务组织订单统计
 export function orderStatistics(query) {
   return request({
-    url: '/depositm/entity/orderStatistics',
+    url: '/depositm/supplyorder/orderStatistics',
     headers: {
       "ACCESS-SESSION-ID": Cookies.get('ACCESS-SESSION-ID')
     },

src/views/agriculturalTrusteeship/socialization/bill.vue

@@ -7,7 +7,7 @@
         <input type="text" placeholder="输入需求进行搜索" />
         <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" />
       </div>
-      <img src="../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_01.png" alt="" @click="show = true;">
+      <img src="../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_01.png" alt="" @click="show = true">
     </div>
     <!--  头部结束  -->
 
@@ -65,11 +65,12 @@
           </div>
 
           <div class="main_content_right_list_center" @click="$router.push({name:'agriculturalTrusteeshipSocializationBillDetail',query:{id:item.id}})">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
             <div class="main_content_right_list_content">
               <p class="tt">{{item.contractionName}}</p>
               <div class="tab">
-                <p>￥<span>{{item.realityServiceMoney}}</span>.00</p>
+                <p>￥<span>{{item.unitPrice}}</span>.00/{{item.unit}}</p>
               </div>
               <p class="name">
                 <span>数量：{{item.serviceNum}}</span>
@@ -77,7 +78,7 @@
               </p>
             </div>
           </div>
-          <van-cell title="买方名称" :border="false" :value="item.bookName" />
+          <van-cell title="卖方名称" :border="false" :value="item.bookName" />
           <van-cell title="联系人" :border="false" :value="item.linkera" />
           <van-cell title="联系电话" :border="false" :value="item.phonea" />
         </div>
@@ -91,40 +92,39 @@
         <p>筛选</p>
       </div>
       <div class="popup_content">
-        <div class="selected">
-          <p class="off">全套服务</p>
-        </div>
-        <div class="selected">
-          <p class="off">灌溉</p>
-        </div>
-        <div class="selected">
-          <p class="off">除草</p>
-        </div>
-        <div class="selected">
-          <p class="on">播种</p>
+<!--        <div class="selected">-->
+<!--          <p class="off">全套服务</p>-->
+<!--        </div>-->
+<!--        <div class="selected">-->
+<!--          <p class="off">灌溉</p>-->
+<!--        </div>-->
+<!--        <div class="selected">-->
+<!--          <p class="off">除草</p>-->
+<!--        </div>-->
+        <div class="selected" v-for="(item,index) in productList2" :key="index">
+          <p class="on">{{item.dictName}}</p>
           <div class="options">
-            <p class="active">全部</p>
-            <p>服务</p>
-            <p>种子</p>
-          </div>
-        </div>
-        <div class="selected">
-          <p class="on">施肥</p>
-          <div class="options">
-            <p>全部</p>
-            <p>服务</p>
-            <p>种子</p>
+            <p :class="{'active':query.productType == ''}" @click="query.productType = ''">全部</p>
+            <p :class="{'active':query.productType == itemChild.id}" @click="query.productType = itemChild.id" v-for="(itemChild,indexChild) in item.children" :key="indexChild">{{itemChild.dictName}}</p>
           </div>
         </div>
+<!--        <div class="selected">-->
+<!--          <p class="on">施肥</p>-->
+<!--          <div class="options">-->
+<!--            <p>全部</p>-->
+<!--            <p>服务</p>-->
+<!--            <p>种子</p>-->
+<!--          </div>-->
+<!--        </div>-->
       </div>
       <div class="popup_header" style="margin-top: 4vh;">
         <img src="../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_01.png" width="15" alt="">
         <p>时间</p>
       </div>
       <div class="popup_date">
-        <p>2021年11月</p>
+        <p @click="startTimeShow = true">{{startOrderAt}}</p>
         <span>-</span>
-        <p>2021年11月</p>
+        <p @click="endTimeShow = true">{{endOrderAt}}</p>
       </div>
       <div class="popup_header" style="margin-top: 4vh;">
         <img src="../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_01.png" width="15" alt="">
@@ -133,17 +133,16 @@
       <div class="popup_content">
         <div class="selected">
           <div class="options">
-            <p class="active">全部</p>
-            <p>服务</p>
-            <p>种子</p>
+            <p :class="{'active':query.orderStatus == ''}" @click="query.orderStatus = ''">全部</p>
+            <p :class="{'active':query.orderStatus == item.dictValue}" @click="query.orderStatus = item.dictValue" v-for="(item,index) in orderStatusOptions" :key="index">{{item.dictLabel}}</p>
           </div>
         </div>
       </div>
 
       <div class="popup_btn">
-        <p>确定</p>
-        <p>取消</p>
-        <p>重置</p>
+        <p @click="show = false,supplyDemandList = [],getList()">确定</p>
+        <p @click="show = false">取消</p>
+        <p @click="cancel">重置</p>
       </div>
     </van-popup>
     <agr></agr>
@@ -179,6 +178,7 @@
         cropTypeOptions:[],
         orderStatusOptions:[],
         productList:[],
+        productList2:[],
         currentDateStar: new Date(),
         currentDateEnd: new Date(),
         query:{
@@ -188,6 +188,7 @@
           startOrderAt :this.format(new Date(),'yyyy-MM'),
           endOrderAt :this.format(new Date(),'yyyy-MM'),
           orderStatus :'',
+          productType:''
         },
         startOrderAt:this.format(new Date(),'yyyy年MM月'),
         endOrderAt:this.format(new Date(),'yyyy年MM月'),
@@ -199,16 +200,28 @@
       };
     },
     created() {
-      // orderStatistics().then(response => {
-      //   this.content = response.data;
-      // });
+      orderStatistics().then(response => {
+        this.content = response.data;
+      });
       let query = {
-        parentId : 0,
+        parentId : null,
         tree:true
       }
       productTypes(query).then(response => {
         this.productList = response.data;
       });
+      let query2 = {
+        parentId : null,
+        tree:false
+      }
+      productTypes(query2).then(response => {
+        response.data.map(res=>{
+          res.children.map(rr=>{
+            rr.active = false;
+          })
+        })
+        this.productList2 = response.data;
+      });
       this.getDicts("crop_type").then(response => {
           this.cropTypeOptions = response.data;
       });
@@ -220,6 +233,10 @@
       getList(){
         supplyorderList(this.query).then(response => {
           response.rows.map(res=>{
+            if (res.supplyMasterMap){
+              let supplyMasterMap = res.supplyMasterMap.split( "," )
+              res.supplyMasterMap = '/api'+supplyMasterMap[0]
+            }
             res.cropType = this.selectDictLabel(this.cropTypeOptions, res.cropType);
             res.orderStatus = this.selectDictLabel(this.orderStatusOptions, res.orderStatus);
             res.productType = this.productList.filter(function (e) { return e.id == res.productType; })[0].dictName;
@@ -235,28 +252,41 @@
         });
       },
       onConfirmStar(data){
+        this.supplyDemandList = [];
         this.params.startOrderAt = this.format(data,'yyyy-mm');
         this.query.startOrderAt = this.format(data,'yyyy-mm');
         this.startOrderAt = this.format(data,'yyyy年MM月');
         this.startTimeShow = false;
-        // orderStatistics(this.params).then(response => {
-        //   this.content = response.data;
-        // });
+        orderStatistics(this.params).then(response => {
+          this.content = response.data;
+        });
         this.getList();
       },
       onConfirmEnd(data){
+        this.supplyDemandList = [];
         this.params.endOrderAt = this.format(data,'yyyy-mm');
         this.query.endOrderAt = this.format(data,'yyyy-mm');
         this.endOrderAt = this.format(data,'yyyy年MM月');
         this.endTimeShow = false;
-        // orderStatistics(this.params).then(response => {
-        //   this.content = response.data;
-        // });
+        orderStatistics(this.params).then(response => {
+          this.content = response.data;
+        });
         this.getList();
       },
       openDialog(val){
         this.showDialog = val
       },
+      cancel(){
+        this.query = {
+          orderByColumn:'order_at',
+            isAsc:'asc',
+            demandName :'',
+            startOrderAt :this.format(new Date(),'yyyy-MM'),
+            endOrderAt :this.format(new Date(),'yyyy-MM'),
+            orderStatus :'',
+            productType:''
+        }
+      },
     },
   }
 </script>
@@ -462,7 +492,7 @@
       }
       .options{
         display: flex;
-        justify-content: space-between;
+        /*justify-content: space-between;*/
         flex-wrap: wrap;
         p{
           background: #F5F5F5;
@@ -471,6 +501,11 @@
           padding: 5PX 0;
           border-radius: 5PX;
           text-align: center;
+          margin-right: 5%;
+          margin-bottom: 10PX;
+          &:nth-child(3n){
+            margin-right: 0;
+          }
           &.active{
             background: #E2E9FD;
             color: #1B5DEA;

src/views/agriculturalTrusteeship/socialization/billDetail.vue

@@ -60,16 +60,16 @@
 
     </div>
 
-    <div class="main_btn">
-      <p>接单</p>
-      <p>拒单</p>
-    </div>
+<!--    <div class="main_btn">-->
+<!--      <p @click="clickYes">接单</p>-->
+<!--      <p @click="clickNo">拒单</p>-->
+<!--    </div>-->
     <!--  内容结束  -->
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {productTypes, supplyorderGet} from "@/api/agriculturalTrusteeship";
+  import {productTypes, supplyorderGet , supplyorderFinish , supplyorderReject} from "@/api/agriculturalTrusteeship";
 
   export default {
     name: "agriculturalTrusteeshipIndex",
@@ -89,7 +89,7 @@
     },
     created() {
       let query = {
-        parentId : 0,
+        parentId : null,
         tree:true
       }
       productTypes(query).then(response => {
@@ -120,6 +120,22 @@
           this.supplyDemand = response.data;
         });
       },
+      clickYes(){
+        supplyorderFinish(this.$route.query.id).then(response => {
+          this.$notify({ type: 'success', message: '接单成功' });
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
+        });
+      },
+      clickNo(){
+        supplyorderReject(this.$route.query.id).then(response => {
+          this.$notify({ type: 'success', message: '接单成功' });
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
+        });
+      }
     },
   }
 </script>

src/views/agriculturalTrusteeship/socialization/billOrder.vue

@@ -13,63 +13,63 @@
     <!--  内容开始  -->
     <div class="main">
 
-        <div class="main_content_right_list">
-          <div class="main_content_right_list_header">
-            <p class="on">商品信息</p>
-            <p>{{supplyDemand.productType}}</p>
-            <p>服务</p>
-          </div>
+      <div class="main_content_right_list">
+        <div class="main_content_right_list_header">
+          <p class="on">商品信息</p>
+          <p>{{supplyDemand.productType}}</p>
+          <p>服务</p>
+        </div>
 
-          <div class="main_content_right_list_center">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
-            <div class="main_content_right_list_content">
-              <p class="tt">{{supplyDemand.contractionName}}</p>
-              <div class="tab">
-                <p>￥<span>{{supplyDemand.unitPrice}}</span>.00/{{supplyDemand.unit}}</p>
-              </div>
+        <div class="main_content_right_list_center">
+          <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+          <div class="main_content_right_list_content">
+            <p class="tt">{{supplyDemand.contractionName}}</p>
+            <div class="tab">
+              <p>￥<span>{{supplyDemand.unitPrice}}</span>.00/{{supplyDemand.unit}}</p>
             </div>
           </div>
-          <van-cell title="买方名称" :border="false" :value="supplyDemand.bookName" />
-          <van-cell title="联系人" :border="false" :value="supplyDemand.linkera" />
-          <van-cell title="联系电话" :border="false" :value="supplyDemand.phonea" />
         </div>
+        <van-cell title="买方名称" :border="false" :value="supplyDemand.bookName" />
+        <van-cell title="联系人" :border="false" :value="supplyDemand.linkera" />
+        <van-cell title="联系电话" :border="false" :value="supplyDemand.phonea" />
+      </div>
 
-        <div class="main_content_right_list">
-          <div class="main_content_right_list_header">
-            <p class="on">买家信息</p>
-          </div>
-
-          <van-cell title="联系人" :border="false" :value="supplyDemand.linkera" />
-          <van-cell title="联系电话" :border="false" :value="supplyDemand.phonea" />
-          <van-cell title="服务地点" :border="false" :value="supplyDemand.serviceAddress" />
+      <div class="main_content_right_list">
+        <div class="main_content_right_list_header">
+          <p class="on">买家信息</p>
         </div>
 
-        <div class="main_content_right_list">
-          <div class="main_content_right_list_header">
-            <p class="on">订单信息</p>
-          </div>
+        <van-cell title="联系人" :border="false" :value="supplyDemand.linkera" />
+        <van-cell title="联系电话" :border="false" :value="supplyDemand.phonea" />
+        <van-cell title="服务地点" :border="false" :value="supplyDemand.serviceAddress" />
+      </div>
 
-          <van-cell title="服务合同" :border="false" :value="supplyDemand.contractionName" />
-          <van-cell title="服务作物" :border="false" :value="supplyDemand.cropType" />
-          <van-cell title="下单时间" :border="false" :value="supplyDemand.orderAt" />
-          <van-cell title="服务时间" :border="false" :value="supplyDemand.serviceAt" />
-          <van-cell title="服务数量" :border="false" :value="supplyDemand.serviceNum" />
-          <van-cell title="成交金额" :border="false" :value="supplyDemand.realityServiceMoney" />
-          <van-cell title="备注" :border="false" :value="supplyDemand.serviceRemark" />
+      <div class="main_content_right_list">
+        <div class="main_content_right_list_header">
+          <p class="on">订单信息</p>
         </div>
 
+        <van-cell title="服务合同" :border="false" :value="supplyDemand.contractionName" />
+        <van-cell title="服务作物" :border="false" :value="supplyDemand.cropType" />
+        <van-cell title="下单时间" :border="false" :value="supplyDemand.orderAt" />
+        <van-cell title="服务时间" :border="false" :value="supplyDemand.serviceAt" />
+        <van-cell title="服务数量" :border="false" :value="supplyDemand.serviceNum" />
+        <van-cell title="成交金额" :border="false" :value="supplyDemand.realityServiceMoney" />
+        <van-cell title="备注" :border="false" :value="supplyDemand.serviceRemark" />
+      </div>
+
     </div>
 
     <div class="main_btn">
-      <p>接单</p>
-      <p @click="supplyorderReject">拒单</p>
+      <p @click="clickYes">接单</p>
+      <p @click="clickNo">拒单</p>
     </div>
     <!--  内容结束  -->
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {productTypes, supplyorderGet,supplyorderReject} from "@/api/agriculturalTrusteeship";
+  import {productTypes, supplyorderGet , supplyorderFinish , supplyorderReject} from "@/api/agriculturalTrusteeship";
 
   export default {
     name: "agriculturalTrusteeshipIndex",
@@ -89,7 +89,7 @@
     },
     created() {
       let query = {
-        parentId : 0,
+        parentId : null,
         tree:true
       }
       productTypes(query).then(response => {
@@ -120,19 +120,29 @@
           this.supplyDemand = response.data;
         });
       },
-      supplyorderReject(){
+      clickYes(){
+        supplyorderFinish(this.$route.query.id).then(response => {
+          this.$notify({ type: 'success', message: '接单成功' });
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
+        });
+      },
+      clickNo(){
         supplyorderReject(this.$route.query.id).then(response => {
-          this.$notify({ type: 'success', message: '操作成功' });
-          history.back(-1);
+          this.$notify({ type: 'success', message: '接单成功' });
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
         });
       }
     },
   }
 </script>
 <style scoped lang="scss">
-.home_wrapper{
+  .home_wrapper{
 
-}
+  }
   /*头部*/
   .header{
     display: flex;
@@ -390,25 +400,25 @@
       }
     }
   }
-.main_btn{
-  display: flex;
-  justify-content: space-around;
-  padding: 4vh 0;
-  p{
-    font-size: .4rem;
-    width: 35%;
-    text-align: center;
-    padding: 10PX 0;
-    border-radius: 5rem;
-    box-shadow: 0px 3PX 6PX 0px rgba(0,0,0,0.16);
-    &:nth-child(1){
-      background: #334281;
-      color: #ffffff;
-    }
-    &:nth-child(2){
-      background: #D1D5E4;
-      color: #334281;
+  .main_btn{
+    display: flex;
+    justify-content: space-around;
+    padding: 4vh 0;
+    p{
+      font-size: .4rem;
+      width: 35%;
+      text-align: center;
+      padding: 10PX 0;
+      border-radius: 5rem;
+      box-shadow: 0px 3PX 6PX 0px rgba(0,0,0,0.16);
+      &:nth-child(1){
+        background: #334281;
+        color: #ffffff;
+      }
+      &:nth-child(2){
+        background: #D1D5E4;
+        color: #334281;
+      }
     }
   }
-}
 </style>

src/views/agriculturalTrusteeship/socialization/index.vue

@@ -17,7 +17,7 @@
         @load="getList"
       >
   <!--            @load="onLoad"-->
-        <div class="main_content_right_list" v-for="(item,index) in supplyDemandList" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocializationBillDetail',query:{id:item.id}})">
+        <div class="main_content_right_list" v-for="(item,index) in supplyDemandList" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocializationBillOrder',query:{id:item.id}})">
           <div class="main_content_right_list_header">
             <p>{{item.productType}}</p>
             <p>服务</p>
@@ -25,11 +25,12 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
             <div class="main_content_right_list_content">
               <p class="tt">{{item.contractionName}}</p>
               <div class="tab">
-                <p>￥<span>{{item.realityServiceMoney}}</span>.00</p>
+                <p>￥<span>{{item.unitPrice}}</span>.00/{{item.unit}}</p>
               </div>
               <p class="name">
                 <span>数量：{{item.serviceNum}}</span>
@@ -37,7 +38,7 @@
               </p>
             </div>
           </div>
-          <van-cell title="买方名称" :border="false" :value="item.bookName" />
+          <van-cell title="卖方名称" :border="false" :value="item.bookName" />
           <van-cell title="联系人" :border="false" :value="item.linkera" />
           <van-cell title="联系电话" :border="false" :value="item.phonea" />
         </div>
@@ -97,7 +98,7 @@
     },
     created() {
       let query = {
-        parentId : 0,
+        parentId : null,
         tree:true
       }
       productTypes(query).then(response => {
@@ -115,6 +116,10 @@
         supplyorderList(this.query).then(response => {
           response.rows.map(res=>{
             if ( res.orderStatus == '1'){
+              if (res.supplyMasterMap){
+                let supplyMasterMap = res.supplyMasterMap.split( "," )
+                res.supplyMasterMap = '/api'+supplyMasterMap[0]
+              }
               res.cropType = this.selectDictLabel(this.cropTypeOptions, res.cropType);
               res.orderStatus = this.selectDictLabel(this.orderStatusOptions, res.orderStatus);
               res.productType = this.productList.filter(function (e) { return e.id == res.productType; })[0].dictName;

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue

@@ -403,7 +403,10 @@
         templateList:[],
       };
     },
-    mounted() {
+    activated:function(){
+      this.getDictionaries();
+    },
+    created() {
       let queryParams={
         pageNum: 1,
         pageSize: 100,
@@ -442,8 +445,7 @@
           this.payerOptions[index].value = res.id;
         })
       });
-      this.getDictionaries();
-     
+      this.getFileList();
     },
 
     methods: {
@@ -470,7 +472,6 @@
       },
       getDictionaries(){
         getTransfer(this.$route.query.id).then((response) => {
-
           this.getDicts("capital_expenditure_type").then((res) => {
             for (var i = 0; i < res.data.length; i++) {
               this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});

src/views/yinnong/doneCompleted/completed.vue

@@ -3,9 +3,9 @@
     <van-nav-bar
       title="待办事项"
     />
-    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:120px;border-radius: 6px;">
+    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:128px;border-radius: 6px;">
       <van-swipe-item v-for="(image,index) in images" :key="index">
-        <img :src="image" style="width:100%;height: 120px"/>
+        <img :src="image" style="width:100%;height: 128px"/>
       </van-swipe-item>
     </van-swipe>
     <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">

src/views/yinnong/doneCompleted/done.vue

@@ -3,9 +3,9 @@
     <van-nav-bar
       title="已办事项"
     />
-    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:120px;border-radius: 6px;">
+    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:128px;border-radius: 6px;">
       <van-swipe-item v-for="(image,index) in images" :key="index">
-        <img :src="image" style="width:100%;height: 120px"/>
+        <img :src="image" style="width:100%;height: 128px"/>
       </van-swipe-item>
     </van-swipe>
     <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">

src/views/yinnong/workbench.vue

@@ -35,9 +35,9 @@
         </template>
       </van-nav-bar>
       </van-sticky>
-      <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:120px;border-radius: 6px;">
+      <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:128px;border-radius: 6px;">
         <van-swipe-item v-for="(image,index) in images" :key="index">
-          <img :src="image" style="width:100%;height: 120px"/>
+          <img :src="image" style="width:100%;height: 128px"/>
         </van-swipe-item>
       </van-swipe>
 <!--      <van-row style="min-height: 100px;" class="indexCard">-->

src/views/yinnongLogin.vue

@@ -2,9 +2,9 @@
   <div class="app-container">
     <div class="title">
       <img style="display: block;
-    margin: 0 auto;" src="../../static/images/onlineHome/yinnongLogo.jpg" alt="">
+    margin: 0 auto;" src="../../static/images/onlineHome/yinnongLogo1.png" alt="">
     </div>
-    <van-tabs v-model="active" :swipeable="true" style="margin-top:0.5rem;padding:0 10px;">
+    <van-tabs v-model="active" color="#1D6FE9                                                                               " :swipeable="true" style="margin-top:0.5rem;padding:0 10px;">
       <van-tab title="密码登录" name="1">
         <van-form style="margin:50px 0;" v-if="!showMessage">
           <van-field
@@ -148,8 +148,8 @@
     height: 100vh;
   }
   .title{
-    padding-top: 20%;
-    width: 88%;
+    /*padding-top: 20%;*/
+    width: 100%;
     margin: 0 auto;
   }
   .van-tab--active{