1

chuanyi-admin/src/utils/request.js

@@ -17,7 +17,7 @@ export const isRelogin = {
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // create an axios instance
 const service = axios.create({
-  // baseURL: 'http://192.168.0.40:8081', // url = base url + request url
+  // baseURL: 'http://192.168.0.25:8081', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 30000 // request timeout
 })

chuanyi-admin/src/views/system/user/index.vue

@@ -448,8 +448,6 @@ export default {
   },
   created() {
     this.getUserList()
-    this.getRoleList()
-    this.getDeptList()
   },
   methods: {
     // 自定义键名
@@ -678,6 +676,8 @@ export default {
       this.passwordType = 'password'
       this.title = '添加用户'
       this.isDisabled = false
+      this.getRoleList()
+      this.getDeptList()
     },
     /** 查询所有角色 */
     getRoleList() {

chuanyi_client2/package.json

@@ -50,4 +50,4 @@
     "not dead"
   ],
   "__npminstall_done": false
-}
+}

reado-app/pages/message/index.vue

@@ -9,7 +9,8 @@
 							<u-cell :label="item.createTime" isLink>
 								<view slot="title" class="title">
 									<u-badge v-if="item.readState===0" isDot type="error" class="strick"></u-badge>
-									<view class="title-content" :style="item.readState===0?'padding-left:20rpx':''">{{item.noticeTitle}}</view>
+									<view class="title-content" :style="item.readState===0?'padding-left:20rpx':''">
+										{{item.noticeTitle}}</view>
 								</view>
 							</u-cell>
 						</u-cell-group>
@@ -17,7 +18,7 @@
 				</view>
 			</u-list>
 			<view class="empty" v-if="!this.msgList.length">
-				<u-empty mode="data" icon="../../static/data.png">
+				<u-empty class="empty-icon" mode="data" icon="../../static/data.png">
 				</u-empty>
 			</view>
 		</view>
@@ -83,6 +84,16 @@
 		right: 0;
 		left: 0;
 		bottom: 0;
+
+		.empty-icon {
+			width: 400rpx;
+			height: 400rpx;
+			position: absolute;
+			top: 30%;
+			left: 50%;
+			margin-left: -200rpx;
+			margin-top: -200rpx;
+		}
 	}
 
 	.cell {

reado-app/pages/reportForm/index.vue

@@ -12,7 +12,7 @@
 				</view>
 			</u-list>
 			<view class="empty" v-if="!this.reportList.length">
-				<u-empty mode="data" icon="../../static/data.png">
+				<u-empty class="empty-icon" mode="data" icon="../../static/data.png">
 				</u-empty>
 			</view>
 		</view>
@@ -75,5 +75,14 @@
 		right: 0;
 		left: 0;
 		bottom: 0;
+		.empty-icon{
+			width:400rpx;
+			height: 400rpx;
+			position: absolute;
+			top: 30%;
+			left: 50%;
+			margin-left:-200rpx;
+			margin-top:-200rpx;
+		}
 	}
 </style>

reado-app/store/modules/user.js

@@ -77,8 +77,9 @@ const user = {
 			return new Promise((resolve, reject) => {
 				uni.$http.get('/user/getPublicKey').then(res => {
 					if (res.data.code === 200) {
-						commit('SET_PUBKEY', res.data.data)
-						setPubKey(res.data.data)
+						const key=res.data.data.replace('\r\n','')
+						commit('SET_PUBKEY',key)
+						setPubKey(key)
 						resolve(res)
 					}
 				})
@@ -97,7 +98,6 @@ const user = {
 				verifyCode: data.verifyCode,
 				uid: state.uid
 			}
-			console.log(pwd, obj)
 			return new Promise((resolve, reject) => {
 				uni.$http.post('/user/phoneUserLogin', obj).then(res => {
 					if (res.data.code === 200) {

reado-app/utils/request.js

@@ -1,13 +1,14 @@
 import {
 	$http
 } from '@escook/request-miniprogram'
-
-// $http.baseUrl = "http://192.168.0.40:8081"
+	
+// $http.baseUrl = "http://192.168.0.25:8081"
 
 uni.$http = $http
 
 import {
 	getToken,
+	
 	removeAll
 } from "./auth.js"