:sparkles: update

manifest.json

@@ -1,8 +1,8 @@
 {
     "name" : "申泽物料追踪溯源小程序",
-    "appid" : "__UNI__C9DE28D",
+    "appid" : "__UNI__0D01EEF",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0.1",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -94,8 +94,8 @@
         "appid" : "wxee9bb82efa627f25",
         "setting" : {
             "urlCheck" : false,
-            "es6" : true,
-            "postcss" : true,
+            "es6" : false,
+            "postcss" : false,
             "minified" : false
         },
         "usingComponents" : true,

pages.json

@@ -179,5 +179,15 @@
 				"text": "我的"
 			}
 		]
+	},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
 	}
 }

pages/Insert/addModules.vue

@@ -3,36 +3,37 @@
 		<form @submit="add">
 			<view class="body">
 				<input class="input" style="display:none;" name="coding" :value=coding />
-				编码：<input class="input" v-model="coding"  />
-				<button type="primary" @click="saoma()"  class="button1">
-					<p  class="p">扫码</p>
+				编码：<input class="input" v-model="coding" />
+				<button type="primary" @click="saoma()" class="button1">
+					<p class="p">扫码</p>
 				</button>
 				<button type="primary" @click="getMessage(coding)" class="button1">
-					<p  class="p">获取</p>
+					<p class="p">获取</p>
 				</button>
 			</view>
 			<view class="body">
-				名称：<input class="input" name="name" :value="name"   />
+				名称：<input class="input" name="name" :value="name" />
 			</view>
 			<view class="body">
-				版本号：<input class="input" name="versions" :value="versions"   />
+				版本号：<input class="input" name="versions" :value="versions" />
 			</view>
-			<view  class="body">
-				生产人员：<input class="input" name="producePersonnel" :value="producePersonnel"  readonly="readonly"/>
+			<view class="body">
+				生产人员：<input class="input" name="producePersonnel" :value="producePersonnel" readonly="readonly" />
 			</view>
 			<timeSelector showType="date" @btnConfirm="btnConfirm0" @btnCancel="btnCancel0">
 				<view class="body">
-					生产日期：<input type="text" class="input" name="produceDate" :value="produceDate"  />
+					<!-- 生产日期：<input type="text" class="input" name="produceDate" :value="produceDate"  /> -->
+					生产日期：<view class="input">{{ produceDate }}</view>
 				</view>
 			</timeSelector>
 			<view class="title">配件</view>
-			<view class="lis" v-for="item in desList" >
+			<view class="lis" v-for="item in desList">
 				{{item}}
 			</view>
-			
+
 			<view class="">
 				<button type="primary" formType="submit" class="button">
-					<p  class="p1">提交</p>
+					<p class="p1">提交</p>
 				</button>
 			</view>
 		</form>
