Signed-off-by: zhaobao <528046418@qq.com>

api/system/art.js

@@ -0,0 +1,9 @@
+
+import {request} from '@/libs/request.js'
+
+export function getNotices(data) {
+	return request({
+		url: "/art/page",
+		data
+	})
+}

api/system/user.js

@@ -44,8 +44,8 @@ export function uploadFile(data) {
 }
 export function updatePwd(data) {
 	return request({
-		url: '/user/updatePwd',
-		method: "post",
+		url: '/user/updatePassword',
+		method: "PUT",
 		data
 	})
 }

config/index.js

@@ -1,7 +1,7 @@
 export default {
     base: {
-      dev: 'http://1.15.92.205:8001',
-      pro: 'http://1.15.92.205:8001'
+      dev: 'http://1.15.92.205:7001',
+      pro: 'http://1.15.92.205:7001'
     },
 	appID: '10007',
 	appKey: '82a8bf439373e311',

pages/history/history.vue

@@ -1,22 +1,16 @@
 <template>
-	<view>
-		
-	</view>
+	<web-view :src="webViewSrc"></web-view>
 </template>
-
 <script>
+	import {getToken} from '@/libs/auth.js';
 	export default {
 		data() {
 			return {
-				
+				webViewSrc:""
 			}
 		},
-		methods: {
-			
+		onShow() {
+			this.webViewSrc=`http://baidu.com?token=${getToken()}`
 		}
 	}
 </script>
-
-<style>
-
-</style>

pages/index/index.vue

@@ -5,7 +5,7 @@
 				 <div class="name">工作台</div>
 				 <div class="actions">
 					 <div class="message" @click="linkToMessage">
-						 <image class="icon" src="/static/index/message.png" mode="widthFix"></image>
+						 <image v-if="user.userAvatar" class="icon" src="/static/index/message.png" mode="widthFix"></image>
 					 </div>
 					 <div class="scan" @click="scanQrcode">
 						 <image class="icon" src="/static/index/scanner.png" mode="widthFix"></image>
@@ -15,19 +15,20 @@
 			</view>		
 			<view class="user-info">
 				<div class="company">
-					<text class="company-name">某某股份有限公司</text>
+					<text class="company-name">{{user.ocName}}</text>
 					<image class="icon" src="/static/index/company.png" mode="widthFix"></image>
 				</div>
 				<div class="user">
 					<view class="avatar-box">
-						<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
+						<image v-if="user.userAvatar" class="avatar" :src="user.userAvatar" mode="widthFix" @error="userAvatar=defaultAvatar"></image>
+						<image v-else class="avatar" :src="defaultAvatar" mode="widthFix"></image>
 					</view>
 					<view class="info">
 						<view class="user-name">
-							侯亚峰
+							{{user.userName}}
 						</view>
 						<view class="user-position">
-							主管安全的副厂长
+							{{user.positionName}}
 						</view>
 					</view>
 				</div>
@@ -41,7 +42,13 @@
 							<image class="icon" src="/static/index/notice.png" mode="widthFix"></image>
 							<text>最近动态</text>
 						</div>
-						<div class="notice-cont">公司最近发布《公司2023年管理办法》</div>
+						<div class="notice-cont">
+							<uni-notice-bar
+								scrollable :text="notice" 
+								background-color="#fff0"
+								:speed="20"
+								color="#333" />
+						</div>
 					</div>
 					<view class="tab">
 						<div class="tab-item">
@@ -97,10 +104,25 @@
 </template>
 
 <script>
+	import {getNotices} from '@/api/system/art.js'
 	export default {
 		data() {
 			return {
-				applist: []
+				applist: [],
+				defaultAvatar:"/static/components/avatar.png",
+				notice:"",
+				user:{
+					groupName: "",
+					ocName: "",
+					positionName: "",
+					roleName: "",
+					userAvatar: "",
+					userIntro: "",
+					userName: "",
+					userPhone: "",
+					userPhoto: "",
+					userRealName: ""					
+			    }
 			}
 		},
 		onShow() {
@@ -128,7 +150,20 @@
 				})
 			},
 			getData(){
-				
+				let user=uni.getStorageSync('accountInfo');
+				if(user){this.user=user}
+				let notice=""
+				getNotices({
+					page: 1,
+					limit: 10,
+					artCatId: 2,
+					artCatTitle: "最新动态"
+				}).then((res)=>{
+					for(let i=0;i<res.data.length;i++){
+						notice+=`${res.data[i].artTitle} 发布时间:${res.data[i].issuedAt};`
+					}
+					this.notice=notice
+				})
 			}
 		}
 	}
