调整样式

api/api.js

@@ -9,7 +9,7 @@ const apiService = {
 		console.log(passWord,phone,888888888);
 		
 		// return http.get('/merchant/app/loginPassWord',params)	
-		return http.get('/merchant/app/loginPassWord?passWord='+passWord+'&phone='+phone)	
+		return http.get('/merchant/app/loginPassWord?passWord='+passWord+'&phone='+phone +'&userType=2')	
 	},
 	/**
 	  * 手机号码登录

common/service/config.service.js

@@ -2,9 +2,9 @@ let BASE_URL = ''
 
 
 if (process.env.NODE_ENV == 'development') {
-	BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境
+	// BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境
 	// BASE_URL = 'http://192.168.0.36:8080/jeecg-boot' // 开发环境
-    // BASE_URL = 'http://192.168.0.52:8080/jeecg-boot' // 开发环境
+    BASE_URL = 'http://192.168.0.52:8080/jeecg-boot' // 开发环境
 
 } else {
 	BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境

components/product/refund.vue

@@ -107,7 +107,8 @@ export default {
   left: 0;
   background: rgba(0, 0, 0, 0.4);
   display: flex;
-  align-items: end;
+//   align-items: end;
+align-items: flex-end;
   z-index: 99;
 	.model{
 		width: 100%;

manifest.json

@@ -6,6 +6,7 @@
     "versionCode" : 1,
     "transformPx" : false,
     "app-plus" : {
+        "nvueStyleCompiler" : "uni-app",
         /* 5+App特有相关 */
         "modules" : {
             "Maps" : {},

pages/index/shop.vue

@@ -442,7 +442,8 @@
 			left: 0;
 			background: rgba(0, 0, 0, 0.4);
 			display: flex;
-			align-items: end;
+			align-items: flex-end;
+
 
 			.model {
 				width: 100%;

pages/login/login.vue

@@ -155,7 +155,6 @@ export default {
 			let loginParams = {
 				phone: this.userName,
 				passWord: this.password,
-				userType:'2'
 			}
 			this.loading = true;
 

pages/login/register.vue

@@ -157,8 +157,6 @@
 			        let loginParams = {
 						phone:this.userName,
 						passWord:this.password,
-				userType:'2'
-
 			        }
 					this.loading=true;
 				

pages/product/creatProduct.vue

@@ -705,7 +705,7 @@
 
 					.set {
 						display: flex;
-						justify-content: end;
+						justify-content: flex-end;
 
 						/deep/.u-input {
 							text-align: right !important;
@@ -805,7 +805,8 @@
 			left: 0;
 			background: rgba(0, 0, 0, 0.4);
 			display: flex;
-			align-items: end;
+			align-items: flex-end;
+
 			z-index: 99;
 
 			.model {

pages/product/group.vue

@@ -420,7 +420,8 @@
 			left: 0;
 			background: rgba(0, 0, 0, 0.4);
 			display: flex;
-			align-items: end;
+			align-items: flex-end;
+
 			z-index: 99;
 
 			.model {

pages/product/index.vue

@@ -677,7 +677,7 @@
 				.btn_box {
 					width: 100%;
 					display: flex;
-					justify-content: end;
+					justify-content: flex-end;
 					align-items: center;
 					margin-top: 20rpx;
 

pages/product/usable.vue

@@ -184,7 +184,7 @@
 				flex: 1;
 				display: flex;
 				align-items: center;
-				justify-content: end;
+				justify-content: flex-end;
 				font-size: 28rpx;
 				color: #999999;
 

pages/store/addHours.vue

@@ -5,13 +5,13 @@
         </cu-custom>
         <view class="tab-top bg-fff">
             <view class="title ">营业日</view>
-            <view style="padding-bottom:20upx;border-bottom: 1px solid #EEEEEE;">
-                <text v-for="(tag, index) in tags" :key="index" class="tag-type" :class="{
+            <view style="padding-bottom:20upx;border-bottom: 1px solid #EEEEEE;overflow: hidden;">
+                <view v-for="(tag, index) in tags" :key="index" class="tag-type" :class="{
                     'disable-background': isDisable(tag),
                     'selected-background': isSelected(tag)
                 }" :style="tag == '周四' || tag == '整周' ? 'margin-right:0' : ''" @click="toggleSelection(tag)">
                     {{ tag }}
-                </text>
+                </view>
             </view>
             <view style="padding-top:18upx">营业时段</view>
             <view class="cu-form-group" style="border-bottom: 1upx solid #eee;margin:0" v-if="timeType.length > 0">
@@ -269,7 +269,9 @@ page {
 }
 
 .tag-type {
-    display: inline-block;
+    // display: inline-block;
+    // display: flex;
+    float: left;
     font-size: 26upx;
     width: 146upx;
     height: 54upx;

plugin/colorui/main.css

@@ -44,6 +44,8 @@ image {
 image {
 	max-width: 100%;
 	display: inline-block;
+	/* flex-direction: row; 
+	justify-content: flex-start;  */
 	position: relative;
 	z-index: 0;
 }