From 58c2fdb7a3d6c017816e6baba02353019f83ae66 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Sat, 9 Dec 2023 14:14:22 +0800
Subject: [PATCH] src

---
 .env.production                      |   2 +-
 public/.htaccess                     |   8 ++
 public/nginx.conf                    |   3 +
 src/pages.json                       |  28 ++++
 src/pages/article/detail.vue         |   2 +-
 src/pages/auth/login.vue             |  22 +++-
 src/pages/index/welcome.vue          |  27 ++++
 src/pages/score/category.vue         |  86 ++++++++----
 src/pages/score/detail.vue           |  49 +++++++
 src/pages/score/form.vue             |  77 +++++++++--
 src/pages/score/list.vue             | 189 +++++++++++++++++++++++++++
 src/pages/user/profile.vue           | 148 ++++++++++++++-------
 src/pages/user/setting.vue           |  98 ++++++++++++++
 src/static/css/base.css              |  16 ++-
 src/static/images/bit2.png           | Bin 0 -> 5648 bytes
 src/static/images/default-avatar.png | Bin 0 -> 3962 bytes
 src/utils/index.js                   |  10 +-
 src/utils/request.js                 |  23 ++--
 18 files changed, 678 insertions(+), 110 deletions(-)
 create mode 100644 public/.htaccess
 create mode 100644 public/nginx.conf
 create mode 100644 src/pages/index/welcome.vue
 create mode 100644 src/pages/score/detail.vue
 create mode 100644 src/pages/score/list.vue
 create mode 100644 src/pages/user/setting.vue
 create mode 100644 src/static/images/bit2.png
 create mode 100644 src/static/images/default-avatar.png

diff --git a/.env.production b/.env.production
index 8b0b51b..5fc1cfd 100644
--- a/.env.production
+++ b/.env.production
@@ -1,3 +1,3 @@
 ENV = 'production'
 
-VUE_APP_BASE_API = 'http://www.xbzt.cc'
\ No newline at end of file
+VUE_APP_BASE_API = 'http://local.party-rank.host'
\ No newline at end of file
diff --git a/public/.htaccess b/public/.htaccess
new file mode 100644
index 0000000..06c7d29
--- /dev/null
+++ b/public/.htaccess
@@ -0,0 +1,8 @@
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteBase /h5/
+	RewriteRule ^index\.html$ - [L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule . /h5/index.html [L]
+</IfModule>
\ No newline at end of file
diff --git a/public/nginx.conf b/public/nginx.conf
new file mode 100644
index 0000000..5dd0c44
--- /dev/null
+++ b/public/nginx.conf
@@ -0,0 +1,3 @@
+location /h5 {
+	try_files $uri $uri/h5 /h5/index.html?$query_string;
+}
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 884bcd9..bd7700e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,5 +1,11 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/welcome",
+			"style": {
+				"navigationBarTitleText": "五星党建"
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -26,6 +32,21 @@
 				"navigationBarTitleText" : "填报"
 			}
 		},
+		{
+			"path" : "pages/score/list",
+			"style" : 
+			{
+				"navigationBarTitleText" : "我的填报",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/score/detail",
+			"style" : 
+			{
+				"navigationBarTitleText" : "详细"
+			}
+		},
 		{
 			"path" : "pages/score/user-rank",
 			"style" : 
@@ -42,6 +63,13 @@
 				"navigationBarTextStyle": "black"
 			}
 		},