@@ -282,8 +317,12 @@
 						}
 					}
 					.notice-cont{
+						width: 500rpx;
+						height: 80rpx;
+						flex: 1;
 						font-size: 28rpx;
 						color: rgba(0, 0, 0, 0.9);
+						// background-color: #fff;
 					}
 				}
 				.tab{

pages/login/index.vue

@@ -5,11 +5,13 @@
 		</view>
 		<view class="login-wrap">
 			<view class="username item">
-				<text>账号：</text>
+<!-- 				<text>账号：</text> -->
+				<image class="icon" src="/static/login/phone.png" mode="widthFix"></image>
 				<uni-easyinput :inputBorder="false" class="login_input" type="text" v-model="username" placeholder="请输入账号" />
 			</view>
 			<view class="password item">
-				<text>密码：</text>
+				<image class="icon" src="/static/login/pwd.png" mode="widthFix"></image>
+				<!-- <text>密码：</text> -->
 				<uni-easyinput :inputBorder="false" class="login_input" type="password" v-model="password" placeholder="请输入密码">
 				</uni-easyinput>
 			</view>
@@ -64,16 +66,17 @@
 					password
 				}).then((res) => {
 					let token = res.data.accessToken;
-					let accountInfo = JSON.stringify(res.data.user);
-					const userId=res.data.user.userId;
 					setToken(token);
-					uni.setStorageSync('accountInfo', accountInfo);
+					uni.setStorageSync('accountInfo', res.data.user);
 					store.commit('setToken', token);
 					uni.reLaunch({
 						url: '/pages/index/index'
 					})				
 				}).catch((res)=>{
-					console.log(res)
+					uni.showToast({
+						icon:'none',
+						title:res.msg||"登录失败！"
+					})
 				})
 			}
 		}
@@ -109,6 +112,9 @@
 				margin-top: 40rpx;
 				padding-left: 30rpx;
 				box-sizing: border-box;
+				.icon{
+					width: 48rpx;
+				}
 				input {
 					font-size: 32upx;
 					height: 100upx;

pages/myCenter/updatePassword/updatePassword.vue

@@ -2,18 +2,18 @@
 	<view class="content">
 		<view class="updatePassword-wrap">
 			<view class="username item">
-				<text>旧密码：</text>
-				<uni-easyinput :inputBorder="false" v-model="oldPassword"
+				<text>新密码：</text>
+				<uni-easyinput :inputBorder="false" v-model="password"
 					class="input" 
 					type="text"  
-					placeholder="请输入旧密码" />
+					placeholder="请输入新密码" />
 			</view>
 			<view class="password item">
-				<text>新密码：</text>
-				<uni-easyinput v-model="password"
+				<text>确认密码：</text>
+				<uni-easyinput v-model="rePassword"
 				 :inputBorder="false" 
 				 class="input"
-				 type="text"  placeholder="请输入新密码">
+				 type="text"  placeholder="请>确认密码">
 				</uni-easyinput>
 			</view>
 			<button type="primary" @click="submit" class="submit-BT">提交</button>
@@ -22,39 +22,48 @@
 </template>
 
 <script>
+	import {updatePwd} from '@/api/system/user.js'
 	export default {
 		data() {
 			return {
-				oldPassword: "",
 				password: "",
+				rePassword: "",
 			}
 		},
 		methods: {		
 			submit() {		
-				let oldPassword = (this.oldPassword).trim();
+				let rePassword = (this.rePassword).trim();
 				let password = (this.password).trim();
-				if (oldPassword.length < 1) {
+
+				if (password.length < 1) {
 					uni.showToast({
-						title: '请填写旧密码',
+						title: '请填写新密码',
 						icon: "error"
 					})
 					return;
 				}
-				if (password.length < 1) {
+				if (rePassword!==password) {
 					uni.showToast({
-						title: '请填写新密码',
+						title: '两次密码不一致',
 						icon: "error"
-					})
+					})					
 					return;
 				}
-				uni.showToast({
-					title:'修改成功',
-					complete() {
-						uni.reLaunch({
-							url:'/pages/login/index'
-						})
-					}
+				updatePwd({
+					password,
+					rePassword
+				}).then(()=>{
+					uni.showToast({
+						title:'修改成功',
+						duration:2000,
+						complete() {
+							uni.reLaunch({
+								url:'/pages/login/index'
+							})
+						}
+					})					
 				})
+
 			}
 		}
 	}
@@ -97,7 +106,7 @@
 				font-size: 28upx;
 			}
 			.submit-BT {
-				width: 424rpx;
+				width: 600rpx;
 				height: 72rpx;
 				line-height: 72rpx;	
 				text-align: center;							
@@ -108,7 +117,7 @@
 				font-weight: 400;
 				color: #FFFFFF;
 				z-index: 999;
-				margin: 0 auto;
+				margin: 100rpx auto;
 			}
 		}
 	}