@@ -52,12 +53,12 @@
 		},
 		data() {
 			return {
-				produceDate:'',
-				coding:null,
-				name:null,
-				versions:null,
-				producePersonnel:null,
-				desList:{}
+				produceDate: '',
+				coding: null,
+				name: null,
+				versions: null,
+				producePersonnel: null,
+				desList: {}
 			}
 		},
 		methods: {
@@ -68,38 +69,38 @@
 			btnCancel0() {
 				this.produceDate = '';
 			},
-			saoma(){
+			saoma() {
 				var that = this;
 				// 允许从相机和相册扫码
 				uni.scanCode({
-				    success(res) {
-				        // console.log('条码类型：' + res.scanType);
-				        // console.log('条码内容：' + res.result);
+					success(res) {
+						// console.log('条码类型：' + res.scanType);
+						// console.log('条码内容：' + res.result);
 						that.coding = res.result;
-				    }
+					}
 				});
 			},
-			getMessage(coding){
+			getMessage(coding) {
 				console.log("a");
 				var that = this;
 				var serverUrl = that.serverurl;
 				var token = uni.getStorageSync("token");
 				uni.request({
-					url: serverUrl + "/TModules/getMessage?coding="+coding,
+					url: serverUrl + "/TModules/getMessage?coding=" + coding,
 					method: "GET",
 					header: {
 						'token': token
 					},
 					success: (Result) => {
 						var res = Result;
-						if(res.data.code==true){
+						if (res.data.code == true) {
 							var codes = res.data.data;
-						that.name = codes.name;
-						that.versions = codes.versions
-						that.produceDate = codes.createDate;
-						that.producePersonnel = uni.getStorageSync("name");
-						that.desList = codes.flagCode.split(",");
-						}else{
+							that.name = codes.name;
+							that.versions = codes.versions
+							that.produceDate = codes.createDate;
+							that.producePersonnel = uni.getStorageSync("name");
+							that.desList = codes.flagCode.split(",");
+						} else {
 							uni.showModal({
 								content: res.data.message,
 							});
@@ -112,32 +113,32 @@
 				const {
 					value: modules
 				} = event.detail;
-					var token = uni.getStorageSync("token");
-					uni.request({
-						url: serverUrl + "/TModules/add",
-						method: "POST",
-						data:{
-							"coding":modules.coding,
-							"name":modules.name,
-							"producePersonnel":modules.producePersonnel
-						},
-						header: {
-							'token': token
-						},
-						success: (Result) => {
-							var res = Result;
-							if(res.data.code==true){
-								
-							}
-							
-							uni.showModal({
-								title: '提示',
-								content: res.data.message,
-							});
+				var token = uni.getStorageSync("token");
+				uni.request({
+					url: serverUrl + "/TModules/add",
+					method: "POST",
+					data: {
+						"coding": modules.coding,
+						"name": modules.name,
+						"producePersonnel": modules.producePersonnel
+					},
+					header: {
+						'token': token
+					},
+					success: (Result) => {
+						var res = Result;
+						if (res.data.code == true) {
+
 						}
-					});
-			
-			
+
+						uni.showModal({
+							title: '提示',
+							content: res.data.message,
+						});
+					}
+				});
+
+
 			},
 		}
 	}
@@ -151,7 +152,7 @@
 		flex-direction: row;
 		justify-content: flex-start;
 	}
-	
+
 	.input {
 		/* padding: 10upx 20upx 10upx 0upx; */
 		padding-left: 20upx;
@@ -168,11 +169,13 @@
 		width: 60%;
 		height: 100upx;
 	}
+
 	.button1 {
 		margin: auto;
 		width: 75upx;
 		height: 50upx;
 	}
+
 	.p {
 		/* #ifdef H5 */
 		top: -13%;
@@ -192,6 +195,7 @@
 		-webkit-transform: translateX(-50%);
 		transform: translateX(-50%);
 	}
+
 	.p1 {
 		/* #ifdef H5 */
 		top: -13%;
@@ -210,17 +214,20 @@
 		-webkit-transform: translateX(-50%);
 		transform: translateX(-50%);
 	}
+
 	.radio {
 		padding-top: 20upx;
 		padding-left: 30upx;
 	}
-	.lis{
+
+	.lis {
 		padding-left: 90upx;
 		font-size: 30upx;
 		padding-top: 5upx;
 	}
+
 	.title {
 		padding-left: 20upx;
 		font-size: 35upx;
 	}
-</style>
+</style>

pages/Login/Login.vue

@@ -177,6 +177,13 @@
 				.section {
 					margin: 50upx 0;
 				}
+				
+				.input-account, .input-pwd {
+				  border: 1px outset #1aad19; /* 设置边框颜色为绿色，边框宽度为2px */
+				  border-radius: 4px; /* 添加圆角 */
+				  box-sizing: border-box; /* 确保内边距和边框不会影响元素的总宽度 */
+				  // box-shadow: 0 0 0 0.1rem #1aad19;
+				}
 
 				.btn-area {
 					margin-top: 100upx;

pages/select/selectMachine.vue

@@ -43,6 +43,9 @@
 				<t-tr class="tr">
 					总装结束时间：{{endDate}}
 				</t-tr>
+				<t-tr class="tr">
+					刷卡器：{{cardReader}}
+				</t-tr>
 			</t-table>
 		</view>
 		<view class="line"></view>
@@ -93,14 +96,15 @@
 				clientId: '',
 				customerNo: '',
 				orderNo: '',
+				cardReader: '',
 				endDate: '',
 				modulesList: [],
-				Modulesname:'',
-				weiname:''
+				Modulesname: '',
+				weiname: ''
 			}
 		},
 		onShow() {
-			
+
 		},
 		onLoad: function(option) {
 			const item = JSON.parse(decodeURIComponent(option.item));
@@ -117,15 +121,15 @@
 					}
 				});
 			},
-			gongxu(){
+			gongxu() {
 				var item = {
-					coding:null,
-					type:'get'
+					coding: null,
+					type: 'get'
 				};
 				var coding = this.coding;
 				item.coding = coding;
 				uni.navigateTo({
-					url:'../Insert/workingProcedure?item='+encodeURIComponent(JSON.stringify(item))
+					url: '../Insert/workingProcedure?item=' + encodeURIComponent(JSON.stringify(item))
 				});
 			},
 			getMessage(coding) {
@@ -150,6 +154,7 @@
 								that.clientId = tmachine.clientId;
 								that.customerNo = tmachine.customerNo;
 								that.orderNo = tmachine.orderNo;
+								that.cardReader = tmachine.cardReader;
 								that.coding = tmachine.coding;
 								that.startDate = tmachine.startDate;
 								that.endDate = tmachine.endDate;
@@ -161,6 +166,7 @@
 								that.clientId = codes.clientId;
 								that.customerNo = codes.customerNo;
 								that.orderNo = codes.orderNo;
+								that.cardReader = codes.cardReader;
 								that.producePersonnel = uni.getStorageSync("name");
 							}
 
@@ -180,7 +186,7 @@
 					url: 'selectModules',
 				});
 			},
-			jiancha(){
+			jiancha() {
 				var token = uni.getStorageSync("token");
 				uni.request({
 					url: this.serverurl + "/TWorkingProcedure/jiancha",
@@ -195,18 +201,18 @@
 						var res = Result;
 						if (res.data.code == false) {
 							var re = res.data.data.toString();
-							this.weiname = re+'未安装';
-						}else{
+							this.weiname = re + '未安装';
+						} else {
 							this.weiname = '已全部安装';
 						}
 						this.jianchaModules();
 					}
 				});
 			},
-			jianchaModules(){
+			jianchaModules() {
 				var token = uni.getStorageSync("token");
 				uni.request({
-					url: this.serverurl + "/TModules/jianchaModules?machineCoding="+this.coding,
+					url: this.serverurl + "/TModules/jianchaModules?machineCoding=" + this.coding,
 					method: "GET",
 					header: {
 						'token': token
@@ -215,8 +221,8 @@
 						var res = Result;
 						if (res.data.code == false) {
 							var re = res.data.data.toString();
-							this.Modulesname = re+'未安装';
-						}else{
+							this.Modulesname = re + '未安装';
+						} else {
 							this.Modulesname = '已全部安装';
 						}
 					}
@@ -331,8 +337,9 @@
 		padding-left: 20upx;
 		font-size: 35upx;
 	}
+
 	.line {
 		background: #ECECEC;
 		height: 10upx;
 	}
-</style>
+</style>

pages/select/update.vue

@@ -24,12 +24,13 @@
 			</view>
 			<timeSelector showType="date" @btnConfirm="btnConfirm0" @btnCancel="btnCancel0">
 				<view class="body">
-					更换日期：<input type="text" class="input" name="replateDate" :value="replateDate"/>
+					<!-- 更换日期：<input type="text" class="input" name="replateDate" :value="replateDate"/> -->
+					更换日期：<view class="input">{{ replateDate }}</view>
 				</view>
 			</timeSelector>
 			<view class="body">
 				更换原因：<textarea class="input-two" name="replaceReason" />
-				</view>
+			</view>
 			<view class="">
 				<button type="primary" formType="submit" class="button">
 					<p class="p1">提交</p>
@@ -41,18 +42,23 @@
 
 <script>
 	import timeSelector from '@/components/wing-time-selector/wing-time-selector.vue';
-	
+
 	export default {
 		components: {
 			timeSelector
 		},
 		data() {
+			// 初始化为今天的日期
+			const now = new Date();
+			const replateDateString = now.getFullYear() + '-' +
+				(now.getMonth() + 1).toString().padStart(2, '0') + '-' +
+				now.getDate().toString().padStart(2, '0');
 			return {
 				machineCoding: '',
 				coding: '',
 				oldCoding: '',
 				replaceReason: '',
-				replateDate: ''
+				replateDate: replateDateString
 			}
 		},
 		onLoad: function(option) {
@@ -62,91 +68,90 @@
 			this.oldCoding = coding;
 		},
 		methods: {
-				saoma1(){
-					var that = this;
-					// 允许从相机和相册扫码
-					uni.scanCode({
-					    success(res) {
-							that.machineCoding = res.result;
-					    }
-					});
-				},
-				saoma2(){
-					var that = this;
-					// 允许从相机和相册扫码
-					uni.scanCode({
-					    success(res) {
-							that.oldCoding = res.result;
-					    }
-					});
-				},
-				saoma3(){
-					var that = this;
-					// 允许从相机和相册扫码
-					uni.scanCode({
-					    success(res) {
-							that.coding = res.result;
-					    }
-					});
-				},
-				btnConfirm0(e) {
-					console.log('确定时间为：', new Date(e.key));
-					this.replateDate = e.key;
-				},
-				btnCancel0() {
-					this.replateDate = '';
-				},
-				update(event) {
-					var serverUrl = this.serverurl;
-					const {
-						value: modules
-					} = event.detail;
-						var token = uni.getStorageSync("token");
-						var replateDateObject = new Date(this.replateDate);
-						var replateDateString = replateDateObject.getFullYear() + '-' +
-						                            (replateDateObject.getMonth() + 1).toString().padStart(2, '0') + '-' +
-						                            replateDateObject.getDate().toString().padStart(2, '0') + ' ' +
-						                            replateDateObject.getHours().toString().padStart(2, '0') + ':' +
-						                            replateDateObject.getMinutes().toString().padStart(2, '0') + ':' +
-						                            replateDateObject.getSeconds().toString().padStart(2, '0');
-						uni.request({
-							url: serverUrl + "/TModules/replace",
-							method: "POST",
-							data:{
-								"coding":modules.coding,
-								"machineCoding":modules.machineCoding,
-								"oldCoding":modules.oldCoding,
-								"replateDate":replateDateString,
-								"replaceReason":modules.replaceReason,
-								"replacePersonnel":uni.getStorageSync("name"),
-							},
-							header: {
-								'token': token
-							},
-							success: (Result) => {
-								var res = Result;
-								if(res.data.code==true){
-								}
-								uni.showModal({
-									title: '提示',
-									content: res.data.message,
-								});
-							}
+			saoma1() {
+				var that = this;
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					success(res) {
+						that.machineCoding = res.result;
+					}
+				});
+			},
+			saoma2() {
+				var that = this;
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					success(res) {
+						that.oldCoding = res.result;
+					}
+				});
+			},
+			saoma3() {
+				var that = this;
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					success(res) {
+						that.coding = res.result;
+					}
+				});
+			},
+			btnConfirm0(e) {
+				console.log('确定时间为：', new Date(e.key));
+				this.replateDate = e.key;
+			},
+			btnCancel0() {
+				this.replateDate = '';
+			},
+			update(event) {
+				var serverUrl = this.serverurl;
+				const {
+					value: modules
+				} = event.detail;
+				var token = uni.getStorageSync("token");
+				var replateDateObject = new Date(this.replateDate);
+				var replateDateString = replateDateObject.getFullYear() + '-' +
+					(replateDateObject.getMonth() + 1).toString().padStart(2, '0') + '-' +
+					replateDateObject.getDate().toString().padStart(2, '0') + ' ' +
+					replateDateObject.getHours().toString().padStart(2, '0') + ':' +
+					replateDateObject.getMinutes().toString().padStart(2, '0') + ':' +
+					replateDateObject.getSeconds().toString().padStart(2, '0');
+				uni.request({
+					url: serverUrl + "/TModules/replace",
+					method: "POST",
+					data: {
+						"coding": modules.coding,
+						"machineCoding": modules.machineCoding,
+						"oldCoding": modules.oldCoding,
+						"replateDate": replateDateString,
+						"replaceReason": modules.replaceReason,
+						"replacePersonnel": uni.getStorageSync("name"),
+					},
+					header: {
+						'token': token
+					},
+					success: (Result) => {
+						var res = Result;
+						if (res.data.code == true) {}
+						uni.showModal({
+							title: '提示',
+							content: res.data.message,
 						});
-				},
+					}
+				});
+			},
 		}
 	}
 </script>
 
 <style>
