Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

.gitignore

+node_modules
 unpackage/
 *-lock.json
\ No newline at end of file

components/tabbar/index.vue

@@ -36,8 +36,9 @@
 	}
 
 	.imgse {
-		height: 48upx;
+		height: 40upx;
 		width: auto;
+		margin-bottom: 8upx;
 	}
 
 	.txtBtn {

pages/kotra/BrandEnterSetIn/components/carrierInformation.vue

@@ -624,7 +624,7 @@ export default {
       //判断是否填写过了
       let data = this.datas.CarrierModel
       this.model = this.datas.CarrierModel
-      this.model.OpenTime = formatDate(new Date(data.OpenTime))
+      this.model.OpenTime = formatDate(new Date(this.model.OpenTime),'yyyy-MM-dd')
       this.model.CompanyId = this.datas.CompanyId;
       this.BrandClassName = data.CategoryName
 

pages/kotra/BrandEnterSetIn/components/enterInformation.vue

@@ -454,8 +454,8 @@
 			if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了
 				let data = this.datas.EnterpriseServicesModel
 				this.model = this.datas.EnterpriseServicesModel
-				this.model.OperationTime = formatDate(new Date(data.OperationTime))
-				this.model.HandoverDate = formatDate(new Date(data.HandoverDate))
+				this.model.OperationTime = formatDate(new Date(data.OperationTime),'yyyy-MM-dd')
+				this.model.HandoverDate = formatDate(new Date(data.HandoverDate),'yyyy-MM-dd')
 				this.model.CompanyId = this.datas.CompanyId
 				this.glBrandName = data.Name
 				if(this.model.BannerList && this.model.BannerList.length>0){