zhaobao 1 год назад
Родитель
Сommit
6a3db45f7b
100 измененных файлов с 1654 добавлено и 236 удалено
  1. 24 14
      .hbuilderx/launch.json
  2. 7 1
      api/system/app.js
  3. 25 0
      api/system/art.js
  4. 1 8
      api/system/upload.js
  5. 18 0
      api/system/user.js
  6. 5 0
      pages/history/history.vue
  7. 8 3
      pages/index/index.vue
  8. 139 13
      pages/myCenter/myCenter.vue
  9. 44 64
      pages/myCenter/personalData/personalData.vue
  10. BIN
      unpackage/cache/apk/__UNI__73F6024_cm.apk
  11. 1 1
      unpackage/cache/apk/apkurl
  12. 0 0
      unpackage/cache/apk/cmManifestCache.json
  13. 1 1
      unpackage/cache/wgt/__UNI__73F6024/app-config-service.js
  14. 0 0
      unpackage/cache/wgt/__UNI__73F6024/app-service.js
  15. 0 0
      unpackage/cache/wgt/__UNI__73F6024/app-view.js
  16. 0 0
      unpackage/cache/wgt/__UNI__73F6024/manifest.json
  17. BIN
      unpackage/debug/android_debug.apk
  18. 1 1
      unpackage/dist/build/app-plus/app-config-service.js
  19. 0 0
      unpackage/dist/build/app-plus/app-service.js
  20. 0 0
      unpackage/dist/build/app-plus/app-view.js
  21. 0 0
      unpackage/dist/build/app-plus/manifest.json
  22. 0 0
      unpackage/dist/dev/.automator/app-plus/.automator.json
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/applicationCenter/applicationCenter.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/history/history.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/detail/detail.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/message/message.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCenter.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/personalData/personalData.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/updatePassword/updatePassword.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/webview/webview.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map
  44. 0 0
      unpackage/dist/dev/app-plus/__uniappchooselocation.js
  45. BIN
      unpackage/dist/dev/app-plus/__uniapperror.png
  46. 0 0
      unpackage/dist/dev/app-plus/__uniappes6.js
  47. 0 0
      unpackage/dist/dev/app-plus/__uniappopenlocation.js
  48. 0 0
      unpackage/dist/dev/app-plus/__uniapppicker.js
  49. 6 0
      unpackage/dist/dev/app-plus/__uniappquill.js
  50. 0 0
      unpackage/dist/dev/app-plus/__uniappquillimageresize.js
  51. 0 0
      unpackage/dist/dev/app-plus/__uniappscan.js
  52. BIN
      unpackage/dist/dev/app-plus/__uniappsuccess.png
  53. 25 0
      unpackage/dist/dev/app-plus/__uniappview.html
  54. 8 0
      unpackage/dist/dev/app-plus/app-config-service.js
  55. 154 0
      unpackage/dist/dev/app-plus/app-config.js
  56. 9 0
      unpackage/dist/dev/app-plus/app-service.js
  57. 823 0
      unpackage/dist/dev/app-plus/app-view.js
  58. 0 0
      unpackage/dist/dev/app-plus/manifest.json
  59. BIN
      unpackage/dist/dev/app-plus/static/app/tab-1.png
  60. BIN
      unpackage/dist/dev/app-plus/static/app/tab-2.png
  61. BIN
      unpackage/dist/dev/app-plus/static/app/tab-3.png
  62. BIN
      unpackage/dist/dev/app-plus/static/app/tab-4.png
  63. BIN
      unpackage/dist/dev/app-plus/static/center/archive-tick.png
  64. BIN
      unpackage/dist/dev/app-plus/static/center/bg.png
  65. BIN
      unpackage/dist/dev/app-plus/static/center/dollar-circle.png
  66. BIN
      unpackage/dist/dev/app-plus/static/center/heart.png
  67. BIN
      unpackage/dist/dev/app-plus/static/center/setting.png
  68. BIN
      unpackage/dist/dev/app-plus/static/center/timer.png
  69. BIN
      unpackage/dist/dev/app-plus/static/components/avatar.png
  70. BIN
      unpackage/dist/dev/app-plus/static/history/camera.png
  71. BIN
      unpackage/dist/dev/app-plus/static/index/bg-bottom.png
  72. BIN
      unpackage/dist/dev/app-plus/static/index/bg.png
  73. BIN
      unpackage/dist/dev/app-plus/static/index/company.png
  74. BIN
      unpackage/dist/dev/app-plus/static/index/message.png
  75. BIN
      unpackage/dist/dev/app-plus/static/index/notice.png
  76. BIN
      unpackage/dist/dev/app-plus/static/index/scanner.png
  77. BIN
      unpackage/dist/dev/app-plus/static/index/tab1.png
  78. BIN
      unpackage/dist/dev/app-plus/static/index/tab2.png
  79. BIN
      unpackage/dist/dev/app-plus/static/index/tab3.png
  80. BIN
      unpackage/dist/dev/app-plus/static/index/user.png
  81. BIN
      unpackage/dist/dev/app-plus/static/login/phone.png
  82. BIN
      unpackage/dist/dev/app-plus/static/login/pwd.png
  83. BIN
      unpackage/dist/dev/app-plus/static/logo.png
  84. BIN
      unpackage/dist/dev/app-plus/static/message/nav1.png
  85. BIN
      unpackage/dist/dev/app-plus/static/message/nav2.png
  86. BIN
      unpackage/dist/dev/app-plus/static/tabbar/app.png
  87. BIN
      unpackage/dist/dev/app-plus/static/tabbar/appEd.png
  88. BIN
      unpackage/dist/dev/app-plus/static/tabbar/index.png
  89. BIN
      unpackage/dist/dev/app-plus/static/tabbar/indexEd.png
  90. BIN
      unpackage/dist/dev/app-plus/static/tabbar/info.png
  91. BIN
      unpackage/dist/dev/app-plus/static/tabbar/infoEd.png
  92. BIN
      unpackage/dist/dev/app-plus/static/tabbar/myCenter.png
  93. BIN
      unpackage/dist/dev/app-plus/static/tabbar/myCenterEd.png
  94. BIN
      unpackage/dist/dev/app-plus/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
  95. 0 0
      unpackage/dist/dev/app-plus/view.css
  96. 0 0
      unpackage/dist/dev/app-plus/view.umd.min.js
  97. 201 104
      unpackage/dist/dev/mp-weixin/common/vendor.js
  98. 14 14
      unpackage/dist/dev/mp-weixin/pages/applicationCenter/applicationCenter.js
  99. 139 11
      unpackage/dist/dev/mp-weixin/pages/history/history.js
  100. 1 1
      unpackage/dist/dev/mp-weixin/pages/history/history.wxml