-.body {
+	.body {
 		background-color: #FFFFFF;
 		padding: 20upx 20upx 20upx 20upx;
 		display: flex;
 		flex-direction: row;
 		justify-content: flex-start;
 	}
-	
+
 	.input {
 		/* padding: 10upx 20upx 10upx 0upx; */
 		padding-left: 20upx;
@@ -163,11 +168,13 @@
 		width: 60%;
 		height: 100upx;
 	}
+
 	.button1 {
 		margin: auto;
 		width: 75upx;
 		height: 50upx;
 	}
+
 	.p {
 		/* #ifdef H5 */
 		top: -13%;
@@ -187,12 +194,14 @@
 		-webkit-transform: translateX(-50%);
 		transform: translateX(-50%);
 	}
-	.input-two{
+
+	.input-two {
 		padding-left: 20upx;
 		width: 450upx;
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
 	}
+
 	.p1 {
 		/* #ifdef H5 */
 		top: -13%;
@@ -204,11 +213,11 @@
 		/* #ifndef H5 */
 		padding-top: 10upx;
 		/* #endif */
-	
+
 		position: absolute;
 		/* 水平居中 */
 		left: 50%;
 		-webkit-transform: translateX(-50%);
 		transform: translateX(-50%);
 	}
-</style>
+</style>

pages/update/update.vue

@@ -24,13 +24,13 @@
 			</view>
 			<timeSelector showType="date" @btnConfirm="btnConfirm0" @btnCancel="btnCancel0">
 				<view class="body">
-					更换日期：<input type="text" class="input" name="replateDate" :value="replateDate"/>
+					<!-- 更换日期：<input type="hidden" class="input" name="replateDate" :value="replateDate" /> -->
+					更换日期：<view class="input">{{ replateDate }}</view>
 				</view>
 			</timeSelector>
-			
 			<view class="body">
 				更换原因：<textarea class="input-two" name="replaceReason" />
-				</view>
+			</view>
 			<view class="">
 				<button type="primary" formType="submit" class="button">
 					<p class="p1">提交</p>
@@ -42,108 +42,112 @@
 
 <script>
 	import timeSelector from '@/components/wing-time-selector/wing-time-selector.vue';
-	
+
 	export default {
 		components: {
 			timeSelector
 		},
 		data() {
+			// 初始化为今天的日期
+			const now = new Date();
+			const replateDateString = now.getFullYear() + '-' +
+				(now.getMonth() + 1).toString().padStart(2, '0') + '-' +
+				now.getDate().toString().padStart(2, '0');
 			return {
 				machineCoding: '',
 				coding: '',
 				oldCoding: '',
-				replateDate:'',
+				replateDate: replateDateString,
 				replaceReason: ''
 			}
 		},
 		methods: {
-				saoma1(){
-					var that = this;
-					// 允许从相机和相册扫码
-					uni.scanCode({
-					    success(res) {
-							that.machineCoding = res.result;
-					    }
-					});
-				},
-				saoma2(){
-					var that = this;
-					// 允许从相机和相册扫码
-					uni.scanCode({
-					    success(res) {
-							that.oldCoding = res.result;
-					    }
-					});
-				},
-				saoma3(){
-					var that = this;
-					// 允许从相机和相册扫码
-					uni.scanCode({
-					    success(res) {
-							that.coding = res.result;
-					    }
-					});
-				},
-				btnConfirm0(e) {
-					console.log('确定时间为：', new Date(e.key));
-					this.replateDate = e.key;
-				},
-				btnCancel0() {
-					this.replateDate = '';
-				},
-				
-				update(event) {
-					var serverUrl = this.serverurl;
-					const {
-						value: modules
-					} = event.detail;
-						var token = uni.getStorageSync("token");
-						var replateDateObject = new Date(this.replateDate);
-						var replateDateString = replateDateObject.getFullYear() + '-' +
-						                            (replateDateObject.getMonth() + 1).toString().padStart(2, '0') + '-' +
-						                            replateDateObject.getDate().toString().padStart(2, '0') + ' ' +
-						                            replateDateObject.getHours().toString().padStart(2, '0') + ':' +
-						                            replateDateObject.getMinutes().toString().padStart(2, '0') + ':' +
-						                            replateDateObject.getSeconds().toString().padStart(2, '0');
-						console.log('时间参数格式化为：', replateDateString);
-						uni.request({
-							url: serverUrl + "/TModules/replace",
-							method: "POST",
-							data:{
-								"coding":modules.coding,
-								"machineCoding":modules.machineCoding,
-								"oldCoding":modules.oldCoding,
-								"replateDate":replateDateString,
-								"replaceReason":modules.replaceReason,
-								"replacePersonnel":uni.getStorageSync("name"),
-							},
-							header: {
-								'token': token
-							},
-							success: (Result) => {
-								var res = Result;
-								if(res.data.code==true){
-								}
-								uni.showModal({
-									title: '提示',
-									content: res.data.message,
-								});
-							}
+			saoma1() {
+				var that = this;
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					success(res) {
+						that.machineCoding = res.result;
+					}
+				});
+			},
+			saoma2() {
+				var that = this;
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					success(res) {
+						that.oldCoding = res.result;
+					}
+				});
+			},
+			saoma3() {
+				var that = this;
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					success(res) {
+						that.coding = res.result;
+					}
+				});
+			},
+			btnConfirm0(e) {
+				console.log('确定时间为：', new Date(e.key));
+				this.replateDate = e.key;
+			},
+			btnCancel0() {
+				this.replateDate = '';
+			},
+
+			update(event) {
+				var serverUrl = this.serverurl;
+				const {
+					value: modules
+				} = event.detail;
+				var token = uni.getStorageSync("token");
+				var replateDateObject = new Date(this.replateDate);
+				var replateDateString = replateDateObject.getFullYear() + '-' +
+					(replateDateObject.getMonth() + 1).toString().padStart(2, '0') + '-' +
+					replateDateObject.getDate().toString().padStart(2, '0') + ' ' +
+					replateDateObject.getHours().toString().padStart(2, '0') + ':' +
+					replateDateObject.getMinutes().toString().padStart(2, '0') + ':' +
+					replateDateObject.getSeconds().toString().padStart(2, '0');
+				console.log('时间参数格式化为：', replateDateString);
+				uni.request({
+					url: serverUrl + "/TModules/replace",
+					method: "POST",
+					data: {
+						"coding": modules.coding,
+						"machineCoding": modules.machineCoding,
+						"oldCoding": modules.oldCoding,
+						"replateDate": replateDateString,
+						"replaceReason": modules.replaceReason,
+						"replacePersonnel": uni.getStorageSync("name"),
+					},
+					header: {
+						'token': token
+					},
+					success: (Result) => {
+						var res = Result;
+						if (res.data.code == true) {}
+						uni.showModal({
+							title: '提示',
+							content: res.data.message,
 						});
-				},
+					}
+				});
+			},
 		}
 	}
 </script>
 
 <style>
