From cb5ecb1d5e80fe0b510e5dc229c02bd25a89153b Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期三, 11 十二月 2024 17:11:25 +0800
Subject: [PATCH] 移动端页面重绘
---
pages/policyMatching/fastMatch.vue | 60 +-
pages/public/quick.vue | 78 ++
static/login/user.png | 0
static/index/zcyw.png | 0
static/index/down.png | 0
static/index/haibao.png | 0
pages/category/category.vue | 64 +-
pages/public/login.vue | 48 +
static/index/zcxm.png | 0
static/index/zndc.png | 0
static/tab-home-current.png | 0
static/index/beijing.png | 0
pages/index/index.vue | 595 +++++++++++++-------
pages/checkPolicies/project.vue | 90 +-
static/tab-cate.png | 0
pages/user/user.vue | 15
pages.json | 13
static/login/jigou.png | 0
static/index/zcbt.png | 0
static/login/logo.png | 0
static/tab-my-current.png | 0
static/index/search.png | 0
static/login/pwd.png | 0
components/Pagination.vue | 24
pages/policyMatching/precise.vue | 80 +-
static/index/hot.png | 0
static/tab-cate-current.png | 0
pages/user/reportCenter.vue | 470 ++++++++--------
pages/checkPolicies/originalText.vue | 103 ++-
static/tab-home.png | 0
static/tab-my.png | 0
static/index/nore.png | 0
static/index/rczd.png | 0
33 files changed, 957 insertions(+), 683 deletions(-)
diff --git a/components/Pagination.vue b/components/Pagination.vue
index d71ef2b..c3ba0aa 100644
--- a/components/Pagination.vue
+++ b/components/Pagination.vue
@@ -1,7 +1,10 @@
<template>
<div class="pagination">
<button :disabled="currentPage === 1" @click="prevPage">涓婁竴椤�</button>
- <span>绗� {{ currentPage }} 椤� / 鍏� {{ totalPages }} 椤�</span>
+ <!-- <span>绗� {{ currentPage }} 椤� / 鍏� {{ totalPages }} 椤�</span> -->
+ <view class="page">
+ <span> {{ currentPage }} </span> / {{ totalPages }}
+ </view>
<button :disabled="currentPage === totalPages" @click="nextPage">涓嬩竴椤�</button>
</div>
</template>
@@ -46,22 +49,29 @@
.pagination {
display: flex;
align-items: center;
- justify-content: center;
+ justify-content: space-around;
margin: 20px 0;
}
.pagination button {
- padding: 5px 10px;
+ appearance: none; /* 绉婚櫎娴忚鍣ㄩ粯璁ゆ牱寮� */
+ padding: 0 15px;
margin: 0 5px;
cursor: pointer;
+ background: #3D9AFF;
+ color: #FFFFFF;
}
- .pagination button:disabled {
- cursor: not-allowed;
- opacity: 0.5;
+ .pagination button[disabled]{
+ cursor: not-allowed; /* 绂佺敤榧犳爣鏍峰紡 */
+ background: white !important; /* 寮哄埗瑕嗙洊鑳屾櫙棰滆壊 */
+ color: #666666 !important; /* 寮哄埗瑕嗙洊鏂囧瓧棰滆壊 */
}
- .pagination span {
+ .pagination .page {
margin: 0 10px;
}
+ .pagination .page span {
+ color: #3D9AFF;
+ }
</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index cb95798..318badc 100644
--- a/pages.json
+++ b/pages.json
@@ -14,6 +14,17 @@
}
},
{
+ "path": "pages/public/quick",
+ "style": {
+ "navigationBarTitleText": "鐧诲綍",
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": false,
+ "animationType": "slide-in-bottom"
+ }
+ }
+ },
+ {
"path": "pages/public/register",
"style": {
"navigationBarTitleText": "娉ㄥ唽",
@@ -230,7 +241,7 @@
},
"tabBar": {
"color": "#C0C4CC",
- "selectedColor": "#fa436a",
+ "selectedColor": "#749FF1",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"list": [{
diff --git a/pages/category/category.vue b/pages/category/category.vue
index 1d3383f..900e518 100644
--- a/pages/category/category.vue
+++ b/pages/category/category.vue
@@ -1,9 +1,15 @@
<template>
<view class="container">
<header>
- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" />
+ <!-- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" />
<u-button type="primary" style="width: 100upx;margin-top: 20upx;" size="normal" text="鎼滅储" shape="circle"
- @click="onPageChange(1)"></u-button>
+ @click="onPageChange(1)"></u-button> -->
+ <view class="right">
+ <image src="/static/index/search.png" mode=""></image>
+ <input class="search" placeholder="璇疯緭鍏ユ劅鍏磋叮鐨勬斂绛栧唴瀹�" type="text" v-model="search" />
+ <u-button type="primary" style="width: 100upx;border-radius: 18upx;" size="normal" text="鎼滅储"
+ @click="onPageChange(1)"></u-button>
+ </view>
</header>
<view v-if="!loading && goodsList.length >0"
@@ -11,15 +17,15 @@
<view class="goods-item" v-for="(item, index) in goodsList" :key="index" @click="godetail(item)">
<view style="background-color: #f7f7f7;padding: 10upx;margin-bottom: 10upx;">
<view style="display: flex;justify-content: space-between;">
- <view style="font-weight: 800px;color: #000;">{{ item.ArticleTitle }}</view>
- <view style="width: auto;" @click.stop="star(item)">
- <u-icon name="star-fill"
+ <view class="msg" style="flex:1;font-weight: 800px;color: #000;">{{ item.ArticleTitle }}</view>
+ <view style="width: 90px;" @click.stop="star(item)">
+ <u-icon style="float: right;" name="star-fill"
color="gold" size="28"></u-icon>
</view>
</view>
<view style="display: flex;justify-content: space-between;">
<view style="font-size: 22upx;line-height: 44upx;">{{ item.Platform }}</view>
- <u-tag :text="item.PubTime.split(' ')[0]" plain size="mini" type="warning"></u-tag>
+ <u-tag :text="item.PubTime.split(' ')[0]" plain size="mini" type="primary"></u-tag>
</view>
</view>
</view>
@@ -144,7 +150,11 @@
background: rgba(255, 255, 255, .6);
}
}
-
+.msg{
+ white-space: nowrap; /* 寮哄埗鏂囨湰涓嶆崲琛� */
+ overflow: hidden; /* 闅愯棌瓒呭嚭閮ㄥ垎 */
+ text-overflow: ellipsis; /* 瓒呭嚭閮ㄥ垎鏄剧ず鐪佺暐鍙� */
+}
header {
padding: 0 30upx;
height: 120upx;
@@ -152,35 +162,27 @@
display: flex;
color: #fff;
font-size: 14px;
-
- .left {
- width: 150upx;
- height: 120upx;
- line-height: 120upx;
- text-align: left;
- display: flex;
-
- i {
- font-size: 36upx;
- }
- }
-
- .search {
+ .right{
flex: 1;
- height: 80upx;
- line-height: 80upx;
- border-radius: 40upx;
+ display: flex;
+ align-items: center;
background-color: #fff;
- padding: 0 20upx;
- margin: 20upx 0;
+ border-radius: 20upx;
+ // height: 80upx;
+ // line-height: 80upx;
+ padding: 0 10upx 0 20upx;
+ margin: 20upx 0 ;
color: #236AF0;
-
- i {
- font-size: 26upx;
- color: #ccc;
+ image {
+ width: 28upx;
+ height: 28upx;
+ margin-right:10upx;
+ }
+ .search{
+ flex: 1;
}
}
-
+
}
/* 鍒嗙被 */
diff --git a/pages/checkPolicies/originalText.vue b/pages/checkPolicies/originalText.vue
index b11fd80..1622b0d 100644
--- a/pages/checkPolicies/originalText.vue
+++ b/pages/checkPolicies/originalText.vue
@@ -2,46 +2,49 @@
<view class="container">
<header>
<view class="left" @click="chooseLocation">
- <u-icon name="arrow-down" color="#fff"></u-icon>
<text class="location">{{ address }}</text>
+ <u-icon name="arrow-down" color="#fff"></u-icon>
</view>
- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" />
- <u-button type="primary" style="width: 100upx;margin-top: 20upx;" size="normal" text="鎼滅储"
- @click="onPageChange(1)"></u-button>
+ <view class="right">
+ <image src="/static/index/search.png" mode=""></image>
+ <input class="search" placeholder="璇疯緭鍏ユ劅鍏磋叮鐨勬斂绛栧唴瀹�" type="text" v-model="search" />
+ <u-button type="primary" style="width: 100upx;border-radius: 18upx;" size="normal" text="鎼滅储"
+ @click="onPageChange(1)"></u-button>
+ </view>
</header>
<view
- style="padding: 40upx;background-color: #fff;margin-top: 20upx;display: flex;justify-content: space-between;">
+ style="padding: 0 20upx;background-color: #fff;display: flex;justify-content: space-between;">
<scroll-view scroll-x class="tabs-scroll" style="white-space: nowrap;">
<u-tabs :list="tabsList" @click="chooseArticleType" style="padding-left: 4px;" lineWidth="20"
- lineColor="#f56c6c" :activeStyle="{
- color: '#303133',
- fontWeight: 'bold',
+ lineColor="#6190E8" :activeStyle="{
+ color: '#6190E8',
transform: 'scale(1.05)'
}" :inactiveStyle="{
color: '#606266',
transform: 'scale(1)'
- }" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;" :scrollable="true">
+ }" itemStyle="padding-left: 15px; padding-right: 15px; height: 54px;" :scrollable="true">
</u-tabs>
</scroll-view>
</view>
<view v-if="!loading && goodsList.length > 0"
- style="padding: 40upx;background-color: #fff;margin-top: 20upx;color: #969799;font-size: 28upx;padding-bottom: 200upx;">
+ style="padding: 20upx;background-color: #fff;margin-top: 20upx;color: #969799;font-size: 28upx;padding-bottom: 200upx;">
<view class="goods-item" v-for="(item, index) in goodsList" :key="index" @click="godetail(item)">
- <view style="background-color: #f7f7f7;padding: 10upx;margin-bottom: 10upx;">
+ <view style="border-bottom: 1px solid #DFDFDF;padding: 10upx;margin-bottom: 10upx;">
<view style="display: flex;justify-content: space-between;">
- <view style="font-weight: 800px;color: #000;">{{ item.ArticleTitle }}</view>
+ <view class="msg" style="flex:1;font-weight: 800px;color: #000;">{{ item.ArticleTitle }}</view>
- <view style="width: auto;" @click.stop="star(item)">
- <u-icon :name="item.FavoriteFlag == 1 ? 'star-fill' : 'star'"
+ <view style="width: 90px;" @click.stop="star(item)">
+ <u-icon style="float: right;" :name="item.FavoriteFlag == 1 ? 'star-fill' : 'star'"
:color="item.FavoriteFlag == 1 ? 'gold' : 'darkgray'" size="28"></u-icon>
</view>
</view>
- <view style="display: flex;justify-content: space-between;">
- <view style="font-size: 22upx;line-height: 44upx;">{{ item.Platform }}</view>
- <u-tag :text="item.PubTime.split(' ')[0]" plain size="mini" type="warning"></u-tag>
- </view>
+ <view style="display: flex;justify-content: space-between;font-size: 22upx;line-height: 44upx;">
+ <view >{{ item.Platform }}</view>
+ <!-- <u-tag :text="item.PubTime.split(' ')[0]" plain size="mini" type="warning"></u-tag> -->
+ <view>{{ item.PubTime ? item.PubTime.split(' ')[0] : item.PubTime }}</view>
+ </view>
</view>
</view>
</view>
@@ -54,7 +57,7 @@
<Pagination :totalItems="total" :itemsPerPage="pageSize" :currentPage="pageIndex"
@page-change="onPageChange" />
</view>
- <u-popup :show="showLocation" :round="10" mode="bottom" @close="closeLocation" :closeable="true">
+ <u-popup :show="showLocation" :round="10" mode="bottom" @close="showLocation=!showLocation" :closeable="true">
<view style="padding: 40upx;display: flex;flex-wrap: wrap;">
<view class="u-page__tag-item" v-for="(item, index) in locationList" :key="index">
<u-tag :text="item.Region" :plain="item.Region != address" type="warning" :name="index"
@@ -108,11 +111,8 @@
{
name: '娉曡',
ArticleType: '娉曡'
- },
- {
- name: '鍏朵粬',
- ArticleType: '鍏朵粬'
- },
+ }
+
],
ArticleType: '',
loading: false,
@@ -227,7 +227,7 @@
Keyword: this.search,
PageNumber: this.pageIndex,
PageSize: this.pageSize,
- UserId: uni.getStorageSync('userId')
+ UserId: uni.getStorageSync('userId')||-1
}
this.$http.post('/ArticleData/GetArticleDataList', data).then(res => {
if (res.Check) {
@@ -282,16 +282,17 @@
header {
padding: 0 30upx;
height: 120upx;
- background-color: #236AF0;
+ // background-color: #236AF0;
+ background: linear-gradient( 180deg, #314ABB 0%, #5277E0 100%);
display: flex;
color: #fff;
font-size: 14px;
.left {
- width: 150upx;
- height: 120upx;
+ // width: 150upx;
+ // height: 120upx;
line-height: 120upx;
- text-align: left;
+ // text-align: left;
display: flex;
i {
@@ -299,24 +300,31 @@
}
}
- .search {
- flex: 1;
- height: 80upx;
- line-height: 80upx;
- border-radius: 40upx;
- background-color: #fff;
- padding: 0 20upx;
- margin: 20upx 0;
- color: #236AF0;
-
- i {
- font-size: 26upx;
- color: #ccc;
- }
- }
+ .right{
+ flex: 1;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ border-radius: 20upx;
+ // height: 80upx;
+ // line-height: 80upx;
+ padding: 0 10upx 0 20upx;
+ margin: 20upx 0 20upx 20upx;
+ color: #236AF0;
+ image {
+ width: 28upx;
+ height: 28upx;
+ margin-right:10upx;
+ }
+ .search{
+ flex: 1;
+ }
+ }
}
-
+/deep/.u-tabs__wrapper__nav__line{
+ bottom: 0;
+ }
/* 鍒嗙被 */
.cate-section {
display: flex;
@@ -345,6 +353,11 @@
}
}
+.msg{
+ white-space: nowrap; /* 寮哄埗鏂囨湰涓嶆崲琛� */
+ overflow: hidden; /* 闅愯棌瓒呭嚭閮ㄥ垎 */
+ text-overflow: ellipsis; /* 瓒呭嚭閮ㄥ垎鏄剧ず鐪佺暐鍙� */
+}
.u-page__tag-item {
height: 40upx;
line-height: 40upx;
diff --git a/pages/checkPolicies/project.vue b/pages/checkPolicies/project.vue
index 5304bec..59dd57d 100644
--- a/pages/checkPolicies/project.vue
+++ b/pages/checkPolicies/project.vue
@@ -1,20 +1,25 @@
<template>
<view class="container">
<header>
- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" /> <u-button type="primary"
- style="width: 100upx;margin-top: 20upx;" size="normal" text="鎼滅储" @click="onPageChange(1)"></u-button>
- </header>
+ <!-- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" /> <u-button type="primary"
+ style="width: 100upx;margin-top: 20upx;" size="normal" text="鎼滅储" @click="onPageChange(1)"></u-button> -->
+ <view class="right">
+ <image src="/static/index/search.png" mode=""></image>
+ <input class="search" placeholder="璇疯緭鍏ユ劅鍏磋叮鐨勬斂绛栧唴瀹�" type="text" v-model="search" />
+ <u-button type="primary" style="width: 100upx;border-radius: 18upx;" size="normal" text="鎼滅储"
+ @click="onPageChange(1)"></u-button>
+ </view>
+ </header>
<view
- style="padding: 40upx;background-color: #fff;margin-top: 20upx;display: flex;justify-content: space-between;">
+ style="padding: 0 20upx;background-color: #fff;display: flex;justify-content: space-between;">
<u-tabs :list="tabsList" @click="chooseArticleType" style="padding-left: 4px;" lineWidth="30"
- lineColor="#f56c6c" :activeStyle="{
- color: '#303133',
- fontWeight: 'bold',
+ lineColor="#6190E8" :activeStyle="{
+ color: '#6190E8',
transform: 'scale(1.05)'
}" :inactiveStyle="{
color: '#606266',
transform: 'scale(1)'
- }" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;">
+ }" itemStyle="padding-left: 15px; padding-right: 15px; height: 54px;">
</u-tabs>
</view>
@@ -23,12 +28,13 @@
<view class="goods-item" v-for="(item, index) in goodsList" :key="index" @click="godetail(item)">
<view style="background-color: #f7f7f7;padding: 10upx;margin-bottom: 10upx;">
<view style="display: flex;justify-content: space-between;">
- <view style="font-weight: 800px;color: #000;">{{ item.ArticleTitle }}</view>
- <u-tag :text="getType(item)" plain size="mini" type="warning"></u-tag>
+ <view class="msg" style="font-weight: 800px;color: #000;">{{ item.ArticleTitle }}</view>
+ <u-tag :text="getType(item)" plain size="mini" type="primary"></u-tag>
</view>
- <view style="display: flex;justify-content: space-between;">
- <view style="font-size: 22upx;line-height: 44upx;">{{ item.Platform }}</view>
- <u-tag :text="item.Deadline.split(' ')[0]" plain size="mini" type="warning"></u-tag>
+ <view style="display: flex;justify-content: space-between;font-size: 22upx;line-height: 44upx;">
+ <view >{{ item.Platform }}</view>
+ <!-- <u-tag :text="item.Deadline.split(' ')[0]" plain size="mini" type="warning"></u-tag> -->
+ <view>{{ item.Declarationtime ? item.Declarationtime.split(' ')[0] : item.Declarationtime }}鑷硔{ item.Deadline ? item.Deadline.split(' ')[0] : item.Deadline }}</view>
<!-- PubTime -->
</view>
</view>
@@ -153,43 +159,39 @@
page {
background-color: #F7F7F7;
}
-
+.msg{
+ white-space: nowrap; /* 寮哄埗鏂囨湰涓嶆崲琛� */
+ overflow: hidden; /* 闅愯棌瓒呭嚭閮ㄥ垎 */
+ text-overflow: ellipsis; /* 瓒呭嚭閮ㄥ垎鏄剧ず鐪佺暐鍙� */
+}
header {
padding: 0 30upx;
height: 120upx;
- background-color: #236AF0;
+ background: linear-gradient( 180deg, #314ABB 0%, #5277E0 100%);
display: flex;
color: #fff;
font-size: 14px;
-
- .left {
- width: 150upx;
- height: 100upx;
- line-height: 100upx;
- text-align: left;
- display: flex;
-
- i {
- font-size: 36upx;
- }
- }
-
- .search {
- flex: 1;
- height: 80upx;
- line-height: 80upx;
- border-radius: 40upx;
- background-color: #fff;
- padding: 0 20upx;
- margin: 20upx 0;
- color: #236AF0;
-
- i {
- font-size: 26upx;
- color: #ccc;
- }
- }
-
+ .right{
+ flex: 1;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ border-radius: 20upx;
+ // height: 80upx;
+ // line-height: 80upx;
+ padding: 0 10upx 0 20upx;
+ margin: 20upx 0 ;
+ color: #236AF0;
+ image {
+ width: 28upx;
+ height: 28upx;
+ margin-right:10upx;
+ }
+ .search{
+ flex: 1;
+ }
+ }
+
}
/* 鍒嗙被 */
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 71c18c4..8330c48 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,67 +2,96 @@
<view class="container">
<header>
<view class="left" @click="chooseLocation">
- <u-icon name="arrow-down" color="#fff"></u-icon>
<text class="location">{{ address }}</text>
+ <u-icon name="arrow-down" color="#fff"></u-icon>
</view>
- <u-input class="search" placeholder="璇疯緭鍏ユ劅鍏磋叮鐨勬斂绛栧唴瀹�" type="text" v-model="search" /> <u-button type="primary" shape="circle"
+ <view class="logo">
+ <image src="/static/index/rczd.png" mode=""></image>
+ </view>
+ <view class="search-box">
+ <image src="/static/index/search.png" mode=""></image>
+ <input class="search" placeholder="璇疯緭鍏ユ劅鍏磋叮鐨勬斂绛栧唴瀹�" type="text" v-model="search"
+ @confirm="getArticleDataList" />
+ <!-- 鍦� UniApp 涓紝<input> 鏍囩鐨� @keyup.enter 涓嶄細瑙﹀彂锛屼娇鐢� @confirm 浜嬩欢鏇夸唬銆� -->
+ </view>
+ <view class="hot">
+ <image src="/static/index/hot.png" alt="" />
+ <view class="hot-msg">
+ 鐑悳锛�
+ <text v-for="item in hotSearch" @click="chooseItem(item)" style="line-height: 30px;">
+ {{ item.length > 10 ? item.slice(0, 10) + '...' : item }}
+ </text>
+ </view>
+ </view>
+ <!-- <u-input class="search"
+ placeholder="璇疯緭鍏ユ劅鍏磋叮鐨勬斂绛栧唴瀹�"
+ type="text"
+ v-model="search" />
+ <u-button type="primary" shape="circle"
style="width: 100upx;margin-top: 20upx;" size="normal" text="鎼滅储"
- @click="getArticleDataList()"></u-button>
+ @click="getArticleDataList()"></u-button> -->
</header>
<view class="cate-section">
<view class="cate-item" @click="gooriginalText()">
- <image src="/static/temp/c3.png"></image>
+ <image src="/static/index/zcyw.png"></image>
<text>鏀跨瓥鍘熸枃</text>
</view>
<view class="cate-item" @click="goproject()">
- <image src="/static/temp/c5.png"></image>
+ <image src="/static/index/zcxm.png"></image>
<text>鏀跨瓥椤圭洰</text>
</view>
<view class="cate-item" @click="gofastMatch()">
- <image src="/static/temp/c6.png"></image>
+ <image src="/static/index/zndc.png"></image>
<text>鏅鸿兘娲炲療</text>
</view>
<view class="cate-item" @click="goprecise()">
- <image src="/static/temp/c7.png"></image>
+ <image src="/static/index/zcbt.png"></image>
<text>鏀跨瓥琛ヨ创</text>
</view>
</view>
- <view
- style="padding: 40upx;background-color: #fff;margin-top: 20upx;display: flex;justify-content: space-between;">
- <u-tabs :list="tabsList" @click="chooseArticleType" style="padding-left: 4px;" lineWidth="30"
- lineColor="#f56c6c" :activeStyle="{
- color: '#303133',
- fontWeight: 'bold',
- transform: 'scale(1.05)'
- }" :inactiveStyle="{
- color: '#606266',
- transform: 'scale(1)'
- }" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;">
- </u-tabs>
- <view style="line-height: 70upx;color: #969799;font-size: 32upx;font-weight: 600;" @click="gooriginalText">
- 鏇村</view>
+ <view class="posters">
+ <image src="/static/index/haibao.png" mode=""></image>
</view>
- <view v-if="!loading && goodsList.length > 0"
- style="padding: 40upx;background-color: #fff;margin-top: 20upx;display: flex;justify-content: space-between;color: #969799;font-size: 28upx;">
- <view>
- <view class="goods-item" v-for="(item, index) in goodsList" :key="index"
- style="height: 80upx;line-height: 80upx;" @click="godetail(item)">
- <view>{{ item.ArticleTitle.length > 15 ? item.ArticleTitle.slice(0, 15) + '...' : item.ArticleTitle
- }}</view>
+ <view class="information">
+ <view class="tabs">
+ <u-tabs :list="tabsList" @click="chooseArticleType" style=" flex:1" lineWidth="30" lineColor="#6190E8"
+ :activeStyle="{
+ color: '#6190E8',
+ fontWeight: 'bold',
+ transform: 'scale(1.05)'
+ }" :inactiveStyle="{
+ color: '#606266',
+ transform: 'scale(1)'
+ }" itemStyle="height: 34px;">
+ </u-tabs>
+ <view style="color: #969799;display: flex;align-items: center;" @click="gooriginalText">鏇村<u-icon
+ name="arrow-right"></u-icon></view>
+ </view>
+ <view v-if="!loading && goodsList.length > 0"
+ style="padding:10upx 40upx;background-color: #fff;display: flex;justify-content: space-between;font-size: 28upx;">
+ <view>
+ <view class="goods-item" v-for="(item, index) in goodsList" :key="index"
+ style="height: 80upx;line-height: 80upx;" @click="godetail(item)">
+ <view>{{ item.ArticleTitle.length > 15 ? item.ArticleTitle.slice(0, 15) + '...' : item.ArticleTitle
+ }}</view>
+ </view>
+ </view>
+ <view>
+ <view class="goods-item" v-for="(item, index) in goodsList" :key="index"
+ style="height: 80upx;line-height: 80upx; color: #969799;" @click="godetail(item)">
+ <view>{{ item.PubTime ? item.PubTime.split(' ')[0] : item.PubTime }}</view>
+ </view>
</view>
</view>
- <view>
- <view class="goods-item" v-for="(item, index) in goodsList" :key="index"
- style="height: 80upx;line-height: 80upx;" @click="godetail(item)">
- <view>{{ item.PubTime ? item.PubTime.split(' ')[0] : item.PubTime }}</view>
- </view>
+ <view v-if="loading" style="margin-top: 100upx;">
+ <u-loading-icon></u-loading-icon>
</view>
+ <u-empty v-if="!loading && goodsList.length == 0" mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/car.png">
+ </u-empty>
</view>
- <view v-if="loading" style="margin-top: 100upx;">
- <u-loading-icon></u-loading-icon>
- </view>
- <u-empty v-if="!loading && goodsList.length == 0" mode="data" icon="http://cdn.uviewui.com/uview/empty/car.png">
- </u-empty>
+
+ <!-- 绛涘湴鐐� -->
<u-popup :show="showLocation" :round="10" mode="bottom" @close="closeLocation" :closeable="true">
<view style="padding: 40upx;display: flex;flex-wrap: wrap;">
<view class="u-page__tag-item" v-for="(item, index) in locationList" :key="index">
@@ -76,212 +105,334 @@
</template>
<script>
-export default {
- components: {
- },
- data() {
- return {
- search: '',
- titleNViewBackground: '',
- swiperCurrent: 0,
- swiperLength: 0,
- carouselList: [],
- goodsList: [],
- address: '涓婃捣甯�',
- showLocation: false,
- locationList: ['涓婃捣甯�', "鑻忓窞甯�"],
- tabsList: [
- {
- name: '缁煎悎',
- ArticleType: '',
- },
- {
- name: '鐢虫姤閫氱煡',
- ArticleType: '鐢虫姤閫氱煡'
+ export default {
+ components: {},
+ data() {
+ return {
+ search: '',
+ titleNViewBackground: '',
+ swiperCurrent: 0,
+ swiperLength: 0,
+ carouselList: [],
+ hotSearch: [],
+ goodsList: [],
+ address: '涓婃捣',
+ showLocation: false,
+ locationList: ['涓婃捣', "鑻忓窞"],
+ tabsList: [{
+ name: '缁煎悎',
+ ArticleType: '',
+ },
+ {
+ name: '鐢虫姤閫氱煡',
+ ArticleType: '鐢虫姤閫氱煡'
- },
- {
- name: '鍏ず鍏憡',
- ArticleType: '鍏ず鍏憡'
- },
- ],
- ArticleType: '',
- loading: false,
+ },
+ {
+ name: '鍏ず鍏憡',
+ ArticleType: '鍏ず鍏憡'
+ },
+ {
+ name: '鏀跨瓥',
+ ArticleType: '鏀跨瓥'
+ },
+ {
+ name: '娉曡',
+ ArticleType: '娉曡'
+ },
+ ],
+ ArticleType: '',
+ loading: false,
- };
- },
- onLoad() {
- if (uni.getStorageSync('location')) {
- this.address = uni.getStorageSync('location')
- }
- this.getArticleDataList()
- },
- methods: {
- //閫夋嫨鍦板尯 寮圭獥
- chooseLocation() {
- this.showLocation = true
+ };
},
- locationClick(name) {
- this.address = name
- uni.setStorageSync('location', name)
- this.getArticleDataList()
- this.showLocation = false
- },
- chooseArticleType(e) {
- console.log('item', e);
- this.ArticleType = e.ArticleType
- this.getArticleDataList()
- },
- //
- getArticleDataList() {
- this.loading = true
- let data = {
- Platform: this.address,
- ArticleType: this.ArticleType,
- Scope: '',
- Keyword: this.search,
- PageNumber: 1,
- PageSize: 10,
- UserId: uni.getStorageSync('userId')
+ onLoad() {
+ if (uni.getStorageSync('location')) {
+ this.address = uni.getStorageSync('location')
}
- this.$http.post('/ArticleData/GetArticleDataList', data).then(res => {
- if (res.Check) {
- this.goodsList = res.Data.Data
- this.loading = false
- } else {
- this.$msg(res.Msg)
- this.goodsList = []
- this.loading = false
+ this.getArticleDataList()
+ this.GetSearchInfoListAll()
+ },
+ methods: {
+ //閫夋嫨鍦板尯 寮圭獥
+ chooseLocation() {
+ this.showLocation = true
+ },
+ locationClick(name) {
+ this.address = name
+ uni.setStorageSync('location', name)
+ this.getArticleDataList()
+ this.showLocation = false
+ },
+ chooseArticleType(e) {
+ console.log('item', e);
+ this.ArticleType = e.ArticleType
+ this.getArticleDataList()
+ },
+ chooseItem(item) {
+ this.search = item
+ this.getArticleDataList()
+ },
+ //鐑悳
+ GetSearchInfoListAll() {
+ // this.loadingHot = false
+ this.hotSearch = []
+ let data = {
+ UserId: -1
}
- })
- },
- gooriginalText() {
- uni.navigateTo({
- url: '/pages/checkPolicies/originalText'
- })
- },
- godetail(item) {
- // 鎵嬫満娴忚鍣ㄨ烦杞�
- window.open(item.ArticleUrl, "_blank");
- },
- goproject() {
- uni.navigateTo({
- url: '/pages/checkPolicies/project'
- })
- },
- gofastMatch() {
- uni.navigateTo({
- url: '/pages/policyMatching/fastMatch'
- })
- },
- goprecise() {
- uni.navigateTo({
- url: '/pages/policyMatching/precise'
- })
- },
- closeLocation() {
- this.showLocation = false;
+ this.$http.post('/SearchInfo/GetSearchPolicyList', data).then(res => {
+ if (res.Check) {
+ console.log("鐑悳===", res.Data);
+ this.hotSearch = res.Data
+ // this.loadingHot = true
+ } else {
+ this.hotSearch = []
+ // this.loadingHot = true
+ }
+ }).catch(err => {
+ this.hotSearch = []
+ // this.loadingHot = true
+ })
+ },
+ //
+ getArticleDataList() {
+ this.loading = true
+ console.log("鎼滅储===");
+ let data = {
+ Platform: this.address,
+ ArticleType: this.ArticleType,
+ Scope: '',
+ Keyword: this.search,
+ PageNumber: 1,
+ PageSize: 10,
+ UserId: uni.getStorageSync('userId') || -1
+ }
+ this.$http.post('/ArticleData/GetArticleDataList', data).then(res => {
+ if (res.Check) {
+ this.goodsList = res.Data.Data
+ this.loading = false
+ } else {
+ this.$msg(res.Msg)
+ this.goodsList = []
+ this.loading = false
+ }
+ })
+ },
+ gooriginalText() {
+ uni.navigateTo({
+ url: '/pages/checkPolicies/originalText'
+ })
+ },
+ godetail(item) {
+ // 鎵嬫満娴忚鍣ㄨ烦杞�
+ window.open(item.ArticleUrl, "_blank");
+ },
+ goproject() {
+ uni.navigateTo({
+ url: '/pages/checkPolicies/project'
+ })
+ },
+ gofastMatch() {
+ if (uni.getStorageSync('userId')) {
+ uni.navigateTo({
+ url: '/pages/policyMatching/fastMatch'
+ })
+ } else {
+ uni.navigateTo({
+ url: '/pages/public/quick'
+ });
+ }
+
+ },
+ goprecise() {
+ if (uni.getStorageSync('userId')) {
+ uni.navigateTo({
+ url: '/pages/policyMatching/precise'
+ })
+ } else {
+ uni.navigateTo({
+ url: '/pages/public/quick'
+ });
+ }
+
+ },
+ closeLocation() {
+ this.showLocation = false;
+ }
}
}
-}
</script>
<style lang="scss" scoped>
-page {
- background-color: #F7F7F7;
-}
-
-.mp-search-box {
- position: absolute;
- left: 0;
- top: 30upx;
- z-index: 9999;
- width: 100%;
- padding: 0 80upx;
-
- .ser-input {
- flex: 1;
- height: 56upx;
- line-height: 56upx;
- text-align: center;
- font-size: 28upx;
- color: $font-color-base;
- border-radius: 20px;
- background: rgba(255, 255, 255, .6);
+ page {
+ background-color: #F7F7F7;
}
-}
-header {
- padding: 0 30upx;
- height: 120upx;
- background-color: #236AF0;
- display: flex;
- color: #fff;
- font-size: 14px;
+ .mp-search-box {
+ position: absolute;
+ left: 0;
+ top: 30upx;
+ z-index: 9999;
+ width: 100%;
+ padding: 0 80upx;
- .left {
- width: 150upx;
- height: 120upx;
- line-height: 120upx;
- text-align: left;
- display: flex;
-
- i {
- font-size: 36upx;
+ .ser-input {
+ flex: 1;
+ height: 56upx;
+ line-height: 56upx;
+ text-align: center;
+ font-size: 28upx;
+ color: $font-color-base;
+ border-radius: 20px;
+ background: rgba(255, 255, 255, .6);
}
}
- .search {
- flex: 1;
- height: 80upx;
- line-height: 80upx;
- border-radius: 40upx;
- background-color: #fff;
- padding: 0 20upx;
- margin: 20upx 0;
- color: #236AF0;
+ header {
+ padding: 0 30upx 30upx;
+ color: #fff;
+ font-size: 14px;
+ // height: 391upx;
+ // background: linear-gradient( 180deg, #314ABB 0%, #5277E0 100%);
+ background: url('/static/index/beijing.png') center no-repeat;
+ background-size: cover;
+ /* 鑳屾櫙鍥剧墖瑕嗙洊鏁翠釜鍖哄煙 */
- i {
- font-size: 26upx;
- color: #ccc;
+ .left {
+ width: 150upx;
+ height: 80upx;
+ line-height: 80upx;
+ text-align: left;
+ display: flex;
+
+ i {
+ font-size: 36upx;
+ }
+ }
+
+ .logo {
+ text-align: center;
+
+ image {
+ width: 275upx;
+ height: 144upx;
+ }
+ }
+
+ .search-box {
+ height: 80upx;
+ line-height: 80upx;
+ border-radius: 40upx;
+ background-color: #fff;
+ padding: 0 10upx;
+ margin: 20upx 0;
+ color: #236AF0;
+ display: flex;
+ align-items: center;
+
+ image {
+ width: 28upx;
+ height: 28upx;
+ margin-right: 10upx;
+ }
+
+ input {
+ flex: 1;
+ font-size: 24upx;
+ color: #999999;
+ }
+ }
+
+ .hot {
+ font-size: 24upx;
+ color: #FFFFFF;
+ padding-left: 10upx;
+ display: flex;
+ align-items: center;
+
+ image {
+ height: 34upx;
+ width: 34upx;
+ }
+
+ .hot-msg {
+ flex: 1;
+ line-height: 1;
+ white-space: nowrap;
+ /* 寮哄埗鏂囨湰涓嶆崲琛� */
+ overflow: hidden;
+ /* 闅愯棌瓒呭嚭閮ㄥ垎 */
+ text-overflow: ellipsis;
+
+ /* 瓒呭嚭閮ㄥ垎鏄剧ず鐪佺暐鍙� */
+ text {
+ margin-right: 10upx;
+ }
+ }
}
}
-}
-
-/* 鍒嗙被 */
-.cate-section {
- display: flex;
- justify-content: space-around;
- align-items: center;
- flex-wrap: wrap;
- padding: 30upx 22upx;
- background: #fff;
-
- .cate-item {
+ /* 鍒嗙被 */
+ .cate-section {
display: flex;
- flex-direction: column;
+ justify-content: space-around;
align-items: center;
- font-size: $font-sm + 2upx;
- color: $font-color-dark;
+ flex-wrap: wrap;
+ padding: 30upx 22upx;
+ background: #fff;
+
+ .cate-item {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ font-size: $font-sm + 2upx;
+ color: $font-color-dark;
+ }
+
+ /* 鍘熷浘鏍囬鑹插お娣�,涓嶆兂鏀瑰浘浜�,鎵�浠ュ姞浜嗛�忔槑搴� */
+ image {
+ width: 88upx;
+ height: 88upx;
+ margin-bottom: 14upx;
+ border-radius: 50%;
+ opacity: .7;
+ box-shadow: 4upx 4upx 20upx rgba(73, 148, 239, 0.3);
+ }
}
- /* 鍘熷浘鏍囬鑹插お娣�,涓嶆兂鏀瑰浘浜�,鎵�浠ュ姞浜嗛�忔槑搴� */
- image {
- width: 88upx;
- height: 88upx;
- margin-bottom: 14upx;
- border-radius: 50%;
- opacity: .7;
- box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
- }
-}
+ // 娴锋姤
+ .posters {
+ padding: 20upx;
-.u-page__tag-item {
- height: 40upx;
- line-height: 40upx;
- min-width: 50upx;
- text-align: center;
- margin: 10upx;
-}
-</style>
+ image {
+ width: 100%;
+ height: 200upx;
+ }
+ }
+
+ .information {
+ margin: 0 20upx 20upx;
+ border-radius: 20upx;
+ overflow: hidden;
+
+ .tabs {
+ padding: 20upx 20upx 0;
+ background-color: #fff;
+ display: flex;
+ justify-content: space-between;
+ border-bottom: 1px solid #E7E7E7;
+ }
+
+ /deep/.u-tabs__wrapper__nav__line {
+ bottom: 0;
+ }
+ }
+
+ .u-page__tag-item {
+ height: 40upx;
+ line-height: 40upx;
+ min-width: 50upx;
+ text-align: center;
+ margin: 10upx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/policyMatching/fastMatch.vue b/pages/policyMatching/fastMatch.vue
index 90e65de..4e36ca2 100644
--- a/pages/policyMatching/fastMatch.vue
+++ b/pages/policyMatching/fastMatch.vue
@@ -1,9 +1,15 @@
<template>
<view class="container">
<header>
- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" /> <u-button type="primary"
+ <!-- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" /> <u-button type="primary"
style="width: 100upx;margin-top: 20upx;" size="normal" text="鎼滅储"
- @click="getArticleDataList()"></u-button>
+ @click="getArticleDataList()"></u-button> -->
+ <view class="right">
+ <image src="/static/index/search.png" mode=""></image>
+ <input class="search" placeholder="璇疯緭鍏ユ劅鍏磋叮鐨勬斂绛栧唴瀹�" type="text" v-model="search" />
+ <u-button type="primary" style="width: 100upx;border-radius: 18upx;" size="normal" text="鎼滅储"
+ @click="getArticleDataList()"></u-button>
+ </view>
</header>
<view v-if = "!loading&& (content!= ''|| content!= 'null')"
style="padding: 40upx;background-color: #fff;margin-top: 20upx;display: flex;justify-content: space-between;">
@@ -79,34 +85,26 @@
display: flex;
color: #fff;
font-size: 14px;
-
- .left {
- width: 150upx;
- height: 100upx;
- line-height: 100upx;
- text-align: left;
- display: flex;
-
- i {
- font-size: 36upx;
- }
- }
-
- .search {
- flex: 1;
- height: 80upx;
- line-height: 80upx;
- border-radius: 40upx;
- background-color: #fff;
- padding: 0 20upx;
- margin: 20upx 0;
- color: #236AF0;
-
- i {
- font-size: 26upx;
- color: #ccc;
- }
- }
-
+ .right{
+ flex: 1;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ border-radius: 20upx;
+ // height: 80upx;
+ // line-height: 80upx;
+ padding: 0 10upx 0 20upx;
+ margin: 20upx 0 ;
+ color: #236AF0;
+ image {
+ width: 28upx;
+ height: 28upx;
+ margin-right:10upx;
+ }
+ .search{
+ flex: 1;
+ }
+ }
+
}
</style>
diff --git a/pages/policyMatching/precise.vue b/pages/policyMatching/precise.vue
index f7d63ef..18f1099 100644
--- a/pages/policyMatching/precise.vue
+++ b/pages/policyMatching/precise.vue
@@ -1,20 +1,25 @@
<template>
<view class="container">
<header>
- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" /> <u-button type="primary"
- style="width: 100upx;margin-top: 20upx;" size="normal" text="鎼滅储" @click="getsearch"></u-button>
- </header>
+ <!-- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" /> <u-button type="primary"
+ style="width: 100upx;margin-top: 20upx;" size="normal" text="鎼滅储" @click="getsearch"></u-button> -->
+ <view class="right">
+ <image src="/static/index/search.png" mode=""></image>
+ <input class="search" placeholder="璇疯緭鍏ユ劅鍏磋叮鐨勬斂绛栧唴瀹�" type="text" v-model="search" />
+ <u-button type="primary" style="width: 100upx;border-radius: 18upx;" size="normal" text="鎼滅储"
+ @click="getsearch()"></u-button>
+ </view>
+ </header>
<view
- style="padding: 40upx;background-color: #fff;margin-top: 20upx;display: flex;justify-content: space-between;">
+ style="padding: 0 20upx;background-color: #fff;display: flex;justify-content: space-between;">
<u-tabs :list="tabsList" @click="chooseArticleType" style="padding-left: 4px;" lineWidth="30"
- lineColor="#f56c6c" :activeStyle="{
- color: '#303133',
- fontWeight: 'bold',
+ lineColor="#6190E8" :activeStyle="{
+ color: '#6190E8',
transform: 'scale(1.05)'
}" :inactiveStyle="{
color: '#606266',
transform: 'scale(1)'
- }" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;">
+ }" itemStyle="padding-left: 15px; padding-right: 15px; height: 54px;">
</u-tabs>
</view>
@@ -26,11 +31,11 @@
<view style="background-color: #f7f7f7;padding: 10upx;margin-bottom: 10upx;">
<view style="display: flex;justify-content: space-between;">
<view style="font-weight: 800px;color: #000;">{{ item.ProjectTitle }}</view>
- <u-tag :text="item.ProjectType" plain size="mini" type="warning"></u-tag>
+ <u-tag :text="item.ProjectType" plain size="mini" type="primary"></u-tag>
</view>
<view style="display: flex;justify-content: space-between;margin-top: 2upx;">
<view style="font-size: 22upx;line-height: 44upx;">{{ item.PlatForm }}</view>
- <u-tag :text="item.StartDate.split(' ')[0]" plain size="mini" type="warning"></u-tag>
+ <!-- <u-tag :text="item.StartDate.split(' ')[0]" plain size="mini" type="primary"></u-tag> -->
<!-- PubTime -->
</view>
</view>
@@ -45,7 +50,7 @@
<view style="display: flex;justify-content: space-between;">
<view style="font-weight: 800px;color: #000;">{{ item.Subsidized }}</view>
<u-tag :text="item.GetTime ? item.GetTime.slice(0, 4) : ''" plain size="mini"
- type="warning"></u-tag>
+ type="primary"></u-tag>
</view>
</view>
</view>
@@ -91,7 +96,7 @@
name: '鍙敵棰嗚ˉ璐�',
badge: {
value: 0,
- type: 'success',
+ type: 'error',
max:99
}
@@ -100,7 +105,7 @@
name: '宸茶幏鎵硅ˉ璐�',
badge: {
value: 0,
- type: 'success',
+ type: 'error',
max:99
}
},
@@ -224,35 +229,26 @@
display: flex;
color: #fff;
font-size: 14px;
-
- .left {
- width: 150upx;
- height: 100upx;
- line-height: 100upx;
- text-align: left;
- display: flex;
-
- i {
- font-size: 36upx;
- }
- }
-
- .search {
- flex: 1;
- height: 80upx;
- line-height: 80upx;
- border-radius: 40upx;
- background-color: #fff;
- padding: 0 20upx;
- margin: 20upx 0;
- color: #236AF0;
-
- i {
- font-size: 26upx;
- color: #ccc;
- }
- }
-
+ .right{
+ flex: 1;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ border-radius: 20upx;
+ // height: 80upx;
+ // line-height: 80upx;
+ padding: 0 10upx 0 20upx;
+ margin: 20upx 0 ;
+ color: #236AF0;
+ image {
+ width: 28upx;
+ height: 28upx;
+ margin-right:10upx;
+ }
+ .search{
+ flex: 1;
+ }
+ }
}
.u-page__tag-item {
diff --git a/pages/public/login.vue b/pages/public/login.vue
index 12282d9..da0fef2 100644
--- a/pages/public/login.vue
+++ b/pages/public/login.vue
@@ -1,29 +1,33 @@
<template>
<view class="container">
- <view class="left-bottom-sign"></view>
- <view class="right-top-sign"></view>
+ <!-- <view class="left-bottom-sign"></view>
+ <view class="right-top-sign"></view> -->
<view class="wrapper">
<view class="welcome">
- 娆㈣繋鏉ュ埌浠佺瓥鏅虹瓟锛�
+ 璐﹀彿鐧诲綍
</view>
<view class="input-content">
<view class="input-item">
- <text class="tit">鏈烘瀯鐮�</text>
+ <!-- <text class="tit">鏈烘瀯鐮�</text> -->
+ <img class="icon" src="/static/login/jigou.png" alt="" />
<input type="text" v-model="CompanyRemark" placeholder="璇疯緭鍏ユ満鏋勭爜" maxlength="11" />
</view>
<view class="input-item">
- <text class="tit">鐢ㄦ埛鍚�</text>
+ <!-- <text class="tit">鐢ㄦ埛鍚�</text> -->
+ <img class="icon" src="/static/login/user.png" alt="" />
<input type="text" v-model="userName" placeholder="璇疯緭鍏ョ敤鎴峰悕" maxlength="11" />
</view>
<view class="input-item">
- <text class="tit">瀵嗙爜</text>
+ <!-- <text class="tit">瀵嗙爜</text> -->
+ <img class="icon" src="/static/login/pwd.png" alt="" />
<input type="password" v-model="password" placeholder="璇疯緭鍏ュ瘑鐮�" maxlength="20" @confirm="toLogin" />
</view>
</view>
- <u-button class="confirm-btn" @click="toLogin" :loading="logining" :disabled="logining">鐧诲綍</u-button>
<view class="forget-section" @click="toForget">
蹇樿瀵嗙爜?
</view>
+ <u-button class="confirm-btn" @click="toLogin" :loading="logining" :disabled="logining">鐧诲綍</u-button>
+
<view class="register-section">
杩樻病鏈夎处鍙�?
<text @click="toRegist">椹笂娉ㄥ唽</text>
@@ -204,9 +208,10 @@
justify-content: space-between;
padding: 0 30upx;
background: $page-color-light;
- height: 120upx;
- border-radius: 4px;
margin-bottom: 50upx;
+ height: 92upx;
+ /* background: #F1F5FE; */
+ border-radius: 12upx;
&:last-child {
margin-bottom: 0;
@@ -218,6 +223,10 @@
line-height: 56upx;
font-size: $font-sm + 2upx;
color: $font-color-base;
+ }
+ .icon{
+ width: 40upx;
+ margin-right: 20upx;
}
input {
@@ -243,13 +252,15 @@
.confirm-btn {
width: 100%;
- height: 76upx;
- line-height: 76upx;
- border-radius: 50px;
- margin-top: 70upx;
- background: $uni-color-primary;
+ height: 92upx;
+ line-height: 92upx;
+ margin-top: 16upx;
+ /* background: $uni-color-primary; */
color: #fff;
font-size: $font-lg;
+ /* font-size: 32upx; */
+ background: #3D9AFF;
+ border-radius: 12upx;
&:after {
border-radius: 100px;
@@ -258,15 +269,16 @@
.forget-section {
font-size: $font-sm + 2upx;
- color: $font-color-spec;
- text-align: center;
+ color: #666666;
+ text-align: right;
margin-top: 80upx;
}
.register-section {
- position: absolute;
+ /* position: absolute;
left: 0;
- bottom: 50upx;
+ bottom: 50upx; */
+ margin-top: 48upx;
width: 100%;
font-size: $font-sm + 2upx;
color: $font-color-base;
diff --git a/pages/public/quick.vue b/pages/public/quick.vue
new file mode 100644
index 0000000..c0b9f93
--- /dev/null
+++ b/pages/public/quick.vue
@@ -0,0 +1,78 @@
+<template>
+ <view class="container">
+ <view class="logo-container">
+ <img src="/static/login/logo.png" alt="" />
+ </view>
+ <view class="login-container">
+ <button class="login-button" @click="toLogin">璐﹀彿鐧婚檰</button>
+ <p class="register-text">杩樻病鏈夎处鍙凤紵 <span class="register-link" @click="toRegist">椹笂娉ㄥ唽</span></p>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ methods: {
+ toLogin() {
+ uni.navigateTo({
+ url: '/pages/public/login'
+ })
+ },
+ toRegist() {
+ uni.navigateTo({
+ url: '/pages/public/register'
+ })
+ },
+ },
+ }
+</script>
+
+<style lang='scss' scoped>
+ page {
+ background: #fff;
+ }
+ .container {
+ padding-top: 115px;
+ position: relative;
+ width: 100vw;
+ height: 100vh;
+ overflow: hidden;
+ background: #fff;
+ }
+ .logo-container{
+ padding-bottom: 160upx;
+ text-align: center;
+ img{
+ width: 50vw;
+ }
+ }
+ .login-container{
+ margin: 0 70upx;
+ display: flex;
+ flex-direction: column;
+ align-items: center; /* 灞呬腑瀵归綈 */
+ justify-content: center;
+
+ .login-button {
+ width: 605upx;
+ height: 92upx;
+ background: #3D9AFF;
+ border-radius: 12upx 12upx 12upx 12upx;
+ font-size: 32upx;
+ color: #FFFFFF;
+ }
+
+ .register-text {
+ margin-top: 48upx;
+ font-size: 24upx;
+ color: #666; /* 鏂囧瓧棰滆壊 */
+ }
+
+ .register-link {
+ color: #3D9AFF; /* 娉ㄥ唽閾炬帴棰滆壊 */
+ cursor: pointer;
+ }
+ }
+
+
+</style>
\ No newline at end of file
diff --git a/pages/user/reportCenter.vue b/pages/user/reportCenter.vue
index a970944..c6fb230 100644
--- a/pages/user/reportCenter.vue
+++ b/pages/user/reportCenter.vue
@@ -1,269 +1,267 @@
<template>
- <view class="container">
- <header>
- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" />
+ <view class="container">
+ <header>
+ <!-- <u-input class="search" placeholder="鎼滅储" type="text" v-model="search" />
<u-button type="primary" style="width: 100upx;margin-top: 20upx;" size="normal" text="鎼滅储"
- @click="onPageChange(1)"></u-button>
- </header>
- <view
- style="padding: 40upx;background-color: #fff;margin-top: 20upx;display: flex;justify-content: space-between;">
- <scroll-view scroll-x class="tabs-scroll" style="white-space: nowrap;">
- <u-tabs :list="tabsList" @click="chooseArticleType" style="padding-left: 4px;" lineWidth="20"
- lineColor="#f56c6c" :activeStyle="{
- color: '#303133',
- fontWeight: 'bold',
+ @click="onPageChange(1)"></u-button> -->
+ <view class="right">
+ <image src="/static/index/search.png" mode=""></image>
+ <input class="search" placeholder="璇疯緭鍏ユ劅鍏磋叮鐨勬斂绛栧唴瀹�" type="text" v-model="search" />
+ <u-button type="primary" style="width: 100upx;border-radius: 18upx;" size="normal" text="鎼滅储"
+ @click="onPageChange(1)"></u-button>
+ </view>
+ </header>
+ <view style="padding: 0 20upx;background-color: #fff;display: flex;justify-content: space-between;">
+ <scroll-view scroll-x class="tabs-scroll" style="white-space: nowrap;">
+ <u-tabs :list="tabsList" @click="chooseArticleType" style="padding-left: 4px;" lineWidth="20"
+ lineColor="#6190E8" :activeStyle="{
+ color: '#6190E8',
transform: 'scale(1.05)'
}" :inactiveStyle="{
color: '#606266',
transform: 'scale(1)'
- }" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;" :scrollable="true">
- </u-tabs>
- </scroll-view>
- </view>
- <view v-if="!loading && goodsList.length > 0"
- style="padding: 40upx;background-color: #fff;margin-top: 20upx;color: #969799;font-size: 28upx;padding-bottom: 200upx;">
- <view class="goods-item" v-for="(item, index) in goodsList" :key="index" @click="godetail(item)">
- <view style="background-color: #f7f7f7;padding: 10upx;margin-bottom: 10upx;">
- <view style="display: flex;justify-content: space-between;">
- <view style="font-weight: 800px;color: #000;">{{ item.ArticleTitle }}</view>
- <view style="width: auto;" @click.stop="star(item)">
- <u-icon name="star-fill" color="gold" size="28"></u-icon>
- </view>
- </view>
- <view style="display: flex;justify-content: space-between;">
- <view style="font-size: 22upx;line-height: 44upx;">{{ item.Platform }}</view>
- <u-tag :text="item.PubTime.split(' ')[0]" plain size="mini" type="warning"></u-tag>
- </view>
- </view>
- </view>
- </view>
- <view v-if="loading" style="margin-top: 100upx;">
- <u-loading-icon></u-loading-icon>
- </view>
- <u-empty v-if="!loading && goodsList.length == 0" mode="data" icon="http://cdn.uviewui.com/uview/empty/car.png">
+ }" itemStyle="padding-left: 15px; padding-right: 15px; height: 54px;" :scrollable="true">
+ </u-tabs>
+ </scroll-view>
+ </view>
+ <view v-if="!loading && goodsList.length > 0"
+ style="padding: 40upx;background-color: #fff;margin-top: 20upx;color: #969799;font-size: 28upx;padding-bottom: 200upx;">
+ <view class="goods-item" v-for="(item, index) in goodsList" :key="index" @click="godetail(item)">
+ <view style="background-color: #f7f7f7;padding: 10upx;margin-bottom: 10upx;">
+ <view style="display: flex;justify-content: space-between;">
+ <view style="font-weight: 800px;color: #000;">{{ item.ArticleTitle }}</view>
+ <view style="width: auto;" @click.stop="star(item)">
+ <u-icon name="star-fill" color="gold" size="28"></u-icon>
+ </view>
+ </view>
+ <view style="display: flex;justify-content: space-between;">
+ <view style="font-size: 22upx;line-height: 44upx;">{{ item.Platform }}</view>
+ <u-tag :text="item.PubTime.split(' ')[0]" plain size="mini" type="warning"></u-tag>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view v-if="loading" style="margin-top: 100upx;">
+ <u-loading-icon></u-loading-icon>
+ </view>
+ <u-empty v-if="!loading && goodsList.length == 0" mode="data" icon="http://cdn.uviewui.com/uview/empty/car.png">
</u-empty>
- <view style="position: fixed;bottom: 0;background-color: #fff;width: 100%;">
- <Pagination :totalItems="total" :itemsPerPage="pageSize" :currentPage="pageIndex"
- @page-change="onPageChange" />
- </view>
- </view>
+ <view style="position: fixed;bottom: 0;background-color: #fff;width: 100%;">
+ <Pagination :totalItems="total" :itemsPerPage="pageSize" :currentPage="pageIndex"
+ @page-change="onPageChange" />
+ </view>
+ </view>
</template>
<script>
-import Pagination from '../../components/Pagination';
-export default {
- components: {
- Pagination
- },
- data() {
- return {
- total: 0,
- pageIndex: 1,
- pageSize: 8,
- search: '',
- titleNViewBackground: '',
- swiperCurrent: 0,
- swiperLength: 0,
- carouselList: [],
- goodsList: [],
+ import Pagination from '../../components/Pagination';
+ export default {
+ components: {
+ Pagination
+ },
+ data() {
+ return {
+ total: 0,
+ pageIndex: 1,
+ pageSize: 8,
+ search: '',
+ titleNViewBackground: '',
+ swiperCurrent: 0,
+ swiperLength: 0,
+ carouselList: [],
+ goodsList: [],
- showLocation: false,
- locationList: [],
- loading: false,
- tabsList: [
- {
- name: '缁煎悎',
- ArticleType: '',
- },
- {
- name: '鐢虫姤閫氱煡',
- ArticleType: '鐢虫姤閫氱煡'
+ showLocation: false,
+ locationList: [],
+ loading: false,
+ tabsList: [{
+ name: '缁煎悎',
+ ArticleType: '',
+ },
+ {
+ name: '鐢虫姤閫氱煡',
+ ArticleType: '鐢虫姤閫氱煡'
- },
- {
- name: '鍏ず鍏憡',
- ArticleType: '鍏ず鍏憡'
- },
- {
- name: '鏀跨瓥',
- ArticleType: '鏀跨瓥'
- },
- {
- name: '娉曡',
- ArticleType: '娉曡'
- },
- {
- name: '鍏朵粬',
- ArticleType: '鍏朵粬'
- },
- ],
- ArticleType: '',
- };
- },
- onLoad() {
- this.GetArticleCollectionList()
+ },
+ {
+ name: '鍏ず鍏憡',
+ ArticleType: '鍏ず鍏憡'
+ },
+ {
+ name: '鏀跨瓥',
+ ArticleType: '鏀跨瓥'
+ },
+ {
+ name: '娉曡',
+ ArticleType: '娉曡'
+ },
+ {
+ name: '鍏朵粬',
+ ArticleType: '鍏朵粬'
+ },
+ ],
+ ArticleType: '',
+ };
+ },
+ onLoad() {
+ this.GetArticleCollectionList()
- },
- methods: {
- // 鏀惰棌
- star(item) {
- const userId = Number(uni.getStorageSync('userId'));
+ },
+ methods: {
+ // 鏀惰棌
+ star(item) {
+ const userId = Number(uni.getStorageSync('userId'));
- const data = {
- ArticleId: item.Id,
- UserId: userId
- };
- this.$http.post('/CollectArticle/DelCollectArticleDataById', data).then(res => {
- if (res.Check) {
+ const data = {
+ ArticleId: item.Id,
+ UserId: userId
+ };
+ this.$http.post('/CollectArticle/DelCollectArticleDataById', data).then(res => {
+ if (res.Check) {
- this.$msg('鎿嶄綔鎴愬姛');
- this.pageIndex = 1
- this.GetArticleCollectionList()
- } else {
- this.$msg(res.Msg);
- }
- });
+ this.$msg('鎿嶄綔鎴愬姛');
+ this.pageIndex = 1
+ this.GetArticleCollectionList()
+ } else {
+ this.$msg(res.Msg);
+ }
+ });
- },
+ },
- //
- GetArticleCollectionList() {
- this.loading = true
- let data = {
- Platform: '',
- ArticleType: this.ArticleType,
- Keyword: this.search,
- PageNumber: this.pageIndex,
- PageSize: this.pageSize,
- UserId: uni.getStorageSync('userId')
- }
- this.$http.post('/ArticleData/GetArticleCollectionList', data).then(res => {
- if (res.Check) {
- this.goodsList = res.Data.Data
- this.total = res.Data.TotalCount
- this.loading = false
- } else {
- this.$msg(res.Msg)
- this.goodsList = []
- this.loading = false
- }
- })
- },
- godetail(item) {
- // 鎵嬫満娴忚鍣ㄨ烦杞�
- window.open(item.ArticleUrl, "_blank");
- },
- onPageChange(e) {
- this.pageIndex = e
- this.GetArticleCollectionList()
- },
- chooseArticleType(e){
- this.pageIndex = 1
- this.ArticleType = e.ArticleType
- this.GetArticleCollectionList()
+ //
+ GetArticleCollectionList() {
+ this.loading = true
+ let data = {
+ Platform: '',
+ ArticleType: this.ArticleType,
+ Keyword: this.search,
+ PageNumber: this.pageIndex,
+ PageSize: this.pageSize,
+ UserId: uni.getStorageSync('userId')
+ }
+ this.$http.post('/ArticleData/GetArticleCollectionList', data).then(res => {
+ if (res.Check) {
+ this.goodsList = res.Data.Data
+ this.total = res.Data.TotalCount
+ this.loading = false
+ } else {
+ this.$msg(res.Msg)
+ this.goodsList = []
+ this.loading = false
+ }
+ })
+ },
+ godetail(item) {
+ // 鎵嬫満娴忚鍣ㄨ烦杞�
+ window.open(item.ArticleUrl, "_blank");
+ },
+ onPageChange(e) {
+ this.pageIndex = e
+ this.GetArticleCollectionList()
+ },
+ chooseArticleType(e) {
+ this.pageIndex = 1
+ this.ArticleType = e.ArticleType
+ this.GetArticleCollectionList()
- }
+ }
- }
-}
+ }
+ }
</script>
<style lang="scss" scoped>
-page {
- background-color: #F7F7F7;
-}
+ page {
+ background-color: #F7F7F7;
+ }
-.mp-search-box {
- position: absolute;
- left: 0;
- top: 30upx;
- z-index: 9999;
- width: 100%;
- padding: 0 80upx;
+ .mp-search-box {
+ position: absolute;
+ left: 0;
+ top: 30upx;
+ z-index: 9999;
+ width: 100%;
+ padding: 0 80upx;
- .ser-input {
- flex: 1;
- height: 56upx;
- line-height: 56upx;
- text-align: center;
- font-size: 28upx;
- color: $font-color-base;
- border-radius: 20px;
- background: rgba(255, 255, 255, .6);
- }
-}
+ .ser-input {
+ flex: 1;
+ height: 56upx;
+ line-height: 56upx;
+ text-align: center;
+ font-size: 28upx;
+ color: $font-color-base;
+ border-radius: 20px;
+ background: rgba(255, 255, 255, .6);
+ }
+ }
-header {
- padding: 0 30upx;
- height: 120upx;
- background-color: #236AF0;
- display: flex;
- color: #fff;
- font-size: 14px;
+ header {
+ padding: 0 30upx;
+ height: 120upx;
+ background-color: #236AF0;
+ display: flex;
+ color: #fff;
+ font-size: 14px;
- .left {
- width: 150upx;
- height: 120upx;
- line-height: 120upx;
- text-align: left;
- display: flex;
+ .right {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ border-radius: 20upx;
+ // height: 80upx;
+ // line-height: 80upx;
+ padding: 0 10upx 0 20upx;
+ margin: 20upx 0;
+ color: #236AF0;
- i {
- font-size: 36upx;
- }
- }
+ image {
+ width: 28upx;
+ height: 28upx;
+ margin-right: 10upx;
+ }
- .search {
- flex: 1;
- height: 80upx;
- line-height: 80upx;
- border-radius: 40upx;
- background-color: #fff;
- padding: 0 20upx;
- margin: 20upx 0;
- color: #236AF0;
+ .search {
+ flex: 1;
+ }
+ }
- i {
- font-size: 26upx;
- color: #ccc;
- }
- }
+ }
-}
+ /* 鍒嗙被 */
+ .cate-section {
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ flex-wrap: wrap;
+ padding: 30upx 22upx;
+ background: #fff;
-/* 鍒嗙被 */
-.cate-section {
- display: flex;
- justify-content: space-around;
- align-items: center;
- flex-wrap: wrap;
- padding: 30upx 22upx;
- background: #fff;
+ .cate-item {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ font-size: $font-sm + 2upx;
+ color: $font-color-dark;
+ }
- .cate-item {
- display: flex;
- flex-direction: column;
- align-items: center;
- font-size: $font-sm + 2upx;
- color: $font-color-dark;
- }
+ /* 鍘熷浘鏍囬鑹插お娣�,涓嶆兂鏀瑰浘浜�,鎵�浠ュ姞浜嗛�忔槑搴� */
+ image {
+ width: 88upx;
+ height: 88upx;
+ margin-bottom: 14upx;
+ border-radius: 50%;
+ opacity: .7;
+ box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+ }
+ }
- /* 鍘熷浘鏍囬鑹插お娣�,涓嶆兂鏀瑰浘浜�,鎵�浠ュ姞浜嗛�忔槑搴� */
- image {
- width: 88upx;
- height: 88upx;
- margin-bottom: 14upx;
- border-radius: 50%;
- opacity: .7;
- box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
- }
-}
-
-.u-page__tag-item {
- height: 40upx;
- line-height: 40upx;
- min-width: 50upx;
- text-align: center;
- margin: 10upx;
-}
-</style>
+ .u-page__tag-item {
+ height: 40upx;
+ line-height: 40upx;
+ min-width: 50upx;
+ text-align: center;
+ margin: 10upx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 7b1b140..a14ba94 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -1,7 +1,7 @@
<template>
<view class="container">
<view class="user-section">
- <image class="bg" src="/static/user-bg.jpg"></image>
+ <!-- <image class="bg" src="/static/index/beijing.png"></image> -->
<view class="user-info-box">
<view class="portrait-box">
<image class="portrait" src="/static/rrlogo.png"></image>
@@ -89,7 +89,7 @@
// 璺宠浆鍒扮櫥褰曢〉闈㈡垨鍏朵粬椤甸潰
setTimeout(() => {
uni.reLaunch({
- url: '/pages/public/login'
+ url: '/pages/public/quick'
});
}, 500);
} else {
@@ -126,8 +126,11 @@
height: 320upx;
padding: 100upx 30upx 0;
position: relative;
+ background: url('/static/index/beijing.png') center no-repeat;
+ background-size: cover;
+ /* 鑳屾櫙鍥剧墖瑕嗙洊鏁翠釜鍖哄煙 */
- .bg {
+ /* .bg {
position: absolute;
left: 0;
top: 0;
@@ -135,7 +138,7 @@
height: 100%;
filter: blur(1px);
opacity: .7;
- }
+ } */
}
.user-info-box {
@@ -163,7 +166,7 @@
display: flex;
flex-direction: column;
color: #36343c;
- background: #f7d680;
+ background: #b6ceff;
border-radius: 16upx;
overflow: hidden;
position: relative;
@@ -222,7 +225,7 @@
.logout-button {
width: 100%;
- background-color: #fa436a;
+ background-color: #3D9AFF;
color: white;
font-size: $font-base + 2upx;
border: none;
diff --git a/static/index/beijing.png b/static/index/beijing.png
new file mode 100644
index 0000000..13785ee
--- /dev/null
+++ b/static/index/beijing.png
Binary files differ
diff --git a/static/index/down.png b/static/index/down.png
new file mode 100644
index 0000000..894c6c8
--- /dev/null
+++ b/static/index/down.png
Binary files differ
diff --git a/static/index/haibao.png b/static/index/haibao.png
new file mode 100644
index 0000000..e04d282
--- /dev/null
+++ b/static/index/haibao.png
Binary files differ
diff --git a/static/index/hot.png b/static/index/hot.png
new file mode 100644
index 0000000..55c28df
--- /dev/null
+++ b/static/index/hot.png
Binary files differ
diff --git a/static/index/nore.png b/static/index/nore.png
new file mode 100644
index 0000000..c031e0b
--- /dev/null
+++ b/static/index/nore.png
Binary files differ
diff --git a/static/index/rczd.png b/static/index/rczd.png
new file mode 100644
index 0000000..5fa4014
--- /dev/null
+++ b/static/index/rczd.png
Binary files differ
diff --git a/static/index/search.png b/static/index/search.png
new file mode 100644
index 0000000..c6d98e5
--- /dev/null
+++ b/static/index/search.png
Binary files differ
diff --git a/static/index/zcbt.png b/static/index/zcbt.png
new file mode 100644
index 0000000..b1d9d36
--- /dev/null
+++ b/static/index/zcbt.png
Binary files differ
diff --git a/static/index/zcxm.png b/static/index/zcxm.png
new file mode 100644
index 0000000..be0e8bb
--- /dev/null
+++ b/static/index/zcxm.png
Binary files differ
diff --git a/static/index/zcyw.png b/static/index/zcyw.png
new file mode 100644
index 0000000..69a0349
--- /dev/null
+++ b/static/index/zcyw.png
Binary files differ
diff --git a/static/index/zndc.png b/static/index/zndc.png
new file mode 100644
index 0000000..1d2e8bb
--- /dev/null
+++ b/static/index/zndc.png
Binary files differ
diff --git a/static/login/jigou.png b/static/login/jigou.png
new file mode 100644
index 0000000..b488105
--- /dev/null
+++ b/static/login/jigou.png
Binary files differ
diff --git a/static/login/logo.png b/static/login/logo.png
new file mode 100644
index 0000000..b03f639
--- /dev/null
+++ b/static/login/logo.png
Binary files differ
diff --git a/static/login/pwd.png b/static/login/pwd.png
new file mode 100644
index 0000000..02c1eef
--- /dev/null
+++ b/static/login/pwd.png
Binary files differ
diff --git a/static/login/user.png b/static/login/user.png
new file mode 100644
index 0000000..f5fc82d
--- /dev/null
+++ b/static/login/user.png
Binary files differ
diff --git a/static/tab-cate-current.png b/static/tab-cate-current.png
index 406a7a0..9d1173d 100644
--- a/static/tab-cate-current.png
+++ b/static/tab-cate-current.png
Binary files differ
diff --git a/static/tab-cate.png b/static/tab-cate.png
index f93cebd..3061f6b 100644
--- a/static/tab-cate.png
+++ b/static/tab-cate.png
Binary files differ
diff --git a/static/tab-home-current.png b/static/tab-home-current.png
index 92947e2..a96cfab 100644
--- a/static/tab-home-current.png
+++ b/static/tab-home-current.png
Binary files differ
diff --git a/static/tab-home.png b/static/tab-home.png
index 1b51640..10e6076 100644
--- a/static/tab-home.png
+++ b/static/tab-home.png
Binary files differ
diff --git a/static/tab-my-current.png b/static/tab-my-current.png
index c1f09b5..d34a22e 100644
--- a/static/tab-my-current.png
+++ b/static/tab-my-current.png
Binary files differ
diff --git a/static/tab-my.png b/static/tab-my.png
index f742ffc..33777b3 100644
--- a/static/tab-my.png
+++ b/static/tab-my.png
Binary files differ
--
Gitblit v1.8.0