no message

App.vue

@@ -1,4 +1,5 @@
 <script lang="ts">
+// #ifdef APP-PLUS || MP-WEIXIN
 import RootStore from "@xkit-yx/im-store-v2";
 import V2NIM, { V2NIMConst } from "nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK";
 import { getMsgContentTipByType, setTabUnread } from "./pages/NEUIKit/utils/msg";
@@ -6,6 +7,7 @@ import { STORAGE_KEY } from "./pages/NEUIKit/utils/constants";
 import { isWxApp } from "./pages/NEUIKit/utils";
 import { V2NIMMessage, V2NIMMessagePushConfig, V2NIMConversation } from "nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService";
 import { unix } from "dayjs";
+// #endif
 
 export default {
 	globalData: {
@@ -94,7 +96,7 @@ export default {
 				that.checkAndReconnectIM();
 			}, 15 * 1000);
 		}
-
+		// #ifdef MP-WEIXIN
 		const updateManager = uni.getUpdateManager();
 		updateManager.onCheckForUpdate(function (res) {
 			console.log("检测是否有新版本：", res.hasUpdate);
@@ -125,6 +127,7 @@ export default {
 				},
 			});
 		});
+		// #endif
 	},
 	onHide: function () {
 		// 应用进入后台时不清除定时器，保持心跳
@@ -244,7 +247,7 @@ export default {
 
 		initWyyx() {
 			let that = this;
-
+			// #ifdef APP-PLUS || MP-WEIXIN
 			that.F.wyyxPost(
 				that.api.wyyx_getConfig,
 				{
@@ -279,6 +282,7 @@ export default {
 					this.initNim(imOptions);
 				}
 			);
+			// #endif
 		},
 
 		async initNim(opts) {
@@ -556,4 +560,10 @@ page {
 		border: 1px solid #00b666 !important;
 	}
 }
+
+/* #ifdef H5 */
+uni-button:after{
+	border: none !important;
+}
+/* #endif */
 </style>

components/list/applyPage.vue

@@ -333,9 +333,15 @@ export default {
 								item.time = that.G.getPointTime(item.updateTime, "MM--DD HH:MM");
 							}
 							
-							item.status_text = that.G.getOrderStatus().filter((itm, inx) => {
+							if(that.G.getOrderStatus().filter((itm, inx) => {
+								console.log(itm.id,item.status)
 								return itm.id == item.status;
-							})[0].name;
+							})[0]){
+								item.status_text = that.G.getOrderStatus().filter((itm, inx) => {
+									console.log(itm.id,item.status)
+									return itm.id == item.status;
+								})[0].name;
+							}
 							item.setTitle = that.G.titleToStr(item);
 						});
 					} else {

components/panel/numCard.vue

@@ -26,7 +26,7 @@
 					}"
 					@click="handleClick(item, index)"
 					class=""
-					:class="[border && (index + 1) % num != 0 ? 'g_border_e_r' : '', border && index < num ? 'g_border_e_b' : '', height < 38 ? 'g_pt_16' : 'g_pt_10']"
+					:class="[border && (index + 1) % num != 0 ? 'g_border_e_r g_border_e_rcopy' : '', border && index < num ? 'g_border_e_b' : '', height < 38 ? 'g_pt_16' : 'g_pt_10']"
 					hover-class="thover"
 				>
 					<!-- list.length < num -->

main.js

@@ -1,5 +1,4 @@
 import App from './App'
-import Vue from 'vue'
 import './uni.promisify.adaptor'
 import uView from './uni_modules/vk-uview-ui';
 import G from './utils/common.js';

pages.json

@@ -691,12 +691,14 @@
         "selectedIconPath": "static/image/home.png",
         "text": "首页"
       },
-      {
+			// #ifdef APP-PLUS || MP-WEIXIN 
-        "pagePath": "pages/message/index",
+			{
-        "iconPath": "static/image/message_gray.png",
+			  "pagePath": "pages/message/index",
-        "selectedIconPath": "static/image/message.png",
+			  "iconPath": "static/image/message_gray.png",
-        "text": "消息"
+			  "selectedIconPath": "static/image/message.png",
-      },
+			  "text": "消息"
+			},
+			// #endif 
       {
         "pagePath": "pages/home/order",
         "iconPath": "static/image/plus-square_gray.png",
@@ -709,12 +711,6 @@
         "selectedIconPath": "static/image/order.png",
         "text": "工单"
       },