-.body {
+	.body {
 		background-color: #FFFFFF;
 		padding: 20upx 20upx 20upx 20upx;
 		display: flex;
 		flex-direction: row;
 		justify-content: flex-start;
 	}
-	
+
 	.input {
 		/* padding: 10upx 20upx 10upx 0upx; */
 		padding-left: 20upx;
@@ -160,11 +164,13 @@
 		width: 60%;
 		height: 100upx;
 	}
+
 	.button1 {
 		margin: auto;
 		width: 75upx;
 		height: 50upx;
 	}
+
 	.p {
 		/* #ifdef H5 */
 		top: -13%;
@@ -184,12 +190,14 @@
 		-webkit-transform: translateX(-50%);
 		transform: translateX(-50%);
 	}
-	.input-two{
+
+	.input-two {
 		padding-left: 20upx;
 		width: 450upx;
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
 	}
+
 	.p1 {
 		/* #ifdef H5 */
 		top: -13%;
@@ -201,11 +209,11 @@
 		/* #ifndef H5 */
 		padding-top: 10upx;
 		/* #endif */
-	
+
 		position: absolute;
 		/* 水平居中 */
 		left: 50%;
 		-webkit-transform: translateX(-50%);
 		transform: translateX(-50%);
 	}
-</style>
+</style>

project.config.json

@@ -0,0 +1,28 @@
+{
+  "appid": "wxee9bb82efa627f25",
+  "compileType": "miniprogram",
+  "libVersion": "3.4.5",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
+}

project.private.config.json

@@ -0,0 +1,7 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "materialAppletApp",
+  "setting": {
+    "compileHotReLoad": true
+  }
+}