pages/webview/webview.vue

@@ -22,8 +22,4 @@
 			}
 		}
 	}
-</script>
-
-<style>
-
-</style>
+</script>

unpackage/dist/dev/mp-weixin/app.json

@@ -22,6 +22,7 @@
     "selectedColor": "#1296db",
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
+    "iconWidth": "24px",
     "list": [
       {
         "pagePath": "pages/index/index",
@@ -31,14 +32,14 @@
       },
       {
         "pagePath": "pages/applicationCenter/applicationCenter",
-        "iconPath": "static/tabbar/index.png",
-        "selectedIconPath": "static/tabbar/indexEd.png",
+        "iconPath": "static/tabbar/app.png",
+        "selectedIconPath": "static/tabbar/appEd.png",
         "text": "应用中心"
       },
       {
         "pagePath": "pages/history/history",
-        "iconPath": "static/tabbar/history.png",
-        "selectedIconPath": "static/tabbar/historyEd.png",
+        "iconPath": "static/tabbar/info.png",
+        "selectedIconPath": "static/tabbar/infoEd.png",
         "text": "信息中心"
       },
       {

unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput":1,"uni_modules/uni-list/components/uni-list-item/uni-list-item":1,"uni_modules/uni-list/components/uni-list/uni-list":1,"uni_modules/uni-popup/components/uni-popup/uni-popup":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":1,"uni_modules/uni-badge/components/uni-badge/uni-badge":1,"uni_modules/uni-list/components/uni-list-chat/uni-list-chat":1};
+/******/ 		var cssChunks = {"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":1,"uni_modules/uni-list/components/uni-list-item/uni-list-item":1,"uni_modules/uni-list/components/uni-list/uni-list":1,"uni_modules/uni-popup/components/uni-popup/uni-popup":1,"uni_modules/uni-badge/components/uni-badge/uni-badge":1,"uni_modules/uni-list/components/uni-list-chat/uni-list-chat":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput":"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput","uni_modules/uni-list/components/uni-list-item/uni-list-item":"uni_modules/uni-list/components/uni-list-item/uni-list-item","uni_modules/uni-list/components/uni-list/uni-list":"uni_modules/uni-list/components/uni-list/uni-list","uni_modules/uni-popup/components/uni-popup/uni-popup":"uni_modules/uni-popup/components/uni-popup/uni-popup","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons","uni_modules/uni-badge/components/uni-badge/uni-badge":"uni_modules/uni-badge/components/uni-badge/uni-badge","uni_modules/uni-list/components/uni-list-chat/uni-list-chat":"uni_modules/uni-list/components/uni-list-chat/uni-list-chat","uni_modules/uni-transition/components/uni-transition/uni-transition":"uni_modules/uni-transition/components/uni-transition/uni-transition"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput":"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons","uni_modules/uni-list/components/uni-list-item/uni-list-item":"uni_modules/uni-list/components/uni-list-item/uni-list-item","uni_modules/uni-list/components/uni-list/uni-list":"uni_modules/uni-list/components/uni-list/uni-list","uni_modules/uni-popup/components/uni-popup/uni-popup":"uni_modules/uni-popup/components/uni-popup/uni-popup","uni_modules/uni-badge/components/uni-badge/uni-badge":"uni_modules/uni-badge/components/uni-badge/uni-badge","uni_modules/uni-list/components/uni-list-chat/uni-list-chat":"uni_modules/uni-list/components/uni-list-chat/uni-list-chat","uni_modules/uni-transition/components/uni-transition/uni-transition":"uni_modules/uni-transition/components/uni-transition/uni-transition"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

unpackage/dist/dev/mp-weixin/pages/applicationCenter/applicationCenter.wxml

@@ -1 +1 @@
-<view></view>
+<view class="app-page data-v-41633d92"><view class="handle-wrap data-v-41633d92"><view class="title data-v-41633d92">常用操作</view><view class="tabs data-v-41633d92"><view class="tab-item data-v-41633d92"><image class="icon data-v-41633d92" src="/static/app/tab-1.png" mode="widthFix"></image><view class="name data-v-41633d92">登记隐患</view></view><view class="tab-item data-v-41633d92"><image class="icon data-v-41633d92" src="/static/app/tab-2.png" mode="widthFix"></image><view class="name data-v-41633d92">临时任务</view></view><view class="tab-item data-v-41633d92"><image class="icon data-v-41633d92" src="/static/app/tab-3.png" mode="widthFix"></image><view class="name data-v-41633d92">检查记录</view></view><view class="tab-item data-v-41633d92"><image class="icon data-v-41633d92" src="/static/app/tab-4.png" mode="widthFix"></image><view class="name data-v-41633d92">问题反馈</view></view></view></view><view class="app-category data-v-41633d92"><view class="title data-v-41633d92">应用分类</view><view class="applist data-v-41633d92"><block wx:for="{{apps}}" wx:for-item="app" wx:for-index="index" wx:key="index"><view class="app data-v-41633d92"><image class="icon data-v-41633d92" src="{{app.href}}" mode="widthFix"></image><view class="info data-v-41633d92"><view class="app-title data-v-41633d92">{{app.title}}</view><view class="tag data-v-41633d92">{{app.tag}}</view></view></view></block></view></view></view>

unpackage/dist/dev/mp-weixin/pages/applicationCenter/applicationCenter.wxss

@@ -1 +1,115 @@
-/* pages/applicationCenter/applicationCenter.wxss */
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.app-page.data-v-41633d92 {
+  padding: 32rpx;
+  background-color: #f3f4f7;
+  box-sizing: border-box;
+  min-height: 100vh;
+}
+.app-page .handle-wrap.data-v-41633d92 {
+  background: linear-gradient(159.65deg, #FFF8E8 11.95%, #FFFFFF 20.49%, #FFFFFF 86.47%), linear-gradient(0deg, #FFFFFF, #FFFFFF);
+  border-radius: 12rpx;
+  padding: 32rpx 0;
+}
+.app-page .handle-wrap .title.data-v-41633d92 {
+  color: #000;
+  font-size: 32rpx;
+  padding-left: 24rpx;
+}
+.app-page .handle-wrap .tabs.data-v-41633d92 {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  padding: 0 32rpx;
+  margin-top: 32rpx;
+}
+.app-page .handle-wrap .tabs .tab-item.data-v-41633d92 {
+  width: 112rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+.app-page .handle-wrap .tabs .tab-item .icon.data-v-41633d92 {
+  width: 96rpx;
+}
+.app-page .handle-wrap .tabs .tab-item .name.data-v-41633d92 {
+  width: 100%;
+  padding-top: 12rpx;
+  color: rgba(0, 0, 0, 0.9);
+  font-size: 28rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  word-break: break-all;
+}
+.app-page .app-category .title.data-v-41633d92 {
+  color: #000;
+  font-size: 32rpx;
+  line-height: 1;
+  padding: 48rpx 24rpx 32rpx 24rpx;
+}
+.app-page .app-category .applist.data-v-41633d92 {
+  display: flex;
+  flex-wrap: wrap;
+}
+.app-page .app-category .applist .app.data-v-41633d92 {
+  width: 330rpx;
+  height: 160rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin-bottom: 20rpx;
+  display: flex;
+  padding: 32rpx 0 0 28rpx;
+  box-sizing: border-box;
+}
+.app-page .app-category .applist .app.data-v-41633d92:nth-child(2n) {
+  margin-left: 18rpx;
+}
+.app-page .app-category .applist .app .icon.data-v-41633d92 {
+  width: 66rpx;
+  height: 66rpx;
+  border-radius: 50%;
+  background-color: #97b3ff;
+}
+.app-page .app-category .applist .app .info.data-v-41633d92 {
+  padding-left: 20rpx;
+  padding-top: 4rpx;
+}
+.app-page .app-category .applist .app .info .app-title.data-v-41633d92 {
+  color: #222222;
+  font-size: 32rpx;
+}
+.app-page .app-category .applist .app .info .tag.data-v-41633d92 {
+  margin-top: 6rpx;
+  color: #ffab08;
+  font-size: 24rpx;
+  background: rgba(255, 171, 8, 0.1);
+  border-radius: 12rpx;
+  padding: 4rpx 10rpx;
+}
+

unpackage/dist/dev/mp-weixin/pages/history/history.js

@@ -139,17 +139,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-//
-//
-//
+var _auth = __webpack_require__(/*! @/libs/auth.js */ 56);
 //
 //
 //
 var _default = {
   data: function data() {
-    return {};
+    return {
+      webViewSrc: ""
+    };
   },
-  methods: {}
+  onShow: function onShow() {
+    this.webViewSrc = "http://baidu.com?token=".concat((0, _auth.getToken)());
+  }
 };
 exports.default = _default;
 

unpackage/dist/dev/mp-weixin/pages/history/history.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "历史",
+  "navigationBarTitleText": "信息中心",
   "enablePullDownRefresh": false,
   "usingComponents": {}
 }

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

@@ -1 +1 @@
-<view></view>
+<web-view src="{{webViewSrc}}"></web-view>

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -228,6 +228,17 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {

unpackage/dist/dev/mp-weixin/pages/login/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 97))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 113))
     },
   }
 } catch (e) {
@@ -188,6 +188,12 @@ var _auth = __webpack_require__(/*! @/libs/auth.js */ 56);
 //
 //
 //
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -235,7 +241,10 @@ var _default = {
           url: '/pages/index/index'
         });
       }).catch(function (res) {
-        console.log(res);
+        uni.showToast({
+          icon: 'none',
+          title: "请求失败！"
+        });
       });
     }
   }

