Merge remote-tracking branch 'origin/rongxin_dev' into rongxin_dev

10 месяцев назад · 69ec4c89d8
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
  <script src="/static/js/ol.js"></script>
 <!--  <script type="text/javascript" src="http://api.tianditu.gov.cn/api?v=4.0&tk=cc4aba6e967096098249efa069733067"></script>-->
  <script type="text/javascript" src="https://api.map.baidu.com/api?type=webgl&v=1.0&ak=XzwOBaO4CElCsPdl8LIFEvv5rTemG6w1"></script>
  <title>农燊高科</title>
  <title>COMPANY</title>
 </head>

 <body>
--- a/src/views/news/index.vue
+++ b/src/views/news/index.vue
@@ -7,21 +7,48 @@
      placeholder
      @click-left="onClickLeft"
    />
    <van-list
      v-model="loading"
      :finished="finished"
      finished-text="没有更多了"
      @load="getList()"
    >
      <!--        @load="newList"-->
      <van-cell v-for="item in newList" :key="item.id" :title="item.title" :label="item.newsTime" :to="{name:'newDetailCJ', query: {id:item.id}}">
        <!-- 使用 right-icon 插槽来自定义右侧图标 -->
        <template #right-icon>
          <van-image :src="item.img" class="search-icon" width="30%" style="margin-left: 10px;" v-if="item.img" />
          <van-image src="../../static/images/zwtpxw.jpg" class="search-icon" width="30%" v-else/>
        </template>
      </van-cell>
    </van-list>
    <van-tabs animated type="card" color="#007b76" style="margin-top: 10px;">

      <van-tab title="新闻资讯">
        <van-list
          v-model="loading"
          :finished="finished"
          finished-text="没有更多了"
          style="margin-top: 10px;"
          @load="getList()"
        >
          <!--        @load="newList"-->
          <van-cell v-for="item in newList" :key="item.id" :title="item.title" :label="item.newsTime" :to="{name:'newDetailCJ', query: {id:item.id}}">
            <!-- 使用 right-icon 插槽来自定义右侧图标 -->
            <template #right-icon>
              <van-image :src="item.img" class="search-icon" width="30%" style="margin-left: 10px;" v-if="item.img" />
              <van-image src="../../static/images/zwtpxw.jpg" class="search-icon" width="30%" v-else/>
            </template>
          </van-cell>
        </van-list>
      </van-tab>

      <van-tab title="价格指数">
        <van-list
          v-model="secondLoading"
          :finished="secondFinished"
          finished-text="没有更多了"
          style="margin-top: 10px;"
          @load="getSecondList"
        >
          <van-cell v-for="item in secondList" :key="item.id" :title="item.title" :label="item.newsTime" :to="{name:'newDetailCJ', query: {id:item.id}}">
            <!-- 使用 right-icon 插槽来自定义右侧图标 -->
            <template #right-icon>
              <van-image :src="item.img" class="search-icon" width="30%" style="margin-left: 10px;" v-if="item.img" />
              <van-image src="../../static/images/zwtpxw.jpg" class="search-icon" width="30%" v-else/>
            </template>
          </van-cell>
        </van-list>
      </van-tab>

    </van-tabs>


  </div>
 </template>

@@ -35,8 +62,14 @@ export default {
      loading: false,
      //是否滚动到底部
      finished: false,
      //是否显示加载
      secondLoading: false,
      //是否滚动到底部
      secondFinished: false,
      //新闻集合
      newList:[],
      //交易规则集合
      secondList:[],
      //查询参数
      queryParams: {
        pageNum: 1,
@@ -44,6 +77,13 @@ export default {
        deptId:100,
        number:2
      },
      //交易规则查询参数
      querySecondParams: {
        deptId:100,
        pageNum:1,
        pageSize:10,
        number:9
      },
    };
  },
  created() {},
@@ -70,6 +110,28 @@ export default {
        this.loading = false;
      });
    },
    getSecondList(){
      this.loading = true;
      newList(this.querySecondParams).then(response => {
        console.log(response);
        for (var i = 0; i < response.rows.length; i++) {
          this.secondList.push(response.rows[i]);
          var imgStrs = response.rows[i].content.match(/<IMG src=\"([^\"]*?)\">/gi)
          if (imgStrs != null && imgStrs != '') {
            console.log(imgStrs[0].length-2)
            console.log(imgStrs[0])
            this.secondList[i].img = imgStrs[0].substr(10,(imgStrs[0].length-12));
          }
        }
        console.log(this.secondList)
        if(this.secondList.length >= response.total){
          this.secondFinished = true;
          return;
        }
        this.querySecondParams.pageNum += 1 ;
        this.secondLoading = false;
      });
    },
  },
 };
 </script>
--- a/src/views/sunVillage_info/index.vue
+++ b/src/views/sunVillage_info/index.vue
@@ -50,7 +50,7 @@

        </div>
        <div class="footer">
          {{configValue == ""?'技术支持：北京农燊高科信息技术有限公司':configValue}}
          {{configValue == ""?'技术支持：公司':configValue}}
        </div>

    </div>
--- a/src/views/sunVillage_info/index_code.vue
+++ b/src/views/sunVillage_info/index_code.vue
@@ -59,7 +59,7 @@
            </div>
        </div>
        <div :class="{'footer':xsgsList.length < 9 , 'footer2':xsgsList.length > 8}">
            {{configValue == ""?'技术支持：北京农燊高科信息技术有限公司':configValue}}
            {{configValue == ""?'技术支持：公司':configValue}}
        </div>
      <img src="../../assets/images/sunVillage_info/index_btn_green.png" class="fixed_btn" @click="goCode">
    </div>
--- a/src/views/sunVillage_info/index_code_rights.vue
+++ b/src/views/sunVillage_info/index_code_rights.vue
@@ -31,7 +31,7 @@
            </div>
        </div>
        <div class="footer">
          {{configValue == ""?'技术支持：北京农燊高科信息技术有限公司':configValue}}
          {{configValue == ""?'技术支持：公司':configValue}}
        </div>
    </div>
 </template>
--- a/src/views/yinnongLogin.vue
+++ b/src/views/yinnongLogin.vue
@@ -5,7 +5,7 @@
    </div>
    <van-tabs v-model="active" title-active-color="#37d6b1" :swipeable="true" style="background: rgba(255, 255, 255, .2);margin:1.5rem auto 0;width: calc(100% - 40px);border-radius: 20px;overflow: hidden;border: 1px solid #fff;">
      <van-tab title="密码登录" name="1">
        <van-form style="padding:30px 0;height: 100vh;" v-if="!showMessage">
        <van-form style="padding:30px 0;" v-if="!showMessage">
          <van-field
            v-model="formData.username"
            placeholder="请输入手机号/账号"
@@ -42,7 +42,7 @@
        </van-form>
      </van-tab>
      <van-tab title="短信登录" name="2">
        <van-form style="padding:30px 0;height: 100vh;">
        <van-form style="padding:30px 0;">
          <van-field
            v-model="formData.mobile"
            left-icon="contact-o"
@@ -150,8 +150,8 @@
  .app-container{
    background: #fafafa url("../../static/images/yinnong/login_bg.png") no-repeat top;
    background-size: 100% auto;
    height: 100vh;
    overflow: hidden;
    min-height: 100vh;
    /*overflow: hidden;*/
  }
  /deep/ .van-tabs__content{
    background: #ffffff;
--- a/static/images/yinnong/banner_03.jpg
+++ b/static/images/yinnong/banner_03.jpg
--- a/static/images/yinnong/yinnongLogo1.png
+++ b/static/images/yinnong/yinnongLogo1.png