fix

virgo.wzfrontend/console/src/components/common/selectUser.vue

@@ -13,7 +13,10 @@
 					<el-checkbox class="check-all" v-model="checkAll" @change="checkChange" v-if="!maxLen">
 						全选
 					</el-checkbox>
-					<div class="part-user">
+					<div class="part-user no-box" v-if="partList.length === 0">
+						<empty width="100"></empty>
+					</div>
+					<div class="part-user" v-else>
 						<el-checkbox-group v-model="checkedBox" @change="testCheckedAll">
 							<el-checkbox v-for="(item,index) in partList" :label="item.id" :key="-item.id" disabled>
 								<div class="user-box">
@@ -43,7 +46,10 @@
 						</div>
 						<div class="change-user-clear" @click="clearAll">清空</div>
 					</div>
-					<div class="change-user-list">
+					<div class="change-user-list no-box" v-if="checkedUserList.length === 0">
+						<empty width="100"></empty>
+					</div>
+					<div class="change-user-list" v-else>
 						<div class="change-user-item user-box" v-for="(item,index) in checkedUserList" :label="item.id"
 							:key="item.id">
 							<div class="user-avatar">
@@ -206,6 +212,13 @@
 		border-radius: 4px;
 		display: flex;
 
+		.no-box {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			border-top: 1px solid $--color-border;
+		}
+
 		.change-part {
 			flex: 1;
 			border-right: 1px solid $--color-border;
@@ -331,7 +344,7 @@
 			flex-direction: column;
 
 			.change-user-operation {
-				padding: 20px 20px 14px 20px;
+				padding: 20px;
 				display: flex;
 				justify-content: space-between;
 

virgo.wzfrontend/console/src/components/common/upload.vue

@@ -25,33 +25,36 @@
 				</div>
 			</div>
 		</div>
-		<div class="common-update-image" v-else>
-			<div class="common-update-image-box" v-for="(item,index) in fileList" :key="item.id">
-				<div class="el-image video-image" v-if="item.type === 'mp4'">
-					<div class="video-icon">
-						<i class="el-icon-video-play" @click="openVideo(item)"></i>
+		<div v-else>
+			<div class="common-update-image">
+				<div class="common-update-image-box" v-for="(item,index) in fileList" :key="item.id">
+					<div class="el-image video-image" v-if="item.type === 'mp4'">
+						<div class="video-icon">
+							<i class="el-icon-video-play" @click="openVideo(item)"></i>
+						</div>
+						<img :src="videoPreviewList[item.id]" class="el-image__inner">
 					</div>
-					<img :src="videoPreviewList[item.id]" class="el-image__inner">
-				</div>
-				<el-image :src="item.url" :preview-src-list="[item.url]" v-else>
-					<div slot="error" class="image-slot">
-						<el-tooltip class="item" effect="dark" :content="item.name" placement="bottom">
-							<div class="image-text">{{item.type.toUpperCase()}}</div>
-						</el-tooltip>
+					<el-image :src="item.url" :preview-src-list="[item.url]" v-else>
+						<div slot="error" class="image-slot">
+							<el-tooltip class="item" effect="dark" :content="item.name" placement="bottom">
+								<div class="image-text">{{item.type.toUpperCase()}}</div>
+							</el-tooltip>
+						</div>
+					</el-image>
+					<div class="common-update-close" @click="removeFile(index)">
+						<i class="el-icon-close"></i>
 					</div>
-				</el-image>
-				<div class="common-update-close" @click="removeFile(index)">
-					<i class="el-icon-close"></i>
 				</div>
+				<el-upload :action="action" :headers="headers" :show-file-list="false" name="uploadFile"
+					:before-upload="beforeUpload" :on-success="successFile" :on-error="errorFile" :accept="accept"
+					v-if="fileList.length < maxLen" :on-progress="progress">
+					<div class="common-update-button">
+						<i class="iconfont huifont-xinzeng"></i>
+						<div class="common-update-button-label">{{text}}</div>
+					</div>
+				</el-upload>
 			</div>
-			<el-upload :action="action" :headers="headers" :show-file-list="false" name="uploadFile"
-				:before-upload="beforeUpload" :on-success="successFile" :on-error="errorFile" :accept="accept"
-				v-if="fileList.length < maxLen" :on-progress="progress">
-				<div class="common-update-button">
-					<i class="iconfont huifont-xinzeng"></i>
-					<div class="common-update-button-label">{{text}}</div>
-				</div>
-			</el-upload>
+			<div class="update-image-tips"><span class="color-red">*</span> 请上传小于10M的文件</div>
 		</div>
 		<el-dialog :title="video.name" custom-class="monitor-dialog" :visible.sync="visible" width="900px"
 			height="500px" :append-to-body="true">
@@ -115,9 +118,9 @@
 		methods: {
 			beforeUpload(file) {
 				//上传前
-				if (parseInt(file.size) / 1024 / 1024 > 30) {
+				if ((parseInt(file.size) / 1024 / 1024) > 10) {
 					//判断上传的文件不大于30M
-					this.$message.warning('请上传小于30M的文件');
+					this.$message.warning('请上传小于10M的文件');
 					return false;
 				}
 			},
@@ -207,6 +210,11 @@
 		display: flex;
 		flex-wrap: wrap;
 
+		.update-image-tips {
+			font-size: 12px;
+			opacity: 0.7;
+		}
+
 		.video-image {
 			cursor: pointer;
 			position: relative;

virgo.wzfrontend/console/src/components/work/space/house/edit.vue

@@ -128,45 +128,70 @@
 				videoList: [],
 				customList: [],
 				showPicture: [],
-				ccList: []
+				ccList: [],
+				isCache: true
 			}
 		},
 		created() {
 			this.houseForm['projectId'] = this.$store.getters.project.id;
 			if (this.isUpdate) {
+				this.isCache = false;
 				getHouseDetailById(this.detailId).then(res => {
 					if (res.state) {
-						this.houseForm = res.data;
-						if (this.houseForm.picture) this.responsibility = JSON.parse(this.houseForm.picture);
-						if (this.houseForm.video) this.videoList = JSON.parse(this.houseForm.video);
-						if (this.houseForm.showPicture) this.showPicture = JSON.parse(this.houseForm.showPicture);
-						if (this.houseForm.data) this.customList = JSON.parse(this.houseForm.data);
-						if (this.houseForm.chargePersonId) {
-							this.ccList = [{
-								id: this.houseForm.chargePersonId,
-								name: this.houseForm.chargePersonName,
-								portrait: ''
-							}]
-						}
+						this.initForm(res.data)
 					}
 				})
+			} else {
+				if (this.$store.getters.houseData && JSON.stringify(this.$store.getters.houseData) != '{}') {
+					if (this.$store.getters.houseData.projectId != this.$store.getters.project.id) return this.$store
+						.dispatch('projectBase/changeHouseData', {});
+					this.initForm(this.$store.getters.houseData)
+				}
 			}
 		},
+		beforeDestroy() {
+			this.cacheData();
+		},
 		methods: {
+			initForm(data) {
+				this.houseForm = data;
+				if (this.houseForm.picture) this.responsibility = JSON.parse(this.houseForm.picture);
+				if (this.houseForm.video) this.videoList = JSON.parse(this.houseForm.video);
+				if (this.houseForm.showPicture) this.showPicture = JSON.parse(this.houseForm.showPicture);
+				if (this.houseForm.data) this.customList = JSON.parse(this.houseForm.data);
+				if (this.houseForm.chargePersonId) {
+					this.ccList = [{
+						id: this.houseForm.chargePersonId,
+						name: this.houseForm.chargePersonName,
+						portrait: ''
+					}]
+				}
+			},
+			cacheData() {
+				if (!this.isCache) return;
+				this.$store.dispatch('projectBase/changeHouseData', this.setData());
+			},
+			setData() {
+				let postData = JSON.parse(JSON.stringify(this.houseForm));
+				postData['picture'] = JSON.stringify(this.$refs.image.fileList);
+				postData['video'] = JSON.stringify(this.$refs.video.fileList);
+				postData['showPicture'] = JSON.stringify(this.$refs.showPicture.fileList);
+				postData['data'] = JSON.stringify(this.$refs.customData.listData);
+				if (this.$refs.tag.tagIds()) postData['tagIds'] = this.$refs.tag.tagIds();
+				if (this.$refs.cc.list.length > 0) {
+					postData['chargePersonId'] = this.$refs.cc.list[0].id;
+					postData['chargePersonName'] = this.$refs.cc.list[0].name;
+				}
+				postData = Object.assign(postData, this.$refs.projectItem.formBox);
+				return postData;
+			},
 			submit() {
 				this.$refs.projectItem.submit((projectData, valids) => {
 					this.$refs.houseForm.validate((valid) => {
 						if (valid && valids) {
-							if (this.$refs.cc.list.length === 0) return this.$message.warning('请添加房源负责人');
+							if (this.$refs.cc.list.length === 0) return this.$message.warning('请添加房源负责人');
 							if (!this.$refs.tag.tagIds()) return this.$message.warning('请至少选择一个标签');
-							let postData = JSON.parse(JSON.stringify(this.houseForm));
-							postData['picture'] = JSON.stringify(this.$refs.image.fileList);
-							postData['video'] = JSON.stringify(this.$refs.video.fileList);
-							postData['showPicture'] = JSON.stringify(this.$refs.showPicture.fileList);
-							postData['data'] = JSON.stringify(this.$refs.customData.listData);
-							postData['tagIds'] = this.$refs.tag.tagIds();
-							postData['chargePersonId'] = this.$refs.cc.list[0].id;
-							postData = Object.assign(postData, projectData);
+							let postData = this.setData();
 							if (this.isUpdate) {
 								updateHouse(postData).then(this.successFunc);
 							} else {
@@ -180,6 +205,8 @@
 			},
 			successFunc(res) {
 				if (res.state) {
+					this.$store.dispatch('projectBase/changeHouseData', {});
+					this.isCache = false;
 					this.$message.success('操作成功');
 					this.$emit('callback', 'init');
 				}

virgo.wzfrontend/console/src/store/getters.js

@@ -7,5 +7,6 @@ const getters = {
 	config: state => state.app.config, //url配置信息
 	document: state => state.app.document, //模板context渲染
 	identityId: state => state.app.identityId, //身份
+	houseData: state => state.projectBase.houseData, //房源编辑
 }
 export default getters

virgo.wzfrontend/console/src/store/modules/projectBase.js

@@ -3,12 +3,16 @@
  * 	
  */
 const state = {
-	project: {}
+	project: {},
+	houseData: {}
 }
 
 const mutations = {
 	CHANGE_PROJECT: (state, project) => {
 		state.project = project;
+	},
+	CHANGE_HOUSE_DATA: (state, houseData) => {
+		state.houseData = houseData;
 	}
 }
 
@@ -17,6 +21,11 @@ const actions = {
 		commit,
 	}, project) {
 		commit('CHANGE_PROJECT', project);
+	},
+	changeHouseData({
+		commit,
+	}, houseData) {
+		commit('CHANGE_HOUSE_DATA', houseData);
 	}
 }
 

virgo.wzfrontend/wx/App.vue

@@ -1,7 +1,4 @@
 <script>
-	import {
-		getUserInfo
-	} from '@/request/api/login'
 	export default {
 		onLaunch() {
 			console.log('App Launch')
@@ -18,15 +15,7 @@
 			});
 			// #endif
 			// #ifdef MP-WEIXIN
-			if (uni.getStorageSync('token') && !this.$store.getters.user.userId) {
-				getUserInfo().then(user => {
-					if (user.code === 200) {
-						let userInfo = user.data;
-						this.$store.dispatch('app/changeOrganization', userInfo.organization);
-						this.$store.dispatch('app/changeUser', userInfo);
-					}
-				})
-			}
+
 			// #endif
 		},
 		onHide() {}

virgo.wzfrontend/wx/pages/index/index.vue

@@ -223,7 +223,7 @@
 			}
 
 			.sub-label {
-				color: $uni-extras-color;
+				color: $uni-extra-color;
 				font-size: 24rpx;
 				display: flex;
 				align-items: center;
@@ -233,12 +233,12 @@
 
 			.sub-label-icon {
 				/* #ifdef H5 */
-				color: $uni-extras-color !important;
+				color: $uni-extra-color !important;
 
 				/* #endif */
 				/* #ifdef MP-WEIXIN */
 				text {
-					color: $uni-extras-color !important;
+					color: $uni-extra-color !important;
 				}
 
 				/* #endif */
@@ -251,12 +251,12 @@
 			.home-filled {
 				opacity: 0.3;
 				/* #ifdef H5 */
-				color: $uni-extras-color !important;
+				color: $uni-extra-color !important;
 
 				/* #endif */
 				/* #ifdef MP-WEIXIN */
 				text {
-					color: $uni-extras-color !important;
+					color: $uni-extra-color !important;
 				}
 
 				/* #endif */

virgo.wzfrontend/wx/pages/order/order.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="order-index">
-		<web-view src="http://192.168.101.6:8848/test/index.html"></web-view>
+	
 	</view>
 </template>
 

virgo.wzfrontend/wx/uni.scss

@@ -4,21 +4,21 @@
  以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
  */
 // 主色
-$uni-primary: #3371FF;
+$uni-primary: #08979c;
 $uni-primary-disable:mix(#fff,$uni-primary,50%);
 $uni-primary-light: mix(#fff,$uni-primary,80%);
 
 // 辅助色
 // 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
-$uni-success: #18bc37;
+$uni-success: #389e0d;
 $uni-success-disable:mix(#fff,$uni-success,50%);
 $uni-success-light: mix(#fff,$uni-success,80%);
 
-$uni-warning: #f3a73f;
+$uni-warning: #fa8c16;
 $uni-warning-disable:mix(#fff,$uni-warning,50%);
 $uni-warning-light: mix(#fff,$uni-warning,80%);
 
-$uni-error: #e43d33;
+$uni-error: #ff4d4f;
 $uni-error-disable:mix(#fff,$uni-error,50%);
 $uni-error-light: mix(#fff,$uni-error,80%);
 
@@ -28,14 +28,13 @@ $uni-info-light: mix(#fff,$uni-info,80%);
 
 // 中性色
 // 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
-$uni-main-color: #3a3a3a; 			// 主要文字
-$uni-base-color: #6a6a6a;			// 常规文字
-$uni-secondary-color: #909399;	// 次要文字
-$uni-extra-color: #c7c7c7;			// 辅助说明
-$uni-extras-color: #eee;			// 辅助说明
+$uni-main-color: #1f1f1f; 			// 主要文字
+$uni-base-color: #434343;			// 常规文字
+$uni-secondary-color: #8c8c8c;		// 次要文字
+$uni-extra-color: #bfbfbf;			// 辅助说明
 
 // 边框颜色
-$uni-border-1: #F0F0F0;
+$uni-border-1: #d9d9d9;
 $uni-border-2: #EDEDED;
 $uni-border-3: #DCDCDC;
 $uni-border-4: #B9B9B9;
@@ -59,4 +58,7 @@ $uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
 $uni-mask: rgba($color: #000000, $alpha: 0.4);
 
 // 背景色
-$uni-background-color:#f8f8f8;
+$uni-background-color:#f2f2f2;
+
+// 微信色
+$uni-wechat-color:#43b156;

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -9,79 +9,79 @@
 /*每个页面公共css */
 /* 水平间距 */
 .uni-border {
-  border: 1px #F0F0F0 solid;
+  border: 1px #d9d9d9 solid;
 }
 .uni-primary {
-  color: #3371FF;
+  color: #08979c;
 }
 .uni-primary-bg {
-  background-color: #3371FF;
+  background-color: #08979c;
 }
 .uni-primary-disable {
-  color: #99b8ff;
+  color: #84cbce;
 }
 .uni-primary-disable-bg {
-  background-color: #99b8ff;
+  background-color: #84cbce;
 }
 .uni-primary-light {
-  color: #d6e3ff;
+  color: #ceeaeb;
 }
 .uni-primary-light-bg {
-  background-color: #d6e3ff;
+  background-color: #ceeaeb;
 }
 .uni-success {
-  color: #18bc37;
+  color: #389e0d;
 }
 .uni-success-bg {
-  background-color: #18bc37;
+  background-color: #389e0d;
 }
 .uni-success-disable {
-  color: #8cde9b;
+  color: #9ccf86;
 }
 .uni-success-disable-bg {
-  background-color: #8cde9b;
+  background-color: #9ccf86;
 }
 .uni-success-light {
-  color: #d1f2d7;
+  color: #d7eccf;
 }
 .uni-success-light-bg {
-  background-color: #d1f2d7;
+  background-color: #d7eccf;
 }
 .uni-warning {
-  color: #f3a73f;
+  color: #fa8c16;
 }
 .uni-warning-bg {
-  background-color: #f3a73f;
+  background-color: #fa8c16;
 }
 .uni-warning-disable {
-  color: #f9d39f;
+  color: #fdc68b;
 }
 .uni-warning-disable-bg {
-  background-color: #f9d39f;
+  background-color: #fdc68b;
 }
 .uni-warning-light {
-  color: #fdedd9;
+  color: #fee8d0;
 }
 .uni-warning-light-bg {
-  background-color: #fdedd9;
+  background-color: #fee8d0;
 }
 .uni-error {
-  color: #e43d33;
+  color: #ff4d4f;
 }
 .uni-error-bg {
-  background-color: #e43d33;
+  background-color: #ff4d4f;
 }
 .uni-error-disable {
-  color: #f29e99;
+  color: #ffa6a7;
 }
 .uni-error-disable-bg {
-  background-color: #f29e99;
+  background-color: #ffa6a7;
 }
 .uni-error-light {
-  color: #fad8d6;
+  color: #ffdbdc;
 }
 .uni-error-light-bg {
-  background-color: #fad8d6;
+  background-color: #ffdbdc;
 }
 .uni-info {
   color: #8f939c;
@@ -102,28 +102,28 @@
   background-color: #e9e9eb;
 }
 .uni-main-color {
-  color: #3a3a3a;
+  color: #1f1f1f;
 }
 .uni-main-color-bg {
-  background-color: #3a3a3a;
+  background-color: #1f1f1f;
 }
 .uni-base-color {
-  color: #6a6a6a;
+  color: #434343;
 }
 .uni-base-color-bg {
-  background-color: #6a6a6a;
+  background-color: #434343;
 }
 .uni-secondary-color {
-  color: #909399;
+  color: #8c8c8c;
 }
 .uni-secondary-color-bg {
-  background-color: #909399;
+  background-color: #8c8c8c;
 }
 .uni-extra-color {
-  color: #c7c7c7;
+  color: #bfbfbf;
 }
 .uni-extra-color-bg {
-  background-color: #c7c7c7;
+  background-color: #bfbfbf;
 }
 .uni-bg-color {
   color: #f7f7f7;
@@ -132,10 +132,10 @@
   background-color: #f7f7f7;
 }
 .uni-border-1 {
-  color: #F0F0F0;
+  color: #d9d9d9;
 }
 .uni-border-1-bg {
-  background-color: #F0F0F0;
+  background-color: #d9d9d9;
 }
 .uni-border-2 {
   color: #EDEDED;
@@ -2012,7 +2012,7 @@
 .uni-btn:not([type])[plain], .uni-btn[type=default][plain] {
   color: #999;
   background: none;
-  border-color: #F0F0F0;
+  border-color: #d9d9d9;
 }
 .uni-btn:not([type])[plain]:not([hover-class]):active, .uni-btn[type=default][plain]:not([hover-class]):active {
   background: none;
@@ -2044,23 +2044,23 @@
 }
 .uni-btn[type=primary] {
   color: #fff;
-  background-color: #3371FF;
-  border-color: #2f68eb;
+  background-color: #08979c;
+  border-color: #078b90;
 }
 .uni-btn[type=primary]:not([hover-class]):active {
-  background: #2e66e6;
-  border-color: #295acc;
+  background: #07888c;
+  border-color: #06797d;
   color: #fff;
   outline: none;
 }
 .uni-btn[type=primary][loading] {
   color: #fff;
-  background-color: #3371FF;
-  border-color: #2f68eb;
+  background-color: #08979c;
+  border-color: #078b90;
 }
 .uni-btn[type=primary][loading]:not([hover-class]):active {
-  background: #2e66e6;
-  border-color: #295acc;
+  background: #07888c;
+  border-color: #06797d;
   color: #fff;
   outline: none;
 }
@@ -2069,58 +2069,58 @@
 }
 .uni-btn[type=primary][disabled], .uni-btn[type=primary][disabled][loading], .uni-btn[type=primary][disabled]:not([hover-class]):active {
   color: #fff;
-  border-color: #80a6ff;
-  background-color: #99b8ff;
+  border-color: #82b4b5;
+  background-color: #84cbce;
 }
 .uni-btn[type=primary][plain] {
-  color: #3371FF;
-  background-color: #ebf1ff;
-  border-color: #c2d4ff;
+  color: #08979c;
+  background-color: #e6f5f5;
+  border-color: #b5e0e1;
 }
 .uni-btn[type=primary][plain]:not([hover-class]):active {
-  background: #d6e3ff;
-  color: #3371FF;
+  background: #ceeaeb;
+  color: #08979c;
   outline: none;
-  border-color: #99b8ff;
+  border-color: #84cbce;
 }
 .uni-btn[type=primary][plain][loading] {
-  color: #3371FF;
-  background-color: #ebf1ff;
-  border-color: #c2d4ff;
+  color: #08979c;
+  background-color: #e6f5f5;
+  border-color: #b5e0e1;
 }
 .uni-btn[type=primary][plain][loading]:not([hover-class]):active {
-  background: #d6e3ff;
-  color: #3371FF;
+  background: #ceeaeb;
+  color: #08979c;
   outline: none;
-  border-color: #99b8ff;
+  border-color: #84cbce;
 }
 .uni-btn[type=primary][plain][loading]::before {
   margin-right: 5px;
 }
 .uni-btn[type=primary][plain][disabled], .uni-btn[type=primary][plain][disabled]:active {
-  color: #85aaff;
-  background-color: #ebf1ff;
-  border-color: #d6e3ff;
+  color: #6bc1c4;
+  background-color: #e6f5f5;
+  border-color: #ceeaeb;
 }
 .uni-btn[type=success] {
   color: #fff;
-  background-color: #18bc37;
-  border-color: #16ad33;
+  background-color: #389e0d;
+  border-color: #34910c;
 }
 .uni-btn[type=success]:not([hover-class]):active {
-  background: #16a932;
-  border-color: #13962c;
+  background: #328e0c;
+  border-color: #2d7e0a;
   color: #fff;
   outline: none;
 }
 .uni-btn[type=success][loading] {
   color: #fff;
-  background-color: #18bc37;
-  border-color: #16ad33;
+  background-color: #389e0d;
+  border-color: #34910c;
 }
 .uni-btn[type=success][loading]:not([hover-class]):active {
-  background: #16a932;
-  border-color: #13962c;
+  background: #328e0c;
+  border-color: #2d7e0a;
   color: #fff;
   outline: none;
 }
@@ -2129,58 +2129,58 @@
 }
 .uni-btn[type=success][disabled], .uni-btn[type=success][disabled][loading], .uni-btn[type=success][disabled]:not([hover-class]):active {
   color: #fff;
-  border-color: #89c794;
-  background-color: #8cde9b;
+  border-color: #93b784;
+  background-color: #9ccf86;
 }
 .uni-btn[type=success][plain] {
-  color: #18bc37;
-  background-color: #e8f8eb;
-  border-color: #baebc3;
+  color: #389e0d;
+  background-color: #ebf5e7;
+  border-color: #c3e2b6;
 }
 .uni-btn[type=success][plain]:not([hover-class]):active {
-  background: #d1f2d7;
-  color: #18bc37;
+  background: #d7eccf;
+  color: #389e0d;
   outline: none;
-  border-color: #8cde9b;
+  border-color: #9ccf86;
 }
 .uni-btn[type=success][plain][loading] {
-  color: #18bc37;
-  background-color: #e8f8eb;
-  border-color: #baebc3;
+  color: #389e0d;
+  background-color: #ebf5e7;
+  border-color: #c3e2b6;
 }
 .uni-btn[type=success][plain][loading]:not([hover-class]):active {
-  background: #d1f2d7;
-  color: #18bc37;
+  background: #d7eccf;
+  color: #389e0d;
   outline: none;
-  border-color: #8cde9b;
+  border-color: #9ccf86;
 }
 .uni-btn[type=success][plain][loading]::before {
   margin-right: 5px;
 }
 .uni-btn[type=success][plain][disabled], .uni-btn[type=success][plain][disabled]:active {
-  color: #74d787;
-  background-color: #e8f8eb;
-  border-color: #d1f2d7;
+  color: #88c56e;
+  background-color: #ebf5e7;
+  border-color: #d7eccf;
 }
 .uni-btn[type=error] {
   color: #fff;
-  background-color: #e43d33;
-  border-color: #d2382f;
+  background-color: #ff4d4f;
+  border-color: #eb4749;
 }
 .uni-btn[type=error]:not([hover-class]):active {
-  background: #cd372e;
-  border-color: #b63129;
+  background: #e64547;
+  border-color: #cc3e3f;
   color: #fff;
   outline: none;
 }
 .uni-btn[type=error][loading] {
   color: #fff;
-  background-color: #e43d33;
-  border-color: #d2382f;
+  background-color: #ff4d4f;
+  border-color: #eb4749;
 }
 .uni-btn[type=error][loading]:not([hover-class]):active {
-  background: #cd372e;
-  border-color: #b63129;
+  background: #e64547;
+  border-color: #cc3e3f;
   color: #fff;
   outline: none;
 }
@@ -2189,58 +2189,58 @@
 }
 .uni-btn[type=error][disabled], .uni-btn[type=error][disabled][loading], .uni-btn[type=error][disabled]:not([hover-class]):active {
   color: #fff;
-  border-color: #e4928d;
-  background-color: #f29e99;
+  border-color: #ff8d8e;
+  background-color: #ffa6a7;
 }
 .uni-btn[type=error][plain] {
-  color: #e43d33;
-  background-color: #fceceb;
-  border-color: #f7c5c2;
+  color: #ff4d4f;
+  background-color: #ffeded;
+  border-color: #ffcaca;
 }
 .uni-btn[type=error][plain]:not([hover-class]):active {
-  background: #fad8d6;
-  color: #e43d33;
+  background: #ffdbdc;
+  color: #ff4d4f;
   outline: none;
-  border-color: #f29e99;
+  border-color: #ffa6a7;
 }
 .uni-btn[type=error][plain][loading] {
-  color: #e43d33;
-  background-color: #fceceb;
-  border-color: #f7c5c2;
+  color: #ff4d4f;
+  background-color: #ffeded;
+  border-color: #ffcaca;
 }
 .uni-btn[type=error][plain][loading]:not([hover-class]):active {
-  background: #fad8d6;
-  color: #e43d33;
+  background: #ffdbdc;
+  color: #ff4d4f;
   outline: none;
-  border-color: #f29e99;
+  border-color: #ffa6a7;
 }
 .uni-btn[type=error][plain][loading]::before {
   margin-right: 5px;
 }
 .uni-btn[type=error][plain][disabled], .uni-btn[type=error][plain][disabled]:active {
-  color: #ef8b85;
-  background-color: #fceceb;
-  border-color: #fad8d6;
+  color: #ff9495;
+  background-color: #ffeded;
+  border-color: #ffdbdc;
 }
 .uni-btn[type=warning] {
   color: #fff;
-  background-color: #f3a73f;
-  border-color: #e09a3a;
+  background-color: #fa8c16;
+  border-color: #e68114;
 }
 .uni-btn[type=warning]:not([hover-class]):active {
-  background: #db9639;
-  border-color: #c28632;
+  background: #e17e14;
+  border-color: #c87012;
   color: #fff;
   outline: none;
 }
 .uni-btn[type=warning][loading] {
   color: #fff;
-  background-color: #f3a73f;
-  border-color: #e09a3a;
+  background-color: #fa8c16;
+  border-color: #e68114;
 }
 .uni-btn[type=warning][loading]:not([hover-class]):active {
-  background: #db9639;
-  border-color: #c28632;
+  background: #e17e14;
+  border-color: #c87012;
   color: #fff;
   outline: none;
 }
@@ -2249,38 +2249,38 @@
 }
 .uni-btn[type=warning][disabled], .uni-btn[type=warning][disabled][loading], .uni-btn[type=warning][disabled]:not([hover-class]):active {
   color: #fff;
-  border-color: #f8c887;
-  background-color: #f9d39f;
+  border-color: #ecb982;
+  background-color: #fdc68b;
 }
 .uni-btn[type=warning][plain] {
-  color: #f3a73f;
-  background-color: #fef6ec;
-  border-color: #fbe5c5;
+  color: #fa8c16;
+  background-color: #fff4e8;
+  border-color: #feddb9;
 }
 .uni-btn[type=warning][plain]:not([hover-class]):active {
-  background: #fdedd9;
-  color: #f3a73f;
+  background: #fee8d0;
+  color: #fa8c16;
   outline: none;
-  border-color: #f9d39f;
+  border-color: #fdc68b;
 }
 .uni-btn[type=warning][plain][loading] {
-  color: #f3a73f;
-  background-color: #fef6ec;
-  border-color: #fbe5c5;
+  color: #fa8c16;
+  background-color: #fff4e8;
+  border-color: #feddb9;
 }
 .uni-btn[type=warning][plain][loading]:not([hover-class]):active {
-  background: #fdedd9;
-  color: #f3a73f;
+  background: #fee8d0;
+  color: #fa8c16;
   outline: none;
-  border-color: #f9d39f;
+  border-color: #fdc68b;
 }
 .uni-btn[type=warning][plain][loading]::before {
   margin-right: 5px;
 }
 .uni-btn[type=warning][plain][disabled], .uni-btn[type=warning][plain][disabled]:active {
-  color: #f8ca8c;
-  background-color: #fef6ec;
-  border-color: #fdedd9;
+  color: #fcba73;
+  background-color: #fff4e8;
+  border-color: #fee8d0;
 }
 .uni-btn[type=info] {
   color: #fff;
@@ -2343,9 +2343,9 @@
   border-color: #e9e9eb;
 }
 page {
-  color: #3a3a3a;
+  color: #1f1f1f;
   font-size: 28rpx;
-  background: #f8f8f8;
+  background: #f2f2f2;
 }
 page ._img {
   width: 100%;