unpackage/dist/dev/mp-weixin/pages/login/index.wxml

@@ -1 +1 @@
-<view class="content data-v-4586967a"><view class="head data-v-4586967a"><text class="data-v-4586967a">登录</text></view><view class="login-wrap data-v-4586967a"><view class="username item data-v-4586967a"><text class="data-v-4586967a">账号：</text><uni-easyinput bind:input="__e" class="login_input data-v-4586967a" vue-id="6b4b36ba-1" inputBorder="{{false}}" type="text" placeholder="请输入账号" value="{{username}}" data-event-opts="{{[['^input',[['__set_model',['','username','$event',[]]]]]]}}" bind:__l="__l"></uni-easyinput></view><view class="password item data-v-4586967a"><text class="data-v-4586967a">密码：</text><uni-easyinput bind:input="__e" class="login_input data-v-4586967a" vue-id="6b4b36ba-2" inputBorder="{{false}}" type="password" placeholder="请输入密码" value="{{password}}" data-event-opts="{{[['^input',[['__set_model',['','password','$event',[]]]]]]}}" bind:__l="__l"></uni-easyinput></view><button class="submit-BT data-v-4586967a" type="primary" data-event-opts="{{[['tap',[['loginSubmit',['$event']]]]]}}" bindtap="__e">登录</button></view></view>
+<view class="content data-v-4586967a"><view class="head data-v-4586967a"><text class="data-v-4586967a">登录</text></view><view class="login-wrap data-v-4586967a"><view class="username item data-v-4586967a"><text class="data-v-4586967a">账号：</text><uni-easyinput bind:input="__e" class="login_input data-v-4586967a" vue-id="6b4b36ba-1" inputBorder="{{false}}" type="text" placeholder="请输入账号" value="{{username}}" data-event-opts="{{[['^input',[['__set_model',['','username','$event',[]]]]]]}}" bind:__l="__l"></uni-easyinput></view><view class="password item data-v-4586967a"><text class="data-v-4586967a">密码：</text><uni-easyinput bind:input="__e" class="login_input data-v-4586967a" vue-id="6b4b36ba-2" inputBorder="{{false}}" type="password" placeholder="请输入密码" value="{{password}}" data-event-opts="{{[['^input',[['__set_model',['','password','$event',[]]]]]]}}" bind:__l="__l"></uni-easyinput></view><view class="tip data-v-4586967a"><label class="data-v-4586967a"><checkbox class="check data-v-4586967a" style="transform:scale(0.7);" value="cb" checked="true"></checkbox><text class="data-v-4586967a">我已阅读并同意《数字管家用户协议》和《数字管家隐私政策》，且已明确知晓平台仅限企业内部用户使用。</text></label></view><button class="submit-BT data-v-4586967a" type="primary" data-event-opts="{{[['tap',[['loginSubmit',['$event']]]]]}}" bindtap="__e">登录</button></view></view>