+ 24 - 14
.hbuilderx/launch.json

@@ -1,16 +1,26 @@
-{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+        	"app-plus" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"default" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"mp-weixin" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"type" : "uniCloud"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

+ 7 - 1
api/system/app.js

@@ -10,4 +10,10 @@ export function getQuickList() {
 	return request({
 		url: "/mini/quick"
 	})
-}
+}
+
+export function getAppVersion() {
+	return request({
+		url: "/setting/get/appVersion"
+	})
+}

+ 25 - 0
api/system/art.js

@@ -55,3 +55,28 @@ export function getArtByPage(data) {
     data
   })
 }
+
+/**
+ * 最近文章列表
+ * @param limit 限制笔数
+
+ */
+export function getRecentListByLimit(limit) {
+  return request({
+    url: `/art/recent/${limit}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 某个类别下的最近文章列表
+ * @param artCatId 分类
+ * @param limit 限制笔数
+
+ */
+export function getRecentListByArtCatAndLimit(artCatId, limit) {
+  return request({
+    url: `/art/recent/${artCatId}/${limit}`,
+    method: 'GET'
+  })
+}

+ 1 - 8
api/system/upload.js

@@ -6,9 +6,6 @@ export const upload=({formData,filePath,callback})=>{
 		mask:true,
 		title:"上传中"
 	})
-	let unionid=uni.getStorageSync('unionid');
-	let qrcode=uni.getStorageSync('qrcode');
-	let isAccount=uni.getStorageSync('isAccount');
 	return new Promise(function(resolve,reject){
 		const uploadTask=uni.uploadFile({
 			url: baseUrl+'/upload/file',
@@ -17,11 +14,7 @@ export const upload=({formData,filePath,callback})=>{
 				[config.TokenKey]:getToken(),
 				AppID:config.appID,
 				AppKey:config.appKey,
-				AppSecret: config.appSecret,
-				wxCode:unionid,
-				ocId:qrcode.ocId,
-				AppType:'mini',
-				isAccount:isAccount
+				AppSecret: config.appSecret
 			},
 			name: 'file',
 			formData,

+ 18 - 0
api/system/user.js

@@ -12,6 +12,24 @@ export function login(data) {
 		data
 	})
 }
+
+// 获取用户基本信息
+export function getUserProfile() {
+  return request({
+    url: '/user/profile',
+    method: 'GET'
+  })
+}
+
+// 更新用户基本信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/user/profile/update',
+    method: 'PUT',
+    data
+  })
+}
+
 export function getUserInfo() {
 	return request({
 		url: '/user/profile'

+ 5 - 0
pages/history/history.vue

@@ -88,6 +88,10 @@
 			}
 		},
 		onPullDownRefresh() {
+			this.conditions={
+				page: 1,
+				limit: 10					
+			}
 			this.getArtCatTop()
 			uni.stopPullDownRefresh()
 		}
@@ -112,6 +116,7 @@
 				font-size: 28rpx;
 				color: #35364F;
 				position: relative;
+				text-align: center;
 				&::after{
 					display: block;
 					width: 50%;

+ 8 - 3
pages/index/index.vue

@@ -46,7 +46,8 @@
 							<uni-notice-bar
 								scrollable :text="notice" 
 								background-color="#fff0"
-								:speed="30"								
+								:speed="50"
+								ref="uni-notice-bar"							
 								color="#333" />
 						</div>
 					</div>
@@ -163,7 +164,7 @@
 </template>
 
 <script>
-	import {getRecentArtByList} from '@/api/system/art.js'
+	import {getRecentListByLimit,getArtByList} from '@/api/system/art.js'
 	import { getAlertByPage } from '@/api/aqpt/alertApi.js';
 	import { getDangerByPage } from '@/api/aqpt/dangerApi.js';
 	import { getTaskByPage } from '@/api/aqpt/taskApi.js';
@@ -236,12 +237,16 @@
 				let user=uni.getStorageSync('accountInfo');
 				if(user){this.user=user}
 				let notice=""
-				getRecentArtByList().then((res)=>{
+				getRecentListByLimit
+				getArtByList(3).then((res)=>{
 					for(let i=0;i<res.data.length;i++){
 						notice+=`${res.data[i].artTitle} 发布时间:${res.data[i].issuedAt};`
 					}
 					this.notice=notice
 					this.showNotice=true
+					this.$nextTick(()=>{
+						this.$refs['uni-notice-bar'].initSize()
+					})
 				})
 				let params={
 					page: 1,

+ 139 - 13
pages/myCenter/myCenter.vue

@@ -3,15 +3,15 @@
 		<view class="banner custom_status_bar">
 			<div class="custom-nav">个人中心</div>	
 			<div class="user-container">
-				<view class="avatar">
-					<image v-if="user.userAvatar" class="photo" :src="user.userAvatar" mode="widthFix" @error="userAvatar=defaultAvatar"></image>
+				<view class="avatar" @click="linkToProfile">
+					<image v-if="user.accountAvatar" class="photo" :src="user.accountAvatar" mode="widthFix" @error="accountAvatar=defaultAvatar"></image>
 					<image v-else class="photo" :src="defaultAvatar" mode="widthFix"></image>
 				</view>
 				<view class="bottom">
 					<view class="name">
-						<text>{{user.userName}}</text>
+						<text>{{user.accountName}}</text>
 					</view>	
-					<div class="phone">{{user.userPhone}}</div>
+					<div class="phone">{{user.accountPhone}}</div>
 				</view>						
 			</div>
 		</view>
@@ -22,8 +22,9 @@
 						<image class="icon" src="/static/center/dollar-circle.png" mode="widthFix"></image>
 						<text class="name">联系电话</text>
 					</div>
-					<view class="rt">
-						<text class="cont">{{user.userPhone}}</text>					
+					<view class="rt" @click="linkToProfile">
+						<text class="cont">{{user.accountPhone}}</text>
+						<uni-icons type="right" size="20" color="#B3B3B3"></uni-icons>				
 					</view>
 				</view>
 				<view class="item">
@@ -60,11 +61,32 @@
 						<image class="icon" src="/static/center/setting.png" mode="widthFix"></image>
 						<text class="name">版本升级</text>
 					</div>
-					<view class="rt">
+					<view class="rt" @click="downloadApk">
 						<text class="cont">{{version}}</text>
 						<uni-icons type="right" size="20" color="#B3B3B3"></uni-icons>						
 					</view>
 				</view>
+<!-- 				<view class="item">
+					<div class="lf">
+						<image class="icon" src="/static/center/setting.png" mode="widthFix"></image>
+						<text class="name">版本升级</text>
+					</div>
+					<view class="rt" @click="updateApp">
+						<text class="cont">{{version}}</text>
+						<uni-icons type="right" size="20" color="#B3B3B3"></uni-icons>						
+					</view>
+				</view> -->
+			</view>
+			<view class="download-wrap" v-if="downloadVisable" @click.stop="cancelInstall">
+				<view class="download-box" @click.stop>
+					<view class="title">温馨提示!</view>
+					<view class="subtitle">软件正在下载中,请耐心等待……</view>
+					<progress :percent="download.progress" show-info stroke-width="3" />
+					<view class="hadnle">
+						<view class="bt install" @click.stop="install">安装</view>
+						<view class="bt cancel" @click.stop="cancelInstall">取消</view>
+					</view>
+				</view>
 			</view>
 			<div class="logoutBt" @click="logout">退出登录</div>				
 		</view>	
@@ -73,6 +95,9 @@
 
 <script>
 	import {logout} from '@/api/system/user.js'	
+	import { getUserProfile } from '@/api/system/user.js'
+	import { getAppVersion } from '@/api/system/app.js'
+	
 	export default{
 		data(){
 			return{
@@ -82,14 +107,20 @@
 					ocName: "",
 					positionName: "",
 					roleName: "",
-					userAvatar: "",
+					accountAvatar: "",
 					userIntro: "",
-					userName: "",
-					userPhone: "",
+					accountName: "",
+					accountPhone: "",
 					userPhoto: "",
 					userRealName: ""					
 				},
-				version:'1.0.0'
+				appVersion:'1.0.0',
+				version:'1.0.0',
+				downloadTask:{},
+				download:{
+					progress:0,					
+				},
+				downloadVisable:false
 			}
 		},	
 		onShow() {
@@ -98,7 +129,7 @@
 		created() {
 			// #ifdef APP-PLUS
 			plus.runtime.getProperty(plus.runtime.appid,(info)=>{
-				this.version=info.version
+				this.appVersion=info.version
 			})			
 			// #endif
 		},
@@ -108,6 +139,14 @@
 				if(user){
 					this.user=user
 				}
+				getUserProfile().then((res)=>{
+					this.user={...user,...res.data}
+				})
+				getAppVersion().then((res)=>{
+					if(res.data&&res.data.settingValue){
+						this.version=res.data.settingValue
+					}
+				})
 			},
 			linkToContacts(){
 				let baseUrl="http://h5.xazhyc.com"
@@ -115,6 +154,11 @@
 					url:`/pages/webview/webview?href=${baseUrl}/profile/views/addressBook.html&name=通讯录`
 				})
 			},
+			linkToProfile(){
+				uni.navigateTo({
+					url:'/pages/myCenter/personalData/personalData'
+				})				
+			},
 			updatePwd(){
 				uni.navigateTo({
 					url:'/pages/myCenter/updatePassword/updatePassword'
@@ -157,7 +201,8 @@
 									method: "GET"
 								}, (d, status) => {
 									if (status == 200) {
-										plus.runtime.install(d.filename)
+										plus.runtime.install(d.filename||'六院联创')
+										plus.nativeUI.alert("安装 ")
 									} else {
 										plus.nativeUI.alert("安装失败,请稍候重试: " + status)
 									}
@@ -174,6 +219,44 @@
 						}
 					}
 				})
+			},
+			updateApp(){
+				const apkUrl="http://h5.xazhyc.com/app.apk"
+				this.downloadVisable=true
+				const downloadTask = uni.downloadFile({
+					url: apkUrl,
+					success: (res) => {
+						let status=res.statusCode
+						if (status == 200) {
+							this.download.file=res.tempFilePath
+						} else {
+							plus.nativeUI.alert("安装失败,请稍候重试: " + status)
+						}
+					}
+				});
+				downloadTask.onProgressUpdate((res) => {
+					this.download.progress=res.progress
+				});	
+				this.downloadTask=downloadTask
+			},
+			install(){
+				if(!this.download.file) return
+				if(this.download.progress<100){
+					uni.showToast({
+						icon: 'none',
+						mask: true,
+						duration: 2000,
+						title: "下载完毕在安装",
+					})	
+					return
+				}
+				this.downloadVisable=false
+				plus.nativeUI.alert("安装 ")				
+				plus.runtime.install(this.download.file)
+			},
+			cancelInstall(){
+				this.downloadVisable=false
+				this.downloadTask.abort();
 			}
 		}
 	}
@@ -294,4 +377,47 @@
 			}
 		}
 	}
+	.download-wrap{
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background-color: rgba(0,0,0,0.6);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 999;
+		.download-box{
+			width: 500rpx;
+			min-height: 180rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			padding:50rpx 20rpx;
+			box-sizing: border-box;
+			box-shadow: 1px 1px 8rpx rgba(0,0,0,0.8);
+			.title{
+				text-align: center;
+				font-size: 36rpx;
+				color: #000;
+			}
+			.subtitle{
+				text-align: center;
+				padding: 10rpx;
+				color: #424242;
+				font-size: 28rpx;
+			}
+			.hadnle{
+				.bt{
+					width: 50%;
+					display: inline-block;
+					text-align: center;
+					padding: 20rpx 0;
+					&.install{
+						color: #007aff;
+					}
+				}
+			}
+		}
+	}
 </style>

+ 44 - 64
pages/myCenter/personalData/personalData.vue

@@ -1,26 +1,19 @@
 <template>
 	<view class="wrap">
 		<view class="info-wrap">
-			<view class="avatar-container">
+			<view class="avatar-container" @click="editAvart">
 				<template>
-					<image v-if="avatar" class="avatar" :src="avatar" mode="widthFix" @error="ImageError"></image>
+					<image v-if="form.accountAvatar" class="avatar" :src="form.accountAvatar" mode="widthFix" @error="ImageError"></image>
 					<image v-else class="avatar" :src="defaultAvatar" mode="widthFix"></image>
 				</template>
-				<view class="edit" @click="editAvart">编辑</view>
+				<view class="edit">编辑</view>
 			</view>			
-			<uni-list v-if="userType===1">
-				<uni-list-item title="姓名" :rightText="form.name" clickable  @click="handle('name')" showArrow></uni-list-item>
-				<uni-list-item title="性别" :rightText="form.gender" clickable  @click="handle('gender')" showArrow></uni-list-item>
-				<uni-list-item title="年龄" :rightText="form.age" clickable  @click="handle('age')" showArrow></uni-list-item>
-				<uni-list-item title="邮箱" :rightText="form.email" clickable  @click="handle('email')" showArrow></uni-list-item>
-				<uni-list-item title="手机号码" :rightText="form.phone"   @click="handle('phone')"></uni-list-item>
-				<uni-list-item title="住址" :rightText="form.address"   @click="handle('address')"></uni-list-item>
-			</uni-list>	
-			<uni-list v-else>
-				<uni-list-item title="学校" :rightText="form.school" clickable  @click="handle('school')" showArrow></uni-list-item>
-				<uni-list-item title="学院" :rightText="form.college" clickable  @click="handle('college')" showArrow></uni-list-item>
-				<uni-list-item title="专业" :rightText="form.major" clickable  @click="handle('major')" showArrow></uni-list-item>
-				<uni-list-item title="学号" :rightText="form.studentId" clickable  @click="handle('studentId')" showArrow></uni-list-item>
+			<uni-list>
+				<uni-list-item title="帐号名称" :rightText="form.accountName" clickable  @click="handle('accountName')" showArrow></uni-list-item>
+				<uni-list-item title="手机号码" :rightText="form.accountPhone" clickable  @click="handle('accountPhone')" showArrow></uni-list-item>
+				<uni-list-item title="个人姓名" :rightText="form.accountRealName" clickable  @click="handle('accountRealName')" showArrow></uni-list-item>
+				<uni-list-item title="工    号" :rightText="form.accountStaffNo" clickable  @click="handle('accountStaffNo')" showArrow></uni-list-item>
+				<uni-list-item title="介    绍" :rightText="form.accountIntro" clickable   @click="handle('accountIntro')" showArrow></uni-list-item>
 			</uni-list>				
 			<div class="submit-BT" @click="submit">保存</div>
 		</view>		
@@ -43,25 +36,22 @@
 
 <script>	
 	import {isEmpty} from '@/libs';
+	import { getUserProfile, updateUserProfile } from '@/api/system/user.js'
+	import { upload } from '@/api/system/upload.js'
 	export default {
 		data() {
 			return {
 				defaultAvatar:require("@/static/components/avatar.png"),
 				avatar:"",
 				updateValue:"",
-				userType:undefined,
 				form:{
-					name:"",
-					age:"",
-					gender:"",
-					phone:"",
-					email:"",	
-					birthday:"",
-					address:"",
-					school:"",
-					college:"",
-					major:"",
-					studentId:""					
+					accountId: undefined,
+					accountName: '',
+					accountRealName: '',
+					accountAvatar: '',
+					accountPhone: '',
+					accountStaffNo: '',
+					accountIntro: ''				
 				}
 			}
 		},
@@ -70,12 +60,12 @@
 		},
 		methods: {
 			init(){
-				this.getDetailById();
+				this.getUserProfile();
 			},
-			getDetailById(){
-				let user=uni.getStorageSync('accountInfo');
-				if(user){user=JSON.parse(user)}
-				let userId=user.userId;
+			getUserProfile(){
+				getUserProfile().then((res)=>{
+					this.form=res.data
+				})
 			},
 			handle(type){
 				if(type==='avatar'){
@@ -86,13 +76,6 @@
 					this.open();
 				}
 			},
-			updateAvatar(){
-				uni.chooseImage({
-					complete() {
-						
-					}
-				})
-			},
 			open() {
 				this.$refs.popup.open();
 			},
@@ -103,12 +86,17 @@
 				this.avatar=this.defaultAvatar
 			},
 			editAvart(){
+				const self=this;
 				uni.chooseImage({
 					count: 1,
 					sizeType: ['original', 'compressed'],
 					sourceType: ['album',"camera"], //从相册选择
 					success:(res)=>{
-						this.avatar=res.tempFilePaths[0]						
+						let filePath=res.tempFilePaths[0]
+						upload({filePath}).then((resq)=>{
+							var fileResq=JSON.parse(resq)
+							self.form.accountAvatar=fileResq.data.fileUrl;
+						})
 					}
 				});		
 			},
@@ -125,28 +113,18 @@
 				this.close();		
 			},
 			submit(){
-				let params={};
-				if(this.userType===1){
-					params={
-						name:this.form.name,
-						age:this.form.age,
-						gender:this.form.gender,
-						phone:this.form.phone,
-						email:this.form.email,	
-						birthday:this.form.birthday,
-						address:this.form.address				
-					}	
-				}else{
-					params={
-						school:this.form.school,
-						college:this.form.college,
-						major:this.form.major,
-						studentId:this.form.studentId							
-					}					
-					
-				}
-				console.log({
-					params
+				updateUserProfile(this.form).then(()=>{
+					uni.showToast({
+						title:"修改成功!",
+						icon:"none",
+						duration:1000
+					})				
+					setTimeout(()=>{
+						uni.hideToast()
+						uni.reLaunch({
+							url:'/pages/myCenter/myCenter'
+						})	
+					},1000)
 				})
 			},
 			isEmpty(val){
@@ -163,9 +141,10 @@
 	.wrap{
 		.info-wrap{
 			background-color: #f8f8f8;
+			padding-top: 36rpx;			
 			.avatar-container{
 				&{
-					margin: 32rpx auto;
+					margin: 0 auto;
 					width: 156rpx;
 					height: 156rpx;
 					background: rgba(255,255,255,0.39);
@@ -173,6 +152,7 @@
 					border-radius: 50%;	
 					position: relative;
 					overflow: hidden;
+					margin-bottom: 36rpx;
 				}
 				.avatar{
 					width: 156rpx;

BIN
unpackage/cache/apk/__UNI__73F6024_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/70344630-76c7-11ee-a0c1-cd4f18dd1d1f
+https://ide.dcloud.net.cn/build/download/ff8ece00-7d18-11ee-a2a1-094cdc7604e2

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/cache/apk/cmManifestCache.json


+ 1 - 1
unpackage/cache/wgt/__UNI__73F6024/app-config-service.js

@@ -1,7 +1,7 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/login/index","pages/index/index","pages/myCenter/myCenter","pages/myCenter/personalData/personalData","pages/myCenter/updatePassword/updatePassword","pages/webview/webview","pages/history/history","pages/applicationCenter/applicationCenter","pages/message/message","pages/index/detail/detail"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"智慧创新","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#7A7E83","selectedColor":"#1296db","borderStyle":"black","backgroundColor":"#ffffff","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabbar/index.png","selectedIconPath":"static/tabbar/indexEd.png","text":"首页"},{"pagePath":"pages/applicationCenter/applicationCenter","iconPath":"static/tabbar/app.png","selectedIconPath":"static/tabbar/appEd.png","text":"应用中心"},{"pagePath":"pages/history/history","iconPath":"static/tabbar/info.png","selectedIconPath":"static/tabbar/infoEd.png","text":"信息中心"},{"pagePath":"pages/myCenter/myCenter","iconPath":"static/tabbar/myCenter.png","selectedIconPath":"static/tabbar/myCenterEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"六院联创","compilerVersion":"3.95","entryPagePath":"pages/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniConfig = {"pages":["pages/login/index","pages/index/index","pages/myCenter/myCenter","pages/myCenter/personalData/personalData","pages/myCenter/updatePassword/updatePassword","pages/webview/webview","pages/history/history","pages/applicationCenter/applicationCenter","pages/message/message","pages/index/detail/detail"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"智慧创新","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#7A7E83","selectedColor":"#1296db","borderStyle":"black","backgroundColor":"#ffffff","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabbar/index.png","selectedIconPath":"static/tabbar/indexEd.png","text":"首页"},{"pagePath":"pages/applicationCenter/applicationCenter","iconPath":"static/tabbar/app.png","selectedIconPath":"static/tabbar/appEd.png","text":"应用中心"},{"pagePath":"pages/history/history","iconPath":"static/tabbar/info.png","selectedIconPath":"static/tabbar/infoEd.png","text":"信息中心"},{"pagePath":"pages/myCenter/myCenter","iconPath":"static/tabbar/myCenter.png","selectedIconPath":"static/tabbar/myCenterEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"六院联创","compilerVersion":"3.96","entryPagePath":"pages/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
 var __uniRoutes = [{"path":"/pages/login/index","meta":{"isQuit":true},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"首页","navigationStyle":"custom","enablePullDownRefresh":true}},{"path":"/pages/myCenter/myCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationBarBackgroundColor":"#3D90F4","enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/myCenter/personalData/personalData","meta":{},"window":{"navigationBarTitleText":"个人资料","enablePullDownRefresh":false}},{"path":"/pages/myCenter/updatePassword/updatePassword","meta":{},"window":{"navigationBarTitleText":"修改密码","enablePullDownRefresh":false}},{"path":"/pages/webview/webview","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":true}},{"path":"/pages/history/history","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"信息中心","enablePullDownRefresh":true}},{"path":"/pages/applicationCenter/applicationCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"应用中心","enablePullDownRefresh":false}},{"path":"/pages/message/message","meta":{},"window":{"navigationBarTitleText":"消息","enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/index/detail/detail","meta":{},"window":{"navigationBarTitleText":"详情","enablePullDownRefresh":true}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/cache/wgt/__UNI__73F6024/app-service.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/cache/wgt/__UNI__73F6024/app-view.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/cache/wgt/__UNI__73F6024/manifest.json


BIN
unpackage/debug/android_debug.apk


+ 1 - 1
unpackage/dist/build/app-plus/app-config-service.js

@@ -1,7 +1,7 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/login/index","pages/index/index","pages/myCenter/myCenter","pages/myCenter/personalData/personalData","pages/myCenter/updatePassword/updatePassword","pages/webview/webview","pages/history/history","pages/applicationCenter/applicationCenter","pages/message/message","pages/index/detail/detail"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"智慧创新","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#7A7E83","selectedColor":"#1296db","borderStyle":"black","backgroundColor":"#ffffff","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabbar/index.png","selectedIconPath":"static/tabbar/indexEd.png","text":"首页"},{"pagePath":"pages/applicationCenter/applicationCenter","iconPath":"static/tabbar/app.png","selectedIconPath":"static/tabbar/appEd.png","text":"应用中心"},{"pagePath":"pages/history/history","iconPath":"static/tabbar/info.png","selectedIconPath":"static/tabbar/infoEd.png","text":"信息中心"},{"pagePath":"pages/myCenter/myCenter","iconPath":"static/tabbar/myCenter.png","selectedIconPath":"static/tabbar/myCenterEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"六院联创","compilerVersion":"3.95","entryPagePath":"pages/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniConfig = {"pages":["pages/login/index","pages/index/index","pages/myCenter/myCenter","pages/myCenter/personalData/personalData","pages/myCenter/updatePassword/updatePassword","pages/webview/webview","pages/history/history","pages/applicationCenter/applicationCenter","pages/message/message","pages/index/detail/detail"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"智慧创新","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#7A7E83","selectedColor":"#1296db","borderStyle":"black","backgroundColor":"#ffffff","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabbar/index.png","selectedIconPath":"static/tabbar/indexEd.png","text":"首页"},{"pagePath":"pages/applicationCenter/applicationCenter","iconPath":"static/tabbar/app.png","selectedIconPath":"static/tabbar/appEd.png","text":"应用中心"},{"pagePath":"pages/history/history","iconPath":"static/tabbar/info.png","selectedIconPath":"static/tabbar/infoEd.png","text":"信息中心"},{"pagePath":"pages/myCenter/myCenter","iconPath":"static/tabbar/myCenter.png","selectedIconPath":"static/tabbar/myCenterEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"六院联创","compilerVersion":"3.96","entryPagePath":"pages/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
 var __uniRoutes = [{"path":"/pages/login/index","meta":{"isQuit":true},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"首页","navigationStyle":"custom","enablePullDownRefresh":true}},{"path":"/pages/myCenter/myCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationBarBackgroundColor":"#3D90F4","enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/myCenter/personalData/personalData","meta":{},"window":{"navigationBarTitleText":"个人资料","enablePullDownRefresh":false}},{"path":"/pages/myCenter/updatePassword/updatePassword","meta":{},"window":{"navigationBarTitleText":"修改密码","enablePullDownRefresh":false}},{"path":"/pages/webview/webview","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":true}},{"path":"/pages/history/history","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"信息中心","enablePullDownRefresh":true}},{"path":"/pages/applicationCenter/applicationCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"应用中心","enablePullDownRefresh":false}},{"path":"/pages/message/message","meta":{},"window":{"navigationBarTitleText":"消息","enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/index/detail/detail","meta":{},"window":{"navigationBarTitleText":"详情","enablePullDownRefresh":true}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/app-plus/app-service.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/app-plus/app-view.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/app-plus/manifest.json


+ 0 - 0
unpackage/dist/dev/.automator/app-plus/.automator.json


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/applicationCenter/applicationCenter.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/history/history.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/detail/detail.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/message/message.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCenter.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/personalData/personalData.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/updatePassword/updatePassword.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/webview/webview.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappchooselocation.js


BIN
unpackage/dist/dev/app-plus/__uniapperror.png


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappes6.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappopenlocation.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/__uniapppicker.js


Разница между файлами не показана из-за своего большого размера
+ 6 - 0
unpackage/dist/dev/app-plus/__uniappquill.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappquillimageresize.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappscan.js


BIN
unpackage/dist/dev/app-plus/__uniappsuccess.png


+ 25 - 0
unpackage/dist/dev/app-plus/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

+ 8 - 0
unpackage/dist/dev/app-plus/app-config-service.js

@@ -0,0 +1,8 @@
+
+var isReady=false;var onReadyCallbacks=[];
+var isServiceReady=false;var onServiceReadyCallbacks=[];
+var __uniConfig = {"pages":["pages/login/index","pages/index/index","pages/myCenter/myCenter","pages/myCenter/personalData/personalData","pages/myCenter/updatePassword/updatePassword","pages/webview/webview","pages/history/history","pages/applicationCenter/applicationCenter","pages/message/message","pages/index/detail/detail"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"智慧创新","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#7A7E83","selectedColor":"#1296db","borderStyle":"black","backgroundColor":"#ffffff","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabbar/index.png","selectedIconPath":"static/tabbar/indexEd.png","text":"首页"},{"pagePath":"pages/applicationCenter/applicationCenter","iconPath":"static/tabbar/app.png","selectedIconPath":"static/tabbar/appEd.png","text":"应用中心"},{"pagePath":"pages/history/history","iconPath":"static/tabbar/info.png","selectedIconPath":"static/tabbar/infoEd.png","text":"信息中心"},{"pagePath":"pages/myCenter/myCenter","iconPath":"static/tabbar/myCenter.png","selectedIconPath":"static/tabbar/myCenterEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"六院联创","compilerVersion":"3.96","entryPagePath":"pages/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/login/index","meta":{"isQuit":true},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"首页","navigationStyle":"custom","enablePullDownRefresh":true}},{"path":"/pages/myCenter/myCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationBarBackgroundColor":"#3D90F4","enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/myCenter/personalData/personalData","meta":{},"window":{"navigationBarTitleText":"个人资料","enablePullDownRefresh":false}},{"path":"/pages/myCenter/updatePassword/updatePassword","meta":{},"window":{"navigationBarTitleText":"修改密码","enablePullDownRefresh":false}},{"path":"/pages/webview/webview","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":true}},{"path":"/pages/history/history","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"信息中心","enablePullDownRefresh":true}},{"path":"/pages/applicationCenter/applicationCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"应用中心","enablePullDownRefresh":false}},{"path":"/pages/message/message","meta":{},"window":{"navigationBarTitleText":"消息","enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/index/detail/detail","meta":{},"window":{"navigationBarTitleText":"详情","enablePullDownRefresh":true}}];
+__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
+__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
+service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

+ 154 - 0
unpackage/dist/dev/app-plus/app-config.js

@@ -0,0 +1,154 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// install a JSONP callback for chunk loading
+/******/ 	function webpackJsonpCallback(data) {
+/******/ 		var chunkIds = data[0];
+/******/ 		var moreModules = data[1];
+/******/ 		var executeModules = data[2];
+/******/
+/******/ 		// add "moreModules" to the modules object,
+/******/ 		// then flag all "chunkIds" as loaded and fire callback
+/******/ 		var moduleId, chunkId, i = 0, resolves = [];
+/******/ 		for(;i < chunkIds.length; i++) {
+/******/ 			chunkId = chunkIds[i];
+/******/ 			if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
+/******/ 				resolves.push(installedChunks[chunkId][0]);
+/******/ 			}
+/******/ 			installedChunks[chunkId] = 0;
+/******/ 		}
+/******/ 		for(moduleId in moreModules) {
+/******/ 			if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
+/******/ 				modules[moduleId] = moreModules[moduleId];
+/******/ 			}
+/******/ 		}
+/******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
+/******/ 		while(resolves.length) {
+/******/ 			resolves.shift()();
+/******/ 		}
+/******/
+/******/ 		// add entry modules from loaded chunk to deferred list
+/******/ 		deferredModules.push.apply(deferredModules, executeModules || []);
+/******/
+/******/ 		// run deferred modules when all chunks ready
+/******/ 		return checkDeferredModules();
+/******/ 	};
+/******/ 	function checkDeferredModules() {
+/******/ 		var result;
+/******/ 		for(var i = 0; i < deferredModules.length; i++) {
+/******/ 			var deferredModule = deferredModules[i];
+/******/ 			var fulfilled = true;
+/******/ 			for(var j = 1; j < deferredModule.length; j++) {
+/******/ 				var depId = deferredModule[j];
+/******/ 				if(installedChunks[depId] !== 0) fulfilled = false;
+/******/ 			}
+/******/ 			if(fulfilled) {
+/******/ 				deferredModules.splice(i--, 1);
+/******/ 				result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
+/******/ 			}
+/******/ 		}
+/******/
+/******/ 		return result;
+/******/ 	}
+/******/
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// object to store loaded and loading chunks
+/******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
+/******/ 	// Promise = chunk loading, 0 = chunk loaded
+/******/ 	var installedChunks = {
+/******/ 		"app-config": 0
+/******/ 	};
+/******/
+/******/ 	var deferredModules = [];
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "/";
+/******/
+/******/ 	var jsonpArray = this["webpackJsonp"] = this["webpackJsonp"] || [];
+/******/ 	var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
+/******/ 	jsonpArray.push = webpackJsonpCallback;
+/******/ 	jsonpArray = jsonpArray.slice();
+/******/ 	for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
+/******/ 	var parentJsonpFunction = oldJsonpFunction;
+/******/
+/******/
+/******/ 	// run deferred modules from other chunks
+/******/ 	checkDeferredModules();
+/******/ })
+/************************************************************************/
+/******/ ([]);

Разница между файлами не показана из-за своего большого размера
+ 9 - 0
unpackage/dist/dev/app-plus/app-service.js


Разница между файлами не показана из-за своего большого размера
+ 823 - 0
unpackage/dist/dev/app-plus/app-view.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


BIN
unpackage/dist/dev/app-plus/static/app/tab-1.png


BIN
unpackage/dist/dev/app-plus/static/app/tab-2.png


BIN
unpackage/dist/dev/app-plus/static/app/tab-3.png


BIN
unpackage/dist/dev/app-plus/static/app/tab-4.png


BIN
unpackage/dist/dev/app-plus/static/center/archive-tick.png


BIN
unpackage/dist/dev/app-plus/static/center/bg.png


BIN
unpackage/dist/dev/app-plus/static/center/dollar-circle.png


BIN
unpackage/dist/dev/app-plus/static/center/heart.png


BIN
unpackage/dist/dev/app-plus/static/center/setting.png


BIN
unpackage/dist/dev/app-plus/static/center/timer.png


BIN
unpackage/dist/dev/app-plus/static/components/avatar.png


BIN
unpackage/dist/dev/app-plus/static/history/camera.png


BIN
unpackage/dist/dev/app-plus/static/index/bg-bottom.png


BIN
unpackage/dist/dev/app-plus/static/index/bg.png


BIN
unpackage/dist/dev/app-plus/static/index/company.png


BIN
unpackage/dist/dev/app-plus/static/index/message.png


BIN
unpackage/dist/dev/app-plus/static/index/notice.png


BIN
unpackage/dist/dev/app-plus/static/index/scanner.png


BIN
unpackage/dist/dev/app-plus/static/index/tab1.png


BIN
unpackage/dist/dev/app-plus/static/index/tab2.png


BIN
unpackage/dist/dev/app-plus/static/index/tab3.png


BIN
unpackage/dist/dev/app-plus/static/index/user.png


BIN
unpackage/dist/dev/app-plus/static/login/phone.png


BIN
unpackage/dist/dev/app-plus/static/login/pwd.png


BIN
unpackage/dist/dev/app-plus/static/logo.png


BIN
unpackage/dist/dev/app-plus/static/message/nav1.png


BIN
unpackage/dist/dev/app-plus/static/message/nav2.png


BIN
unpackage/dist/dev/app-plus/static/tabbar/app.png


BIN
unpackage/dist/dev/app-plus/static/tabbar/appEd.png


BIN
unpackage/dist/dev/app-plus/static/tabbar/index.png


BIN
unpackage/dist/dev/app-plus/static/tabbar/indexEd.png


BIN
unpackage/dist/dev/app-plus/static/tabbar/info.png


BIN
unpackage/dist/dev/app-plus/static/tabbar/infoEd.png


BIN
unpackage/dist/dev/app-plus/static/tabbar/myCenter.png


BIN
unpackage/dist/dev/app-plus/static/tabbar/myCenterEd.png


BIN
unpackage/dist/dev/app-plus/uni_modules/uni-icons/components/uni-icons/uniicons.ttf


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/view.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/view.umd.min.js


Разница между файлами не показана из-за своего большого размера
+ 201 - 104
unpackage/dist/dev/mp-weixin/common/vendor.js


Разница между файлами не показана из-за своего большого размера
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/applicationCenter/applicationCenter.js


Разница между файлами не показана из-за своего большого размера
+ 139 - 11
unpackage/dist/dev/mp-weixin/pages/history/history.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/history/history.wxml

@@ -1 +1 @@
-<web-view src="{{webViewSrc}}"></web-view>
+<view class="art-wrap data-v-24bfa630"><view class="tabs data-v-24bfa630"><block wx:for="{{tabs}}" wx:for-item="tab" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeTab',['$0'],[[['tabs','',index]]]]]]]}}" class="{{['tab','data-v-24bfa630',tab.artCatId===artCatId?'active':'']}}" bindtap="__e">{{tab.artCatTitle}}</view></block></view><view class="tab-container data-v-24bfa630"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="item data-v-24bfa630"><view data-event-opts="{{[['tap',[['showDetail',['$0'],[[['artList','',idx]]]]]]]}}" class="content card data-v-24bfa630" bindtap="__e"><view class="top data-v-24bfa630"><view class="lf data-v-24bfa630"><view class="tag data-v-24bfa630">{{item.$orig.artCatTitle}}</view><block wx:if="{{item.$orig.editorName}}"><view class="author data-v-24bfa630">{{item.$orig.editorName}}</view></block></view><view class="rt data-v-24bfa630"><label class="_span data-v-24bfa630">{{item.m0}}</label></view></view><view class="info data-v-24bfa630"><block wx:if="{{item.$orig.artTitle}}"><view class="title data-v-24bfa630">{{item.$orig.artTitle}}</view></block><view class="footer data-v-24bfa630"><view class="author data-v-24bfa630">{{item.$orig.artAuthor?item.$orig.artAuthor:'未知'}}</view><view class="time data-v-24bfa630">{{item.$orig.issuedAt}}</view></view></view></view></view></block></view></view>

Некоторые файлы не были показаны из-за большого количества измененных файлов