@dongkboy преди 1 месец
родител
ревизия
adf15123c6
променени са 3 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 1 1
      components/uni-Popup/uni-Popup.vue
  2. 2 2
      components/uni-PopupMessage/uni-PopupMessage.vue
  3. 2 2
      config/baseUrl.js

+ 1 - 1
components/uni-Popup/uni-Popup.vue

@@ -2,7 +2,7 @@
 	<view class='uni-page'>
 	<view class='uni-page'>
 		<u-popup :show="modelshow" @close="close" :closeable="closeable" round="20rpx" :bgColor="bgColor" :mode="mode"
 		<u-popup :show="modelshow" @close="close" :closeable="closeable" round="20rpx" :bgColor="bgColor" :mode="mode"
 			:closeOnClickOverlay="closeOnClickOverlay" :customStyle="{width:width}">
 			:closeOnClickOverlay="closeOnClickOverlay" :customStyle="{width:width}">
-			<view class="dis f-c ">
+			<view class="">
 				<view class="header header-padding dis a-c j-c" v-if="!headerSlot" :class="{borderBottom:border}"
 				<view class="header header-padding dis a-c j-c" v-if="!headerSlot" :class="{borderBottom:border}"
 					:style="headerStyle">
 					:style="headerStyle">
 					<text>{{headerTitle}}</text>
 					<text>{{headerTitle}}</text>

+ 2 - 2
components/uni-PopupMessage/uni-PopupMessage.vue

@@ -13,7 +13,7 @@
 					</slot>
 					</slot>
 				</view>
 				</view>
 				<!-- 弹窗底部统一样式 -->
 				<!-- 弹窗底部统一样式 -->
-				<view class="footer dis a-c j-s ">
+				<view class="popup-footer dis a-c j-s ">
 					<view class="btn dis a-c j-c " @tap="cancelEvent">
 					<view class="btn dis a-c j-c " @tap="cancelEvent">
 						{{cancelText}}
 						{{cancelText}}
 					</view>
 					</view>
@@ -135,7 +135,7 @@
 		font-size: 30rpx;
 		font-size: 30rpx;
 	}
 	}
 
 
-	.footer {
+	.popup-footer {
 		border-top: 1rpx solid #EEEEEE;
 		border-top: 1rpx solid #EEEEEE;
 
 
 		.btn {
 		.btn {

+ 2 - 2
config/baseUrl.js

@@ -5,10 +5,10 @@ let TIANDITU_KEY = '';
 if (process.env.NODE_ENV === 'development') {
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	// 开发环境
 	// baseUrl = "http://192.168.5.249:8001"; //田智
 	// baseUrl = "http://192.168.5.249:8001"; //田智
-	// baseUrl = "http://192.168.5.47:8001"; //屈晨
+	// baseUrl = "http://192.168.5.40:8001"; //屈晨
 	// baseUrl = "http://192.168.5.163:8001"; //刘斌
 	// baseUrl = "http://192.168.5.163:8001"; //刘斌
 	// baseUrl = "http://192.168.5.150:8001"; //徐强
 	// baseUrl = "http://192.168.5.150:8001"; //徐强
-	baseUrl = "https://tennat.baoxianzhanggui.com/api"; //测试
+	baseUrl = "https://tennat.baoxianzhanggui.com/test_api"; //测试
 	h5BaseUrl = "https://tennat.baoxianzhanggui.com/h5";
 	h5BaseUrl = "https://tennat.baoxianzhanggui.com/h5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";
 	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";