unpackage/dist/dev/mp-weixin/pages/login/index.wxss

@@ -24,6 +24,10 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.content.data-v-4586967a {
+  height: 100vh;
+  background-color: #F5F6F8;
+}
 .content .head.data-v-4586967a {
   font-size: 50rpx;
   text-align: center;
@@ -44,6 +48,11 @@
   height: 100rpx;
   font-size: 32rpx;
   line-height: 100rpx;
+  background-color: #fff;
+  border-radius: 60rpx;
+  margin-top: 40rpx;
+  padding-left: 30rpx;
+  box-sizing: border-box;
 }
 .content .login-wrap .item input.data-v-4586967a {
   font-size: 32rpx;
@@ -55,13 +64,22 @@
   border: none;
 }
 .content .login-wrap .tip.data-v-4586967a {
-  text-align: right;
-  padding: 18rpx 0;
+  padding: 48rpx 0 0 56rpx;
   font-size: 28rpx;
+  color: #323233;
+  position: relative;
+}
+.content .login-wrap .tip .check.data-v-4586967a {
+  position: absolute;
+  left: 8rpx;
+  top: 44rpx;
 }
 .content .login-wrap .submit-BT.data-v-4586967a {
-  border-radius: 16rpx;
+  height: 88rpx;
+  line-height: 88rpx;
+  border-radius: 50rpx;
   margin-top: 50rpx;
-  background-color: #3384FF;
+  background-color: #2A5BEE;
+  padding: 0;
 }
 

