历史

components/bottomSheet/bottomSheet.vue

@@ -178,6 +178,27 @@
 								<view class="uni-media-list-text-top">
 									<view class="tit-text">施工时间:</view>{{value.constructTime}}
 								</view>
+								
+								<view class="uni-media-list-text-top">
+									<view class="uni-common-mt" style="width: 100%;">
+										<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;">施工内容:</text>
+										<view style="width: 100%;padding-right: 20rpx;box-sizing: border-box;">
+											<textarea class="textarea" maxlength="255" :disabled="true"
+												placeholder-style="padding: 10rpx;"
+												style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+												auto-height>{{value.zEngineeringMaterialBo[0].remark}}</textarea>
+										</view>
+									</view>
+								</view>
+								
+								<view class="uni-media-list-text-top">
+								
+									<view class="tit-text">施工位置:</view>
+									<text style="margin-right: 10px;">{{value.constructAddre}}</text>
+									第{{value.zEngineeringMaterialBo[0].number}}根
+								</view>
+								
 								<view class="uni-media-list-text-top">
 
 									<view class="tit-text">负责人:</view>
@@ -188,10 +209,26 @@
 									<view class="tit-text">负责人联系电话:</view>
 									<text>{{value.constructPhone}}</text>
 								</view>
-								<view class="uni-media-list-text-top">
-
-									<view class="tit-text">米数:</view>
-									<text>{{value.zEngineeringMaterialBo[0].number}}</text>
+							
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px; margin-left: 8px;">沟上部分照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.onTheDitch" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.onTheDitch)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
 								</view>
 								<view class="uni-common-mt" style="width: 100%;">
 									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:

config.js

@@ -1,10 +1,9 @@
 // 应用全局配置
 module.exports = {
-	 // baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
+	// baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	// baseUrl: 'http://192.168.4.6:8080',
-	 baseUrl: 'http://192.168.4.23:8080',
+	baseUrl: 'http://192.168.4.23:8080',
 	//baseUrl: 'http://192.168.4.11:8080',
-	// baseUrl: 'http://192.168.4.23:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',
 	// 应用信息

pages/login.vue

@@ -23,7 +23,7 @@
 				</view>
 				<input v-model="loginForm.password" type="password" class="input" placeholder="密码" maxlength="20" />
 			</view>
-		<!-- 	<view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
+			<!-- 	<view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
 				<view class="iconfont icon-code icon"></view>
 				<input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
 				<view class="login-code">
@@ -44,6 +44,10 @@
 		getCodeImg
 	} from '@/api/login'
 
+	import {
+		getUserName,
+		getPassword
+	} from '@/utils/auth'
 	export default {
 		data() {
 			return {
@@ -53,8 +57,8 @@
 				register: false,
 				globalConfig: getApp().globalData.config,
 				loginForm: {
-					username: "010401001",
-					password: "123456",
+					username: "",
+					password: "",
 					code: "",
 					uuid: '',
 					type: 'app'
@@ -64,6 +68,10 @@
 		created() {
 			//this.getCode()
 		},
+		onLoad() {
+			this.loginForm.username = getUserName()
+			this.loginForm.password = getPassword()
+		},
 		methods: {
 
 			// 获取图形验证码
@@ -82,7 +90,7 @@
 					this.$modal.msgError("请输入您的账号")
 				} else if (this.loginForm.password === "") {
 					this.$modal.msgError("请输入您的密码")
-				} 
+				}
 				// else if (this.loginForm.code === "" && this.captchaEnabled) {
 				// 	this.$modal.msgError("请输入验证码")
 				// } 

store/modules/user.js

@@ -12,7 +12,10 @@ import {
 	removeToken,
 	setUserRole,
 	removeUserRole,
-	setUserType
+	setPassword,
+	setUserName,
+	setUserType,
+	removeUserType
 } from '@/utils/auth'
 
 const baseUrl = config.baseUrl
@@ -66,6 +69,8 @@ const user = {
 			return new Promise((resolve, reject) => {
 				login(username, password, code, uuid, type).then(res => {
 					setToken(res.data.token)
+					setUserName(username)
+					setPassword(password)
 					commit('SET_TOKEN', res.data.token)
 					resolve()
 				}).catch(error => {
@@ -87,6 +92,7 @@ const user = {
 						null) ? "" : user.userName
 					const nickName = (user == null || user.nickName == "" || user.nickName ==
 						null) ? "" : user.nickName
+
 					if (user.roles[0].enginTypeList != null) {
 						setUserRole(user.roles != null ? user.roles[0].enginTypeList.split(",") :
 						[])
@@ -98,8 +104,6 @@ const user = {
 						return
 					}
 					setUserType(user.userType)
-
-
 					if (res.data.roles && res.data.roles.length > 0) {
 						commit('SET_ROLES', res.data.roles)
 						commit('SET_PERMISSIONS', res.data.permissions)
@@ -128,6 +132,7 @@ const user = {
 					commit('SET_PERMISSIONS', [])
 					removeToken()
 					removeUserRole()
+					removeUserType()
 					storage.clean()
 					resolve()
 				}).catch(error => {

utils/auth.js

@@ -1,39 +1,68 @@
 const TokenKey = 'App-Token'
 const UserRole = 'App-UserRole'
+
 const UserType = 'App-UserType'
 
+const UserNameKey = 'App-UserName'
+const PasswordKey = 'App-Password'
+
 export function getToken() {
-  return uni.getStorageSync(TokenKey)
+	return uni.getStorageSync(TokenKey)
 }
 
 export function setToken(token) {
-  return uni.setStorageSync(TokenKey, token)
+	return uni.setStorageSync(TokenKey, token)
 }
 
 export function removeToken() {
-  return uni.removeStorageSync(TokenKey)
+	return uni.removeStorageSync(TokenKey)
 }
 
 export function getUserRole() {
-  return uni.getStorageSync(UserRole)
+	return uni.getStorageSync(UserRole)
 }
 
 export function setUserRole(role) {
-  return uni.setStorageSync(UserRole,role)
+	return uni.setStorageSync(UserRole, role)
 }
 
 export function removeUserRole() {
-  return uni.removeStorageSync(UserRole)
+	return uni.removeStorageSync(UserRole)
 }
 
+
 export function getUserType() {
-  return uni.getStorageSync(UserType)
+	return uni.getStorageSync(UserType)
 }
 
 export function setUserType(type) {
-  return uni.setStorageSync(UserType,type)
+	return uni.setStorageSync(UserType, type)
 }
 
 export function removeUserType() {
-  return uni.removeStorageSync(UserType)
+	return uni.removeStorageSync(UserType)
+}
+
+export function getUserName() {
+	return uni.getStorageSync(UserNameKey)
+}
+
+export function setUserName(userName) {
+	return uni.setStorageSync(UserNameKey, userName)
 }
+
+export function removeUserName() {
+	return uni.removeStorageSync(UserNameKey)
+}
+
+export function getPassword() {
+	return uni.getStorageSync(PasswordKey)
+}
+
+export function setPassword(password) {
+	return uni.setStorageSync(PasswordKey, password)
+}
+
+export function removePassword() {
+	return uni.removeStorageSync(PasswordKey)
+}