+		{
+			"path" : "pages/user/setting",
+			"style" : 
+			{
+				"navigationBarTitleText" : "设置"
+			}
+		},
 		{
 			"path" : "pages/article/detail",
 			"style" : 
diff --git a/src/pages/article/detail.vue b/src/pages/article/detail.vue
index 973cabe..d30e116 100644
--- a/src/pages/article/detail.vue
+++ b/src/pages/article/detail.vue
@@ -5,7 +5,7 @@
 		</view>
 		<block v-else>
 			<view class="title">{{ title }}</view>
-			<view class="content">
+			<view class="content rich-text">
 				<rich-text :nodes="content" />
 			</view>
 		</block>
diff --git a/src/pages/auth/login.vue b/src/pages/auth/login.vue
index 8569a89..4f4bd9e 100644
--- a/src/pages/auth/login.vue
+++ b/src/pages/auth/login.vue
@@ -22,18 +22,23 @@
 </template>
 
 <script>
+	import { setToken } from '../../utils/index'
 	export default {
 		data() {
 			return {
 				username: '',
 				password: '',
-				redirect: ''
+				redirect: '',
+				openid: '',
+                open_type: '',
 			}
 		},
 		onLoad(e) {
 			if (e.redirect) {
 				this.redirect = e.redirect
 			}
+			this.openid = e.openid
+        	this.open_type = e.open_type
 		},
 		methods: {
 			submit() {
@@ -50,10 +55,15 @@
 					})
 				}
 
-				this.$ajax.post('/api/login', { username: this.username, password: this.password }).then(res => {
+				this.$ajax.post('/api/login', {
+					username: this.username,
+					password: this.password,
+					openid: this.openid,
+					open_type: this.open_type,
+				}).then(res => {
 					if (res.status == 0) {
 						const token = res.data.token
-						uni.setStorageSync('party_rank_auth_token', token)
+						setToken(token)
 						uni.reLaunch({
 							url: '/pages/index/index'
 						})
@@ -70,6 +80,10 @@
 		padding-top: 150rpx;
 		padding-left: 60rpx;
 		padding-right: 60rpx;
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		box-sizing: border-box;
 	}
 	.title {
 		background-color: white;
@@ -97,7 +111,7 @@
 	}
 	.form .submit {
 		font-size: 34rpx;
-		margin-top: 200rpx;
+		margin: 200rpx 0;
 		font-weight: 700;
 	}
 </style>
\ No newline at end of file
diff --git a/src/pages/index/welcome.vue b/src/pages/index/welcome.vue
new file mode 100644
index 0000000..e7a4e70
--- /dev/null
+++ b/src/pages/index/welcome.vue
@@ -0,0 +1,27 @@
+<template>
+</template>
+
+<script>
+import { setToken } from '../../utils/index'
+export default {
+    data() {
+        return {}
+    },
+    onLoad(e) {
+        if (e.token) {
+            setToken(e.token)
+            uni.reLaunch({
+                url: '/pages/index/index'
+            })
+        } else if (e.reLaunch) {
+            uni.reLaunch({
+                url: e.reLaunch
+            })
+        } else {
+            uni.reLaunch({
+                url: '/pages/auth/login'
+            })
+        }
+    },
+}
+</script>
\ No newline at end of file
diff --git a/src/pages/score/category.vue b/src/pages/score/category.vue
index e64d2df..e75d55b 100644
--- a/src/pages/score/category.vue
+++ b/src/pages/score/category.vue
@@ -2,56 +2,84 @@
 	<view class="page">
 		<swiper class="swiper" autoplay circular>
 			<swiper-item v-for="item in banners" :key="item.id">
-				<image :src="item.image" style="height: 300rpx;width: 100%;" />
+				<image :src="item.picture" style="height: 300rpx;width: 100%;" />
 			</swiper-item>
 		</swiper>
 		<view class="app">
 			<view class="row">
-				<view v-for="(item, index) in categories" :key="item.id" v-if="index < 2" class="item" @click="navigateTo">
-					<view class="icon">
-						<image :src="item.image" />
+				<block v-for="(item, index) in categories" :key="item.id">
+					<view v-if="index < 2" class="item" @click="navigateToForm(item.id)">
+						<view class="icon">
+							<image :src="item.image" />
+						</view>
+						<view class="title">{{ item.name }}</view>
 					</view>
-					<view class="title">{{ item.name }}</view>
-				</view>
+				</block>
 			</view>
 			<view class="row">
-				<view v-for="(item, index) in categories" :key="item.id" v-if="index >= 2" class="item">
-					<view class="icon">
-						<image :src="item.image" />
+				<block v-for="(item, index) in categories" :key="item.id">
+					<view v-if="index >= 2" class="item" @click="navigateToForm(item.id)">
+						<view class="icon">
+							<image :src="item.image" />
+						</view>
+						<view class="title">{{ item.name }}</view>
 					</view>
-					<view class="title">{{ item.name }}</view>
-				</view>
+				</block>
 			</view>
 		</view>
-		<view class="article">
+		<view class="article rich-text">
 			<rich-text :nodes="content" />
 		</view>
 	</view>
 </template>
 
 <script>
+	import { isLogin } from '../../utils/index'
 	export default {
 		data() {
 			return {
-				banners: [
-					{id: 1, 'image': 'https://via.placeholder.com/800x300.png?text=1'},
-					{id: 2, 'image': 'https://via.placeholder.com/800x300.png?text=2'},
-					{id: 3, 'image': 'https://via.placeholder.com/800x300.png?text=3'},
-				],
-				categories: [
-					{id: 1, name: '政治忠诚', image: 'https://via.placeholder.com/100x100.png?text=1'},
-					{id: 2, name: '政治定力', image: 'https://via.placeholder.com/100x100.png?text=1'},
-					{id: 3, name: '政治担当', image: 'https://via.placeholder.com/100x100.png?text=1'},
-					{id: 4, name: '政治能力', image: 'https://via.placeholder.com/100x100.png?text=1'},
-					{id: 5, name: '政治自律', image: 'https://via.placeholder.com/100x100.png?text=1'},
-				],
-				content: '<h1>富文本</h1><p>哈哈哈</p><img src="https://via.placeholder.com/100x100.png"/><p><b>哈哈哈</b></p>'
+				banners: [],
+				categories: [],
+				content: ''
 			}
 		},
+		onLoad() {
+			if (!isLogin()) {
+				return uni.showModal({
+					title: '请先登录',
+					showCancel: false,
+					success: () => {
+						uni.navigateTo({
+							url: '/pages/auth/login'
+						})
+					}
+				})
+			}
+			this.init()
+		},
 		methods: {
-			navigateTo() {
+			async init() {
+				uni.showLoading()
+				let res = await this.$ajax.get('/api/banner', { params: { key: 'banner_2' } })
+				if (res.status == 0) {
+					this.banners = res.data
+				}
+				res = await this.$ajax.get('/api/keyword', { params: { key: 'score_cate_' } })
+				if (res.status == 0) {
+					this.categories = res.data.map(item => ({
+						...item,
+						image: item.image ?? '../../static/images/bit2.png'
+					}))
+				}
+				res = await this.$ajax.get('/api/article/cate')
+				if (res.status == 0) {
+					this.content = res.data.content
+				}
+				uni.hideLoading()
+			},
+			navigateToForm(id) {
 				uni.navigateTo({
-					url: '/pages/score/form'
+					url: `/pages/score/form?type=${id}`
 				})
 			}
 		}
@@ -77,8 +105,8 @@
 	}
 	.app .icon ::v-deep uni-image {
 		border-radius: 20rpx;
-		width: 200rpx;
-		height: 200rpx;
+		width: 150rpx;
+		height: 150rpx;
 	}
 	.article {
 		margin: 20rpx;
diff --git a/src/pages/score/detail.vue b/src/pages/score/detail.vue
new file mode 100644
index 0000000..2e4fbc2
--- /dev/null
+++ b/src/pages/score/detail.vue
@@ -0,0 +1,49 @@
+<template>
+    <view class="page">
+        <u-cell-group>
+            <u-cell title="分类" :value="info.type ? info.type.name : ''"></u-cell>
+            <u-cell title="主题" :label="info.title"></u-cell>
+            <u-cell title="内容" :label="info.content"></u-cell>
+            <u-cell title="图片">
+                <u-album slot="label" :urls="info.images" />
+            </u-cell>
+            <u-cell title="附件" :label="info.file"></u-cell>
+            <u-cell title="提交时间" :value="info.created_at"></u-cell>
+            <u-cell title="审核状态" :value="info.check_status_text"></u-cell>
+            <u-cell title="审核时间" :value="info.check_at"></u-cell>
+            <u-cell title="审核人" :value="info.check_user ? info.check_user.name : ''"></u-cell>
+            <u-cell v-if="info.check_status == 2" title="未通过原因" :value="info.check_remarks"></u-cell>
+            <u-cell v-if="info.check_status == 1" title="得分" :value="info.score"></u-cell>
+        </u-cell-group>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            id: '',
+            info: {}
+        }
+    },
+    onLoad(e) {
+        this.id = e.id
+        this.init()
+    },
+    methods: {
+        init() {
+            this.$ajax.get(`/api/user/score/${this.id}`, { custom: {loading: true}}).then(res => {
+                if (res.status == 0) {
+                    this.info = res.data
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style>
+    ::v-deep .u-cell-group {
+        background-color: white;
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages/score/form.vue b/src/pages/score/form.vue
index c1e7328..4a94248 100644
--- a/src/pages/score/form.vue
+++ b/src/pages/score/form.vue
@@ -41,6 +41,9 @@
 						/>
 					</view>
 				</u-form-item>
+				<u-form-item v-if="reason" label="未通过原因" labelPosition="top" labelWidth="auto" borderBottom>
+					<u-text type="warning" :text="reason" margin="30rpx 0" />
+				</u-form-item>
 				<u-form-item>
 					<button class="btn-danger" @click="submit">提交</button>
 				</u-form-item>
@@ -53,10 +56,41 @@
 	export default {
 		data() {
 			return {
+				id: '',
+				type: '',
 				title: '',
 				content: '',
 				images: [],
-				files: []
+				files: [],
+				reason: ''
+			}
+		},
+		onLoad(e) {
+			if (e.type) {
+				this.type = e.type
+			}
+			if (e.id) {
+				this.id = e.id
+				uni.setNavigationBarTitle({
+					title: '修改'
+				})
+				this.$ajax.get(`/api/user/score/${this.id}`).then(res => {
+					if (res.status == 0) {
+						this.title = res.data.title
+						this.content = res.data.content
+						if (res.data.images) {
+							this.images = res.data.images.map((value) => {
+								return {url: value}
+							})
+						}
+						if (res.data.file) {
+							this.files = [{ url: res.data.file }]
+						}
+						if (res.data.check_status == 2) {
+							this.reason = res.data.check_remarks
+						}
+					}
+				})
 			}
 		},
 		methods: {
@@ -74,29 +108,32 @@
 					})
 				})
 				for (let i = 0; i < lists.length; i++) {
-					const result = await this.uploadFilePromise(lists[i].url)
+					const result = await this.$ajax.upload('/api/web/upload', {filePath: lists[i].url, name: 'file'})
 					let item = this.images[fileListLen]
 					this.images.splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
 						message: '',
-						url: result
+						url: result.data.file
 					}))
 					fileListLen++
 				}
 			},
 			uploadFile(event) {
-				this.files.push(event.file)
+				const file = event.file
+				file.status = 'uploading'
+				file.message = '上传中'
+				this.$ajax.upload('/api/web/upload', {filePath: file.url, name: 'file'}).then(res => {
+					if (res.status == 0) {
+						file.status = 'success'
+						file.message = ''
+						file.url = res.data.file
+						this.files.push(file)
+					}
+				})
 			},
 			deleteFile(event) {
 				this.files.splice(event.index, 1)
 			},
-			uploadFilePromise() {
-				return new Promise((resolve, reject) => {
-					setTimeout(() => {
-						resolve('https://via.placeholder.com/100x100.png')
-					}, 1000)
-				})
-			},
 			submit() {
 				if (!this.title) {
 					return uni.showToast({
@@ -104,6 +141,24 @@
 						icon: 'error'
 					})
 				}
+				const params = {
+					type_id: this.type,
+					title: this.title,
+					content: this.content,
+					images: this.images.length > 0 ? this.images.map(item => { return item.url }) : null,
+					file: this.files.length > 0 ? this.files[0].url : null
+				}
+				this.$ajax.post('/api/user/score', params, { custom: {loading: true} }).then(res => {
+					if (res.status == 0) {
+						uni.showToast({
+							title: '提交成功',
+							icon: 'success'
+						})
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 800)
+					}
+				})
 			}
 		}
 	}
diff --git a/src/pages/score/list.vue b/src/pages/score/list.vue
new file mode 100644
index 0000000..2316df8
--- /dev/null
+++ b/src/pages/score/list.vue
@@ -0,0 +1,189 @@
+<template>
+    <view class="page">
+        <u-sticky bgColor="#ffffff">
+            <u-subsection :list="options" mode="subsection" keyName="name" :current="current" @change="changeOption" />
+        </u-sticky>
+        <view v-if="list.length == 0" class="empty">
+            <u-empty />
+        </view>
+        <view v-if="list.length > 0" class="list">
+            <u-list :height="listHeight" @scrolltolower="reachBottom">
+                <u-list-item v-for="item in list" :key="item.id">
+                    <u-cell>
+                        <view class="title" slot="title">
+                            <view class="name1">{{ item.title }}</view>
+                            <view class="name2" :class="{
+                                'text-gray': item.check_status == 0,
+                                'text-warning': item.check_status == 2,
+                                'text-success': item.check_status == 1,
+                            }">{{ item.check_status_text }}</view>
+                        </view>
+                        <view slot="label">
+                            <view class="labels">
+                                <view class="label">提交时间: {{ item.created_at }}</view>
+                                <view v-if="item.check_status > 0" class="label">审核时间: {{ item.check_at }}</view>
+                                <view v-if="item.check_status == 1" class="label">得分: <text class="text-success">+{{ item.score }}</text></view>
+                                <view v-if="item.check_status == 2" class="label">未通过原因: <u-text type="error" :text="item.check_remarks" /></view>
+                            </view>
+                            <view class="options">
+                                <u-button text="详细" type="info" @click="show(item.id)" />
+                                <u-button v-if="item.check_status != 1" text="修改" type="error" @click="edit(item.id)" />
+                                <u-button v-if="item.check_status != 1" text="删除" type="error" plain @click="deleteItem(item.id)" />
+                            </view>
+                        </view>
+                    </u-cell>
+                </u-list-item>
+            </u-list>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            options: [
+                {name: '待审核', status: 0},
+                {name: '审核通过', status: 1},
+                {name: '未通过', status: 2}
+            ],
+            current: 0,
+            list: [],
+            page: 1,
+            perPage: 20,
+            total: 0,
+            listHeight: 0,
+        }
+    },
+    onLoad() {
+        this.loadData(true)
+        uni.getSystemInfo({
+            success: (res) => {
+                this.listHeight = res.safeArea.height - 54
+            }
+        })
+    },
+    onPullDownRefresh() {
+        this.loadData(true)
+    },
+    methods: {
+         loadData(refresh) {
+            if (refresh) {
+                this.list = []
+                this.page = 1
+            }
+            const params = {
+                page: this.page,
+                perPage: this.perPage,
+                check_status: this.options[this.current].status,
+            }
+            this.$ajax.get('/api/user/score', { params , custom: {loading: true}}).then(res => {
+                uni.stopPullDownRefresh()
+                if (res.status == 0) {
+                    this.list = this.list.concat(res.data)
+                    this.total = res.meta.total
+                }
+            }).catch(error => {
+                uni.stopPullDownRefresh()
+            })
+        },
+        reachBottom() {
+            if (this.list.length < this.total) {
+                this.page++
+                this.loadData()
+            }
+        },
+        changeOption(index) {
+            this.current = index
+            this.loadData(true)
+        },
+        edit(id) {
+            uni.navigateTo({
+                url: `/pages/score/form?id=${id}`
+            })
+        },
+        show(id) {
+            uni.navigateTo({
+                url: `/pages/score/detail?id=${id}`
+            })
+        },
+        deleteItem(id) {
+            uni.showModal({
+                title: '删除记录',
+                content: '删除后不可恢复, 是否确定?',
+                success: (result) => {
+                    if (result.confirm) {
+                        console.log(id)
+                        this.$ajax.delete(`/api/user/score/${id}`, { custom: {loading: true}}).then(res => {
+                            if (res.status == 0) {
+                                this.loadData(true)
+                            }
+                        })
+                    }
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style>
+    .page ::v-deep .u-sticky {
+        padding: 20rpx;
+    }
+    .list ::v-deep .u-list-item {
+        background-color: white;
+        margin-top: 20rpx;
+    }
+    .list .title {
+        display: flex;
+        justify-content: space-between;
+    }
+    .list .name1 {
+        font-weight: bold;
+    }
+    .list .name2 {
+        width: 100rpx;
+        text-align: center;
+        margin-left: 5rpx;
+    }
+    .list .text-gray {
+        color: #999;
+    }
+    .list .text-warning {
+        color: #f0ad4e;
+    }
+    .list .text-success {
+        color: #4cd964;
+    }
+    .list .labels {
+        margin-top: 15rpx;
+        color: #999;
+        border-top: 1px solid #ECECEC;
+        padding: 10rpx 0;
+    }
+    .list .label {
+        margin-top: 10rpx;
+    }
+    .list .options {
+        border-top: 1px solid #ECECEC;
+        margin-top: 15rpx;
+        padding-top: 10rpx;
+        display: flex;
+        justify-content: end;
+    }
+    .list .u-button {
+        margin: 0 5px;
+        width: 120rpx;
+    }
+    .empty {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+         margin-top: 20rpx;
+        background-color: white;
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages/user/profile.vue b/src/pages/user/profile.vue
index 77486bc..f74d0d6 100644
--- a/src/pages/user/profile.vue
+++ b/src/pages/user/profile.vue
@@ -6,14 +6,14 @@
 				<view class="bg2"></view>
 			</view>
 			<view class="box">
-				<view class="title">
+				<view class="title" @click="setting">
 					<view class="left">
 						<view class="avatar">
-							<image src="https://via.placeholder.com/64x64.png">
+							<image :src="user.avatar">
 						</view>
 						<view class="name">
-							<view class="name1">党员1</view>
-							<view class="name2">党支部1</view>
+							<view class="name1">{{ user.name }}</view>
+							<view class="name2">{{ user.cate_name }}</view>
 						</view>
 					</view>
 					<view class="icon flex">
@@ -22,17 +22,17 @@
 				</view>
 				<view class="list">
 					<view class="item">
-						<view class="number">10</view>
+						<view class="number">{{ user.current_score }}</view>
 						<view class="text">当前得星</view>
 					</view>
 					<view class="border"></view>
 					<view class="item">
-						<view class="number">10</view>
+						<view class="number">{{ user.rank }}</view>
 						<view class="text">总排名</view>
 					</view>
 					<view class="border"></view>
 					<view class="item">
-						<view class="number">10</view>
+						<view class="number">{{ user.score }}</view>
 						<view class="text">累计得星</view>
 					</view>
 				</view>
@@ -42,62 +42,120 @@
 			<view id="echart" style="height: 250px;width: 330px;"></view>
 		</view>
 		<view class="options">
-			<view class="item">
-				<view class="flex">
-					<view class="icon">
-						<image src="https://via.placeholder.com/64x64.png">
-					</view>
-					<view class="title">我的填报</view>
-				</view>
-				<view class="badge">
-					<image src="../../static/images/arrow-right.png" style="width: 20rpx; height: 20rpx;" />
-				</view>
-			</view>
+			<u-cell-group>
+				<u-cell title="我的填报" isLink @click="scoreList" />
+			</u-cell-group>
+		</view>
+		<view class="logout">
+			<u-button text="退出" type="error" @click="logout" />
 		</view>
 	</view>
 </template>
 
 <script>
 	import * as echarts from 'echarts';
+	import { setToken } from '../../utils/index'
 	export default {
 		data() {
 			return {
-				
+				user: {
+					name: '',
+					cate_name: '',
+					avatar: '',
+					current_score: 0,
+					score: 0,
+					rank: '-'
+				}
 			}
 		},
 		onLoad() {
-			this.$nextTick(() => {
-				this.init()
-			})
+			this.init()
 		},
 		methods: {
-			init() {
+			async init() {
+				uni.showLoading()
+				let res = await this.$ajax.get('/api/user/profile')
+				let radarValue = {}
+				if (res.status == 0) {
+					this.user.name = res.data.name
+					this.user.cate_name = res.data.cate_name
+					this.user.avatar = res.data.avatar ?? '../../static/images/default-avatar.png'
+					this.user.current_score = res.data.current_score
+					this.user.score = res.data.score
+					radarValue = res.data.scores
+				}
+				res = await this.$ajax.get('/api/rank/current', { params: { type: 'user' } })
+				if (res.status == 0) {
+					this.user.rank = res.data.rank
+				}
+				res = await this.$ajax.get('/api/keyword', { params: { key: 'score_cate_' } })
+				let radarIndicator = [
+					{ name: '政治忠诚' },
+					{ name: '政治定力' },
+					{ name: '政治担当' },
+					{ name: '政治能力' },
+					{ name: '政治自律' },
+				]
+				let radarValues = []
+				if (res.status == 0) {
+					radarIndicator = res.data.map(item => {
+						radarValues.push(radarValue[item.key])
+						return {key: item.key, name: item.name}
+					})
+				}
+				uni.hideLoading()
 				var option = {
 					radar: {
-						indicator: [
-							{ name: '政治忠诚', max: 50 },
-							{ name: '政治定力', max: 50 },
-							{ name: '政治担当', max: 50 },
-							{ name: '政治能力', max: 50 },
-							{ name: '政治自律', max: 50 },
-						]
+						indicator: radarIndicator
 					},
 					series: [
 						{
 							type: 'radar',
-							areaStyle: {
-								opacity: 0.9
-							},
 							data: [
 								{
-									value: [33, 14, 28, 26, 42],
+									value: radarValues,
 								}
 							]
 						}
 					]
 				};
-				var chartElement = echarts.init(document.getElementById('echart'));
-				chartElement.setOption(option)
+				this.$nextTick(() => {
+					this.chart(option)
+				})
+			},
+			chart(option) {
+				if (document.getElementById('echart')) {
+					var chartElement = echarts.init(document.getElementById('echart'));
+					chartElement.setOption(option)
+				}
+			},
+			logout() {
+				uni.showModal({
+					title: '是否确定?',
+					content: '退出登录',
+					success: (res) => {
+						if (res.confirm) {
+							this.$ajax.get('/api/logout').then(res => {
+								if (res.status == 0) {
+									setToken('')
+									uni.reLaunch({
+										url: '/pages/auth/login'
+									})
+								}
+							})
+						}
+					}
+				})
+			},
+			setting() {
+				uni.navigateTo({
+					url: '/pages/user/setting'
+				})
+			},
+			scoreList() {
+				uni.navigateTo({
+					url: '/pages/score/list'
+				})
 			}
 		}
 	}
@@ -190,21 +248,11 @@
 	}
 	.options {
 		margin-top: 10rpx;
-	}
-	.options .item {
-		padding: 10rpx;
 		background-color: white;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		border-bottom: 1px solid #dddddd;
 	}
-	.options .title {
-		margin-left: 15rpx;
-	}
-	.options .icon ::v-deep uni-image {
-		border-radius: 10rpx;
-		width: 60rpx;
-		height: 60rpx;
+
+	.logout {
+		margin-top: 20rpx;
+		padding: 0 20rpx;
 	}
 </style>
diff --git a/src/pages/user/setting.vue b/src/pages/user/setting.vue
new file mode 100644
index 0000000..cc53f3c
--- /dev/null
+++ b/src/pages/user/setting.vue
@@ -0,0 +1,98 @@
+<template>
+    <view class="page">
+        <u-cell-group>
+            <u-cell title="头像" isLink @click="chooseAvatar">
+                <view slot="value">
+                    <u-avatar :src="user.avatar" />
+                </view>
+            </u-cell>
+            <u-cell title="姓名" :value="user.name" isLink @click="openModal('姓名', 'name')" />
+            <u-cell title="党支部" :value="user.cate_name" />
+        </u-cell-group>
+        <u-modal
+            :show="modal.show"
+            :title="modal.title"
+            :showCancelButton="true"
+            :closeOnClickOverlay="true"
+            :asyncClose="true"
+            @confirm="confirmModal"
+            @cancel="closeModal"
+            @close="closeModal"
+        >
+            <u--input v-model="modal.value" border="surround" />
+        </u-modal>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            user: {
+                avatar: '../../static/images/default-avatar.png',
+                name: '',
+                cate_name: '',
+            },
+             modal: {
+                type: 'text',
+                show: false,
+                title: '',
+                key: '',
+                value: ''
+            },
+        }
+    },
+    onLoad() {
+        this.$ajax.get('/api/user/profile', {custom: {loading: true}}).then(res => {
+            if (res.status == 0) {
+                this.user = res.data
+            }
+        })
+    },
+    methods: {
+        chooseAvatar() {
+            uni.chooseImage({
+                count: 1,
+                success: (result) => {
+                    this.$ajax.upload('/api/web/upload', {filePath: result.tempFilePaths[0],name: 'file'}).then(res => {
+                        if (res.status == 0) {
+                            this.update('avatar', res.data.file)
+                        }
+                    })
+                }
+            })
+        },
+        openModal(title, name) {
+            this.modal.title = title
+            this.modal.key = name
+            this.modal.show = true
+            this.modal.value = this.user[name]
+        },
+        confirmModal() {
+            const key = this.modal.key
+            const value = this.modal.value
+			this.update(key, value)
+            this.modal.show = false
+        },
+        closeModal() {
+            this.modal.show = false
+        },
+        update(key, value) {
+            const params = {}
+            params[key] = value
+            this.$ajax.post('/api/user/profile', params, {custom: {loading: true}}).then(res => {
+                if (res.status == 0) {
+                    this.user[key] = value
+                }
+            })
+        }
+        
+    }
+}
+</script>
+
+<style>
+    .page {
+        background-color: white;
+    }
+</style>
\ No newline at end of file
diff --git a/src/static/css/base.css b/src/static/css/base.css
index b8d433c..598f9de 100644
--- a/src/static/css/base.css
+++ b/src/static/css/base.css
@@ -3,10 +3,6 @@
 }
 .page {
 	background-color: #efefef;
-	/* position: absolute;
-	width: 100%;
-	height: 100%;
-	box-sizing: border-box; */
 }
 
 .flex {
@@ -18,4 +14,14 @@
 .btn-danger {
 	color: white;
 	background-color: #C20000;
-}
\ No newline at end of file
+}
+
+.rich-text {
+	word-break: break-all;
+	overflow-wrap: break-word;
+	line-height: 1.6;
+}
+.rich-text img {
+	width: 100%;
+	height: 100%;
+}
diff --git a/src/static/images/bit2.png b/src/static/images/bit2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e80e98cbfbedef95ba97d6f499e69c7bbb42062f
GIT binary patch
literal 5648
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

literal 0
HcmV?d00001

diff --git a/src/static/images/default-avatar.png b/src/static/images/default-avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c0baf17355e0a5054f6aebf8a49b4ec8c7533cf
GIT binary patch
literal 3962
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
Ub~Dv>&j0`b07*qoM6N<$f-}%|ga7~l

literal 0
HcmV?d00001

diff --git a/src/utils/index.js b/src/utils/index.js
index 8241ff2..7ddb988 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,3 +1,11 @@
 export function isLogin() {
     return !!uni.getStorageSync('party_rank_auth_token')
-}
\ No newline at end of file
+}
+
+export function setToken(value) {
+    uni.setStorageSync('party_rank_auth_token', value)
+}
+
+export function getToken() {
+    return uni.getStorageSync('party_rank_auth_token')
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 3c916e1..95f49ed 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,4 +1,6 @@
 // http 网络请求
+// import { getToken } from './index'
+const { getToken } = require('./')
 
 module.exports = () => {
     // 全局配置
@@ -14,7 +16,7 @@ module.exports = () => {
     // 请求拦截
     uni.$u.http.interceptors.request.use(
         (config) => {
-            const token = uni.getStorageSync('party_rank_auth_token')
+            const token = getToken()
             if (token) {
                 config.header['Authorization'] = `Bearer ${token}`
             }
@@ -32,25 +34,30 @@ module.exports = () => {
     // 响应拦截
     uni.$u.http.interceptors.response.use(
         (response) => {
-            uni.hideLoading()
+            if (response.config.custom.loading) {
+                uni.hideLoading()
+            }
 
             const res = response.data
+            if (res.status == 401) {
+                return uni.reLaunch({
+                    url: '/pages/auth/login'
+                })
+            }
             if (response.config.custom.toast && res.status != 0 && res.doNotDisplayToast != 1) {
                 uni.showModal({
                     title: res.msg,
                     showCancel: false
                 })
             }
-            if (res.code == 401) {
-                uni.reLaunch({
-                    url: '/pages/auth/login'
-                })
-            }
 
             return res
         },
         (response) => {
-            uni.hideLoading()
+            console.log(response)
+            if (response.config?.custom.loading) {
+                uni.hideLoading()
+            }
             return Promise.reject(response)
         }
     )