Merge branch 'cyl/master-im'

components/list/job.vue

@@ -13,7 +13,7 @@
 			<!-- <view class="g_h_all" style="" v-if="!isLogin">
 				<unloginInfo></unloginInfo>
 			</view> -->
-			<g-empty :text="emptyText" :subText="emptySubText" style="margin-top: 30px" />
+			<g-empty :text="emptyText" style="margin-top: 30px" />
 			<view class="g_mt_32" v-if="isShowLoginBtn">
 				<g-button :btnText="'登录查看'" type="primary" @clickBtn="goLogin" />
 			</view>

pages/home/index.vue

@@ -275,7 +275,7 @@ export default {
 	computed: {},
 	onShow() {
 		let that = this;
-
+		that.tabInfo.active = 0;
 		that.isLogin = uni.getStorageSync("apply-token");
 
 		if (!that.isLogin) {
@@ -598,11 +598,14 @@ export default {
 			console.log("e", e);
 			this.G.isLogin();
 			if (this.G.isLogin()) {
+				console.log("一级tab切换");
 				this.tabInfo.active = e;
 				this.speed = -1;
 				this.loading = true;
 				this.query.page = 1;
 				this.getList();
+			}else{
+				console.log("请先登录")
 			}
 		},
 		checkAllChange(e) {

root/detail/job.vue

@@ -7,20 +7,24 @@
 			<g-loading />
 		</div>
 		<div v-if="speed == 1">
-			<view class="r_box g_flex_row_between flex_center g_pl_16 g_pr_16 g_h_45 g_fs_16" @click="goUserMain">
+			<view class="r_box g_flex_row_between flex_center g_pl_16 g_pr_16 g_fs_16" @click="goUserMain"
+				    style="height: 60px;"
+			>
 				<view class="g_fw_600 g_mr_4 g_flex_column_center">项目方</view>
 				<view class="g_flex_row_end flex_center g_flex_1">
-					<span class="g_c_6" selectable="false" space="false" decode="false">{{ jobDetail.agencyName }}</span>
+					<span class="g_c_6" selectable="false" space="false" decode="false">{{ jobDetail.fullName }}</span>
 					<span class="iconfont icon-gengduo11 g_fs_14 g_c_6 g_ml_4"></span>
 				</view>
 			</view>
-			<div class="r_box g_mb_10 g_mt_10 g_pl_16 g_pr_16 servicePrice" @click="showFee">
+			<div class="r_box g_mb_10 g_mt_10 g_pl_16 g_pr_16 servicePrice" @click="showFee"
+					 style="height: 60px;"
+			>
 				<div class="g_flex_row_between flex_center g_fs_16">
 					<div class="g_flex_row_start" style="flex: none">
-						<div class="g_fw_600 g_mr_4 g_h_67 g_flex_column_center">代理佣金</div>
-						<icon :class="showPrice ? 'icon-zhengyan1' : 'icon-biyan1'" class="iconfont g_c_f40 g_fs_22 g_h_67 g_flex_column_center" @click.stop="() => (showPrice = !showPrice)" style="width: 67px"></icon>
+						<div class="g_fw_600 g_mr_4 g_hs_67 g_flex_column_center">代理佣金</div>
+						<icon :class="showPrice ? 'icon-zhengyan1' : 'icon-biyan1'" class="iconfont g_c_f40 g_fs_22 g_hs_67 g_flex_column_center" @click.stop="() => (showPrice = !showPrice)" style="width: 67px"></icon>
 					</div>
-					<div class="g_flex_row_end flex_center g_h_67" style="flex: 1">
+					<div class="g_flex_row_end flex_center g_hs_67" style="flex: 1">
 						<span class v-if="showPrice">{{ jobDetail.serverPrice || "详询客服" }}</span>
 						<span class v-else>***</span>
 						<div class="iconfont icon-gengduo11 g_fs_14 g_c_6 g_ml_4"></div>
@@ -1572,4 +1576,7 @@ export default {
 		color: #333;
 	}
 }
+.g_hs_67{
+	height: 60px;
+}
 </style>