2 Commits 62baaca263 ... 35815de676

Autore SHA1 Messaggio Data
  achao 35815de676 Merge branch 'master' of http://git.zthymaoyi.com/zyw/tourism 1 anno fa
  achao d9a0987e2c 1 1 anno fa

+ 4 - 1
uni_applet/components/loginPopUp/index.vue

@@ -85,7 +85,7 @@
 	 			border: '2px solid #eaad1a',
 	 			"border-radius": "10px",
 	 			fontSize: "32rpx",
-				padding:'0 5px',
+				padding:'0 20rpx',
 	 			background: "#eaad1a"
 	 		},
 	 	};
@@ -199,4 +199,7 @@
 	/deep/.u-button--normal{
 		padding: 0 5px;
 	}
+	.slot-content{
+		width: 100%;
+	}
 </style>

+ 2 - 2
uni_applet/config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	// baseUrlNew: 'http://192.168.110.72:8182',
 	// baseUrlNew: 'http://192.168.110.138:8182',
-	// baseUrlNew: 'http://192.168.110.138:8183',
-	baseUrlNew: 'http://192.168.110.82:8183',
+	baseUrlNew: 'http://192.168.110.138:8183',
+	// baseUrlNew: 'http://192.168.110.82:8183',
 	// baseUrlNew: 'https://cardapi.eliangeyun.com',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 1 - 1
uni_applet/pageA/login/index.vue

@@ -82,7 +82,7 @@
 	 			// border: '2px solid #eaad1a',
 	 			"border-radius": "10px",
 	 			fontSize: "32rpx",
-				padding:'0 5px',
+				padding:'40rpx',
 	 			background: " linear-gradient(to right,#FED41E,#FDC21D);"
 	 		},
 	 	};

+ 14 - 14
uni_applet/pages/my/my.vue

@@ -8,21 +8,21 @@
 					</view>
 					<view>
 						<view class='flex'>
-							<view @click='login' v-if='!edit'>{{userInfo.nickname?userInfo.nickname:'请点击登录'}}</view>
+							<view @click='login' v-if='!edit' style="font-weight: bold;font-size: 32rpx;">{{userInfo.nickname?userInfo.nickname:'请点击登录'}}</view>
 							<view v-else> <u--input
 								placeholder="请输入内容"
 								border="bottom"
 								v-model='userInfo.nickname'
 								clearable
 							  ></u--input></view>
-							<u-icon  v-if='!edit&&userInfo.phone' @click='edit = true' name="edit-pen-fill" color="#2979ff" size="24"></u-icon>
-							<u-icon  v-if='edit&&userInfo.phone' @click='editNickName' name="checkbox-mark" color="#2979ff" size="24"></u-icon>
+							<u-icon  v-if='!edit&&userInfo.phone' @click='edit = true' name="edit-pen-fill" color="#eaad1a" size="24"></u-icon>
+							<u-icon  v-if='edit&&userInfo.phone' @click='editNickName' name="checkbox-mark" color="#eaad1a" size="24"></u-icon>
 						</view>
 						<view>{{userInfo.phone1}}</view>
 					</view>
 				</view>	
 				<view>
-					<u-icon name="bell" color="#2979ff" size="28"></u-icon>
+					<u-icon name="bell" color="#eaad1a" size="28"></u-icon>
 				</view>
 			</view>
 			
@@ -61,36 +61,36 @@
 			</view> -->
 			<view style='width:100%;'>
 				<u-cell-group :border='false'>
-					<u-cell
+					<!-- <u-cell
 					    title="收货地址"
 					    isLink
 					    url="/pages/componentsB/tag/tag"
-					></u-cell>
+					></u-cell> -->
 					<u-cell
 					    title="我的发布"
 					    isLink
 					    url="/pageA/my/mypublish"
 					></u-cell>
-					<u-cell
+					<!-- <u-cell
 					    title="房源发布"
 					    isLink
 					    url="/pages/componentsB/badge/badge"
-					></u-cell>
-					<u-cell
+					></u-cell> -->
+					<!-- <u-cell
 					    title="商家入驻"
 					    isLink
 					    url="/pages/componentsB/badge/badge"
-					></u-cell>
-					<u-cell
+					></u-cell> -->
+					<!-- <u-cell
 					    title="业务合作"
 					    isLink
 					    url="/pages/componentsB/badge/badge"
-					></u-cell>
-					<u-cell
+					></u-cell> -->
+					<!-- <u-cell
 					    title="广告推广"
 					    isLink
 					    url="/pages/componentsB/badge/badge"
-					></u-cell>
+					></u-cell> -->
 					<u-cell
 					    title="联系客服"
 					    isLink