unpackage/dist/dev/mp-weixin/pages/myCenter/myCenter.js

@@ -100,11 +100,8 @@ __webpack_require__.r(__webpack_exports__);
 var components
 try {
   components = {
-    uniList: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 104))
-    },
-    uniListItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 111))
+    uniIcons: function () {
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 120))
     },
   }
 } catch (e) {
@@ -203,6 +200,51 @@ var _user = __webpack_require__(/*! @/api/system/user.js */ 50);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -232,6 +274,16 @@ var _default = {
         this.user = user;
       }
     },
+    linkToContacts: function linkToContacts() {
+      uni.navigateTo({
+        url: '/pages/webview/webview?href=http://baidu.com&name=通讯录'
+      });
+    },
+    updatePwd: function updatePwd() {
+      uni.navigateTo({
+        url: '/pages/myCenter/updatePassword/updatePassword'
+      });
+    },
     logout: function logout() {
       uni.showModal({
         title: '提示！',

unpackage/dist/dev/mp-weixin/pages/myCenter/myCenter.json

@@ -4,7 +4,6 @@
   "enablePullDownRefresh": false,
   "navigationStyle": "custom",
   "usingComponents": {
-    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
-    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item"
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
   }
 }

unpackage/dist/dev/mp-weixin/pages/myCenter/personalData/personalData.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniList: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 104))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 128))
     },
     uniListItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 111))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 135))
     },
     uniPopup: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 118))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 142))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 97))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 113))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/myCenter/updatePassword/updatePassword.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 97))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 113))
     },
   }
 } catch (e) {
@@ -164,6 +164,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _user = __webpack_require__(/*! @/api/system/user.js */ 50);
 //
 //
 //
@@ -190,35 +191,41 @@ exports.default = void 0;
 var _default = {
   data: function data() {
     return {
-      oldPassword: "",
-      password: ""
+      password: "",
+      rePassword: ""
     };
   },
   methods: {
     submit: function submit() {
-      var oldPassword = this.oldPassword.trim();
+      var rePassword = this.rePassword.trim();
       var password = this.password.trim();
-      if (oldPassword.length < 1) {
+      if (password.length < 1) {
         uni.showToast({
-          title: '请填写旧密码',
+          title: '请填写新密码',
           icon: "error"
         });
         return;
       }
-      if (password.length < 1) {
+      if (rePassword !== password) {
         uni.showToast({
-          title: '请填写新密码',
+          title: '两次密码不一致',
           icon: "error"
         });
         return;
       }
-      uni.showToast({
-        title: '修改成功',
-        complete: function complete() {
-          uni.reLaunch({
-            url: '/pages/login/index'
-          });
-        }
+      (0, _user.updatePwd)({
+        password: password,
+        rePassword: rePassword
+      }).then(function () {
+        uni.showToast({
+          title: '修改成功',
+          duration: 2000,
+          complete: function complete() {
+            uni.reLaunch({
+              url: '/pages/login/index'
+            });
+          }
+        });
       });
     }
   }

unpackage/dist/dev/mp-weixin/pages/myCenter/updatePassword/updatePassword.wxml

@@ -1 +1 @@
-<view class="content data-v-494f163a"><view class="updatePassword-wrap data-v-494f163a"><view class="username item data-v-494f163a"><text class="data-v-494f163a">旧密码：</text><uni-easyinput bind:input="__e" class="input data-v-494f163a" vue-id="3ed79be8-1" inputBorder="{{false}}" type="text" placeholder="请输入旧密码" value="{{oldPassword}}" data-event-opts="{{[['^input',[['__set_model',['','oldPassword','$event',[]]]]]]}}" bind:__l="__l"></uni-easyinput></view><view class="password item data-v-494f163a"><text class="data-v-494f163a">新密码：</text><uni-easyinput bind:input="__e" class="input data-v-494f163a" vue-id="3ed79be8-2" inputBorder="{{false}}" type="text" placeholder="请输入新密码" value="{{password}}" data-event-opts="{{[['^input',[['__set_model',['','password','$event',[]]]]]]}}" bind:__l="__l"></uni-easyinput></view><button class="submit-BT data-v-494f163a" type="primary" data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">提交</button></view></view>
+<view class="content data-v-494f163a"><view class="updatePassword-wrap data-v-494f163a"><view class="username item data-v-494f163a"><text class="data-v-494f163a">新密码：</text><uni-easyinput bind:input="__e" class="input data-v-494f163a" vue-id="3ed79be8-1" inputBorder="{{false}}" type="text" placeholder="请输入新密码" value="{{password}}" data-event-opts="{{[['^input',[['__set_model',['','password','$event',[]]]]]]}}" bind:__l="__l"></uni-easyinput></view><view class="password item data-v-494f163a"><text class="data-v-494f163a">确认密码：</text><uni-easyinput bind:input="__e" class="input data-v-494f163a" vue-id="3ed79be8-2" inputBorder="{{false}}" type="text" placeholder="请>确认密码" value="{{rePassword}}" data-event-opts="{{[['^input',[['__set_model',['','rePassword','$event',[]]]]]]}}" bind:__l="__l"></uni-easyinput></view><button class="submit-BT data-v-494f163a" type="primary" data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">提交</button></view></view>

unpackage/dist/dev/mp-weixin/pages/myCenter/updatePassword/updatePassword.wxss

@@ -60,7 +60,7 @@
   font-size: 28rpx;
 }
 .content .updatePassword-wrap .submit-BT.data-v-494f163a {
-  width: 424rpx;
+  width: 600rpx;
   height: 72rpx;
   line-height: 72rpx;
   text-align: center;
@@ -71,6 +71,6 @@
   font-weight: 400;
   color: #FFFFFF;
   z-index: 999;
-  margin: 0 auto;
+  margin: 100rpx auto;
 }
 

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,28 +10,22 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "condition": false
   },
   "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "touristappid",
+  "libVersion": "3.1.0",
+  "appid": "wxf98223d6e4c7c1a9",
   "projectname": "UniappShell",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
-  }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
+  "simulatorPluginLibVersion": {}
 }

unpackage/dist/dev/mp-weixin/static/customicons.css

@@ -1,20 +0,0 @@
-@font-face {
-  font-family: "customicons"; /* Project id 2878519 */
-  src:url('/static/customicons.ttf') format('truetype');
-}
-
-.customicons {
-  font-family: "customicons" !important;
-}
-
-.youxi:before {
-  content: "\e60e";
-}
-
-.wenjian:before {
-  content: "\e60f";
-}
-
-.zhuanfa:before {
-  content: "\e610";
-}