-      // { ai
-      //   "iconPath": "static/image/home.png",
-      //   "selectedIconPath": "static/image/home.png",
-      //   "pagePath": "pages/addJob/index",
-      //   "text": ""
-      // },
       {
         "pagePath": "pages/person/index",
         "iconPath": "static/image/user_gray.png",

pages/home/index.vue

@@ -8,8 +8,6 @@
 		</view>
 		<div v-show="computeCode > -1 && isLogin">
 			<!-- 列表区 -->
-			<!-- <div @click="showPop = true"> 1123 </div> -->
-			<!-- `calc(${navInfo.windowHeight}px - ${navInfo.navigationBarHeight + navInfo.statusBarHeight}px)` -->
 			<scroll-view class="m-list" id="listBox" :scroll-into-view="scrollTo" :style="{ height: `calc(100vh - ${tabbarHeight}px)` }" :scroll-y="true" refresher-background="#ededed" :refresher-enabled="true" :refresher-triggered="isTrigger" @refresherrefresh="refreshJobList" @scrolltolower="reachBottom" @scroll="checkScroll">
 				<div class="g_h_all" hover-class="none" hover-stop-propagation="false">
 					<div class="g_position_rela g_flex_row_between flex_center g_ml_10 g_mr_10" id="topId">
@@ -24,18 +22,24 @@
 						<!-- 搜索区 -->
 						<div class="m-search g_p_10 g_pt_8 g_position_rela g_flex_1 bg_shawdoc" style id="searchInputBox">
 							<u-search height="80" v-model="keyword" @input="checkLength" @clear="searchJob" @search="searchJob" class="" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20"></u-search>
-							<!-- <div class="g_w_all g_h_40 g_position_abso" style="left: 0; z-index: 9999; top: 0; height: 100%" @click.stop="goSearch"></div> -->
 						</div>
+						<!-- #ifdef MP-WEIXIN || APP-PLUS -->
 						<div hover-class="none" class="g_bg_main g_flex_column_center g_radius_50 g_w_40 g_h_40 g_text_c g_c_f g_fs_11 g_fw_600" style="" hover-stop-propagation="false" @click="toShare" v-if="isLogin && userInfo.agencyId">
 							<div class="g_mb_3" style="line-height: 1">分享</div>
 							<div class="" style="line-height: 1">职位</div>
 						</div>
+						<!-- #endif -->
 					</div>
 					<div :style="{ minHeight: `100%` }">
 						<div class="sticky" v-if="isLogin">
 							<div class="g_flex_row_between flex_center" :class="toTop ? 'g_bg_f' : 'g_bg_f_5'" :style="{ 'box-shadow': toTop ? '0px 2px 3px 0px rgba(214, 214, 214, 0.3)' : '' }" id="tttop">
 								<div class="g_flex_1">
+									<!-- #ifdef MP-WEIXIN -->
 									<u-tabs bg-color="transparent" from="index" gutter="20" :list="tabInfo.list" :is-scroll="true" v-model="tabInfo.active" active-color="#00b666" bar-width="64" bar-height="6" @change="handleUpdateTab" font-size="34" duration="0.05" height="76"></u-tabs>
+									<!-- #endif -->
+									<!-- #ifdef H5 -->
+									<u-tabs bg-color="transparent" from="index" gutter="20" :list="tabInfo.list" :is-scroll="true" v-model="tabInfo.active" active-color="#00b666" bar-width="0" bar-height="6" @change="handleUpdateTab" font-size="34" duration="0.05" height="76"></u-tabs>
+									<!-- #endif -->
 								</div>
 								<div class="g_flex_row_end">
 									<div class="csbf" :class="toTop ? 'g_bg_f_5' : 'g_bg_f'" @click="chooseNl('sort')">
@@ -54,7 +58,6 @@
 										<span class="iconfont icon-zhankai g_fs_12 g_c_9 fst g_ml_4" v-if="whichOneShow != 'special'"></span>
 									</view>
 								</div>
-								<!-- <div class="g_flex_none g_flex_column_center g_fs_17 g_pr_26 g_pb_4" style="color: #576b95; text-decoration: underline" @click="goPage('/root/home/ignore')">忽略</div> -->
 							</div>
 							<scroll-view class="filterTag bt1" v-if="getFilterData.jobCategoryLabelObjects.length > 0 || getFilterData.jobSpecialLabelObjects.length > 0 || getFilterData.sex != '-1' || (getFilterData.ageRangeStr && getFilterData.ageRangeStr != '16-60')" :scroll-x="true" :scroll-y="false" scroll-top="0" scroll-left="0" scroll-into-view scroll-with-animation="false" enable-flex enable-back-to-top="false">
 								<div class="g_flex_row_between flex_center flex_nw g_w_all">

pages/home/order.vue

@@ -23,4 +23,10 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+	/* #ifdef H5 */
+	.p-root-home-quick{
+		min-height: 100vh;
+	}
+	/* #endif */
+</style>

pages/person/index.vue

@@ -40,6 +40,7 @@
 			<view class="g_fs_18 g_fw_600 g_mb_4 g_ml_12 g_mr_12 u-skeleton-fillet"> 登录/注册 </view>
 			<view class="g_fs_14 g_ml_12 g_mr_12 u-skeleton-fillet"> 劳务上下游收发单工具 </view>
 		</view>
+		<!-- #ifdef MP-WEIXIN -->
 		<view class="g_mt_10" v-if="agencyInfo.supplierAccount == 1">
 			<view class="g_p_16 g_bg_f g_radius_8 g_flex_row_between flex_center g_ml_10 g_mr_10" hover-class="thover" @click="goPage('/root/bind/search?active=1')">
 				<view class="g_flex_row_start flex_center">
@@ -52,6 +53,7 @@
 				<view class="g_c_main g_bg_e7 g_radius_20" hover-class="thover" style="padding: 4px 12px">去邀请</view>
 			</view>
 		</view>
+		<!-- #endif -->
 		<view class="g_mt_10">
 			<!-- v-if="userInfo.admin" -->
 			<view class="g_mt_10 g_position_rela" v-if="userInfo.agencyId">
@@ -72,17 +74,6 @@
 			</view>
 			<view class="g_mt_10" v-if="userInfo.agencyId">
 				<g-panel-card-num :list="billDataList" titleNav="/root/person/applyIndex" :border="true" :speed="1" :marginBottom="16" cusType="num" :height="26" :num="5" cusTitle="报名工单(我报的)" @clickItem="goOrder" />
-				<!-- <g-panel-card-num :list="todayDataList" 
-													titleNav="/root/person/todayData"
-													:border="true" 
-													:speed="1" 
-													:marginBottom="16" 
-													cusType="num" 
-													:height="26" 
-													:num="5" 
-													cusTitle="今日数据 (我报的)" 
-													@clickItem="handleClickNus" 
-				/> -->
 			</view>
 			<view class="g_mt_10 g_position_rela" v-if="userInfo.admin">
 				<view class="g_radius_50 g_text_c" style="position: absolute; right: 16px; top: 5px; color: #fff; background-color: #ff4400; font-size: 12px; min-width: 16px" v-if="applyNum > 0">
@@ -160,9 +151,11 @@
 		</u-popup>
 		<!-- <g-tabbar class="tabbar"></g-tabbar> -->
 		<u-skeleton :loading="loading" :animation="true" bgColor="#fff"></u-skeleton>
+		<!-- #ifdef MP-WEIXIN -->
 		<view class="g_position_abso" style="left: -10000px; opacity: 0" v-if="createPoster">
 			<mainPanel></mainPanel>
 		</view>
+		<!-- #endif -->
 	</view>
 </template>
 

root/detail/job.vue

@@ -1,5 +1,7 @@
 <template>
-	<rh-job-detail :dataoptions='dataoptions'></rh-job-detail>
+	<view class="_abs">
+		<rh-job-detail :dataoptions='dataoptions'></rh-job-detail>
+	</view>
 </template>
 <script>
 	export default{
@@ -13,4 +15,11 @@
 		}
 	}
 </script>
-<style></style>
+<style>
+	/* #ifdef H5 */
+	._abs{
+		max-height: 100vh;
+		overflow-y: auto;
+	}
+	/* #endif */
+</style>

static/css/base.scss

@@ -70,6 +70,14 @@ scroll-view::-webkit-scrollbar {
 			&_r {
 				border-right: 1rpx solid #eee;
 			}
+			&_rcopy {
+				/* #ifdef MP-WEIXIN */
+				border-right: 1rpx solid #eee;
+				/* #endif */
+				/* #ifdef H5 */
+				border-right: none !important;
+				/* #endif */
+			}
 			&_b {
 				border-bottom: 1rpx solid #eee;
 			}