Selaa lähdekoodia

已读,未读 ,筛选功能

zhengkaixin 1 vuosi sitten
vanhempi
commit
df040c5b66

+ 4 - 4
apis/pagejs/tab.js

@@ -17,18 +17,18 @@ export function createUser(data) {
    	})
   }
  
- export function myRegistration(data) {
+ export function myRegistrationNotReadNum(data) {
   	return request({
   		method: 'post',
   		data: data,
-  		url: '/mobile/job/myRegistration'
+  		url: '/mobile/job/myRegistrationNotReadNum'
   	})
  }
  
- export function myReceivedRegistration(data) {
+ export function myReceivedRegistrationNotReadNum(data) {
   	return request({
   		method: 'post',
   		data: data,
-  		url: '/mobile/recruit/myReceivedRegistration'
+  		url: '/mobile/recruit/myReceivedRegistrationNotReadNum'
   	})
  }

+ 1 - 1
config/.env.dev.js

@@ -7,7 +7,7 @@ const UNI_APP = {
 	NODE_ENV :"dev",
 	SIMPLE_RUN:false,// 无视权限控制跳转页面   , 用于样式人员快速访问各种功能 ,快速测试等
 
-	//openId:"o_5WO4hc7MyyVNjSDePRIft6AokI",//个人企业都注册
+	openId:"o_5WO4hc7MyyVNjSDePRIft6AokI",//个人企业都注册
 	
 	openId:"o_5WO4qUozermjNRBqypzMZg56Qw",// 杨所
 	//openId:"006",// 个人  注册 ,企业未

+ 5 - 0
pages/main/index/index.vue

@@ -166,6 +166,11 @@
 
 			tabbar
 		},
+		onShareTimeline(){
+			return {
+				title: "荆州经开区共享用工平台",
+			}
+		},
 		onShareAppMessage(res) {
 			if (res.from === 'button') { // 来自页面内分享按钮
 				//.log(res.target)

+ 38 - 10
pages/packages/choreInformation/jobSearchDetails.vue

@@ -85,6 +85,18 @@
 							</view>
 							
 						</view>
+						<view style="margin-top: 18rpx;    color: #777777;">
+							现居住地:
+							
+							<span class="tel" v-if="ck()">
+							
+								{{info.address}}
+							</span>
+							<span class="tel" style="font-size: 24rpx;" v-else >
+							
+								**** 企业认证后查看
+							</span>
+						</view>
 					</view>
 				</view>
 	    		
@@ -158,19 +170,21 @@
 				isJoin: false,
 				share: 0,
 				personInfo:{},
+				readId:"",
+				isRead:0,
 				workChecked:-1,
 				info: {
 					"id": "",
 					"personId": "",
 					"photo": "",
-					"serviceDesc": "5",
-					"intendedIndustries": "2",
-					"intendedPosition": "1",
-					"hopeSalary": 2,
-					"method": "1",
-					"workExperience": "1",
-					"education": "2",
-					"status": "0",
+					"serviceDesc": "",
+					"intendedIndustries": "",
+					"intendedPosition": "",
+					"hopeSalary": '',
+					"method": "",
+					"workExperience": "",
+					"education": "",
+					"status": "",
 					"createBy": "",
 					"createTime": "",
 					"updateBy": "",
@@ -184,6 +198,11 @@
 				}
 			}
 		},
+		onShareTimeline(){
+			return {
+				title: "荆州经开区共享用工平台",
+			}
+		},
 		onShareAppMessage(res) {
 			if (res.from === 'button') { // 来自页面内分享按钮
 				//.log(res.target)
@@ -207,6 +226,10 @@
 			if (op.shareMP) {
 				this.share = op.shareMP
 			}
+			if(op.isread){
+				this.isRead=op.isread
+				this.readId=op.readid
+			}
 			this.getInfo()
 		},
 		methods: {
@@ -390,9 +413,14 @@
 					title: "加载中",
 					mask: true,
 				})
-				API.jobHuntDetail({
+				var obj={
 					id: this.id,
-				}).then((res) => {
+				}
+				if(this.isRead==1){
+					obj.isRead=1
+					obj.rprId=this.readId
+				}
+				API.jobHuntDetail(obj).then((res) => {
 					this.isJoin = res.data.isInvite;
 					this.info = res.data.jobInformationInfo;
 					this.personInfo = res.data.personInfo;

+ 28 - 2
pages/packages/jobInformation/jobDetails.vue

@@ -136,6 +136,8 @@
 				tabList: ['', '日', '周', '月'],
 				isJoin: false,
 				share: 0,
+				isRead:0,
+				readId:"",
 				info: {
 					"id": "",
 					"enterpriseId": "",
@@ -164,6 +166,11 @@
 				},
 			}
 		},
+		onShareTimeline(){
+			return {
+				title: "荆州经开区共享用工平台",
+			}
+		},
 		onShareAppMessage(res) {
 			if (res.from === 'button') { // 来自页面内分享按钮
 				//.log(res.target)
@@ -187,6 +194,10 @@
 			if (op.shareMP) {
 				this.share = op.shareMP
 			}
+			if(op.isread){
+				this.isRead=op.isread
+					this.readId=op.readid
+			}
 			this.getInfo()
 		},
 		methods: {
@@ -278,6 +289,14 @@
 					});
 					return
 				}
+				if (jobInformationInfo&&jobInformationInfo.status!=1) {
+					uni.showToast({
+						title:"简历审核中,请耐心等待",
+						icon:"none"
+					})
+					return
+				}
+				
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -314,9 +333,16 @@
 					title: "加载中",
 					mask: true,
 				})
-				API.recruitDetail({
+				
+				var obj={
 					recruitId: this.id,
-				}).then((res) => {
+				}
+				if(this.isRead==1){
+					obj.isRead=1
+					obj.jerId=this.readId
+				}
+				
+				API.recruitDetail(obj).then((res) => {
 					this.isJoin = res.data.isJoin;
 					this.info = res.data.recruitInformationInfo;
 

+ 0 - 1087
pages/packages/mallMenu/classify.data.js

@@ -1,1087 +0,0 @@
-export default[
-   {
-      "name": "女装",
-      "foods": [
-          {
-            "name": "A字裙",
-            "key": "A字裙",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
-            "cat": 10
-          },
-          {
-            "name": "T恤",
-            "key": "T恤",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/2.jpg",
-            "cat": 10
-          },
-          {
-            "name": "半身裙",
-            "key": "半身裙",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/3.jpg",
-            "cat": 10
-          },
-          {
-            "name": "衬衫",
-            "key": "衬衫",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/4.jpg",
-            "cat": 10
-          },
-          {
-            "name": "短裙",
-            "key": "短裙",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/5.jpg",
-            "cat": 10
-          },
-          {
-            "name": "阔腿裤",
-            "key": "阔腿裤",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/6.jpg",
-            "cat": 10
-          },
-          {
-            "name": "连衣裙",
-            "key": "连衣裙",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/7.jpg",
-            "cat": 10
-          },
-          {
-            "name": "妈妈装",
-            "key": "妈妈装",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/8.jpg",
-            "cat": 10
-          },
-          {
-            "name": "牛仔裤",
-            "key": "牛仔裤",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/9.jpg",
-            "cat": 10
-          },
-          {
-            "name": "情侣装",
-            "key": "情侣装",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/10.jpg",
-            "cat": 10
-          },
-          {
-            "name": "休闲裤",
-            "key": "休闲裤",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/11.jpg",
-            "cat": 10
-          },
-          {
-            "name": "雪纺衫",
-            "key": "雪纺衫",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/12.jpg",
-            "cat": 10
-          },
-          {
-            "name": "防晒衣",
-            "key": "防晒衣",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/13.jpg",
-            "cat": 10
-          },
-          {
-            "name": "礼服/婚纱",
-            "key": "礼服婚纱",
-            "icon": "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
-            "cat": 10
-          }
-      ]
-   },
-   {
-    "name": "美食",
-    "foods": [
-        {
-          "name": "火锅",
-          "key": "火锅",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
-          "cat": 6
-        },
-        {
-          "name": "糕点饼干",
-          "key": "糕点饼干",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/2.jpg",
-          "cat": 6
-        },
-        {
-          "name": "坚果果干",
-          "key": "坚果果干",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/3.jpg",
-          "cat": 6
-        },
-        {
-          "name": "酒类",
-          "key": "酒类",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/4.jpg",
-          "cat": 6
-        },
-        {
-          "name": "辣条",
-          "key": "辣条",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/5.jpg",
-          "cat": 6
-        },
-        {
-          "name": "大礼包",
-          "key": "大礼包",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/6.jpg",
-          "cat": 6
-        },
-        {
-          "name": "精品茗茶",
-          "key": "茶",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
-          "cat": 6
-        },
-        {
-          "name": "休闲食品",
-          "key": "休闲食品",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
-          "cat": 6
-        },
-        {
-          "name": "糖果巧克力",
-          "key": "糖果巧克力",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/9.jpg",
-          "cat": 6
-        },
-        {
-          "name": "方便速食",
-          "key": "方便速食",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/10.jpg",
-          "cat": 6
-        },
-        {
-          "name": "营养代餐",
-          "key": "营养代餐",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/11.jpg",
-          "cat": 6
-        },
-        {
-          "name": "粮油副食",
-          "key": "粮油",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/12.jpg",
-          "cat": 6
-        },
-        {
-          "name": "生鲜水果",
-          "key": "水果",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/13.jpg",
-          "cat": 6
-        },
-        {
-          "name": "饮品",
-          "key": "饮品",
-          "icon": "https://cdn.uviewui.com/uview/common/classify/2/14.jpg",
-          "cat": 6
-        }
-        ]
-    },
-    {
-        "name": "美妆",
-        "foods": [
-            {
-                "name": "化妆刷",
-                "key": "化妆刷",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
-                "cat": 3
-            },
-            {
-                "name": "粉底",
-                "key": "粉底",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/2.jpg",
-                "cat": 3
-            },
-            {
-                "name": "洗发护发",
-                "key": "洗发护发",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/3.jpg",
-                "cat": 3
-            },
-            {
-                "name": "美容工具",
-                "key": "美容工具",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/4.jpg",
-                "cat": 3
-            },
-            {
-                "name": "眼部护理",
-                "key": "眼部护理",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/5.jpg",
-                "cat": 3
-            },
-            {
-                "name": "眉妆",
-                "key": "眉妆",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/6.jpg",
-                "cat": 3
-            },
-            {
-                "name": "卸妆品",
-                "key": "卸妆品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/7.jpg",
-                "cat": 3
-            },
-            {
-                "name": "基础护肤",
-                "key": "基础护肤",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/8.jpg",
-                "cat": 3
-            },
-            {
-                "name": "眼妆",
-                "key": "眼妆",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/9.jpg",
-                "cat": 3
-            },
-            {
-                "name": "唇妆",
-                "key": "唇妆",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/10.jpg",
-                "cat": 3
-            },
-            {
-                "name": "面膜",
-                "key": "面膜",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/11.jpg",
-                "cat": 3
-            },
-            {
-                "name": "沐浴用品",
-                "key": "沐浴用品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/12.jpg",
-                "cat": 3
-            },
-            {
-                "name": "护肤套装",
-                "key": "护肤套装",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/13.jpg",
-                "cat": 3
-            },
-            {
-                "name": "防晒品",
-                "key": "防晒品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
-                "cat": 3
-            },
-            {
-                "name": "美甲",
-                "key": "美甲",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
-                "cat": 3
-            }
-
-        ]
-    },
-    {
-        "name": "居家日用",
-        "foods": [
-            {
-              "name": "垃圾袋",
-              "key": "垃圾袋",
-              "icon": "https://cdn.uviewui.com/uview/common/classify/4/1.jpg",
-              "cat": 4
-            },
-            {
-                "name": "纸巾",
-                "key": "纸巾",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/2.jpg",
-                "cat": 4
-            },
-            {
-                "name": "驱蚊用品",
-                "key": "驱蚊用品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/3.jpg",
-                "cat": 4
-            },
-            {
-                "name": "收纳神器",
-                "key": "收纳神器",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/4.jpg",
-                "cat": 4
-            },
-            {
-                "name": "厨房用品",
-                "key": "厨房用品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/5.jpg",
-                "cat": 4
-            },
-            {
-                "name": "厨房烹饪",
-                "key": "烹饪",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/6.jpg",
-                "cat": 4
-            },
-            {
-                "name": "衣物晾晒",
-                "key": "衣物晾晒",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/7.jpg",
-                "cat": 4
-            },
-            {
-                "name": "衣物护理",
-                "key": "衣物护理",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/8.jpg",
-                "cat": 4
-            },
-            {
-                "name": "宠物用品",
-                "key": "宠物用品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/9.jpg",
-                "cat": 4
-            },
-            {
-                "name": "医药保健",
-                "key": "医药",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/10.jpg",
-                "cat": 4
-            },
-            {
-                "name": "日用百货",
-                "key": "百货",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/11.jpg",
-                "cat": 4
-            },
-            {
-                "name": "清洁用品",
-                "key": "清洁",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/12.jpg",
-                "cat": 4
-            },
-            {
-                "name": "绿植园艺",
-                "key": "绿植",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/4/13.jpg",
-                "cat": 4
-            }
-        ]
-    },
-    {
-        "name": "男装",
-        "foods": [
-            {
-                "name": "爸爸装",
-                "key": "爸爸装",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/1.jpg",
-                "cat": 12
-            },
-            {
-                "name": "牛仔裤",
-                "key": "牛仔裤",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/2.jpg",
-                "cat": 12
-            },
-            {
-                "name": "衬衫",
-                "key": "衬衫",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/3.jpg",
-                "cat": 12
-            },
-            {
-                "name": "休闲裤",
-                "key": "休闲裤",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/4.jpg",
-                "cat": 12
-            },
-            {
-                "name": "外套",
-                "key": "外套",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/5.jpg",
-                "cat": 12
-            },
-            {
-                "name": "T恤",
-                "key": "T恤",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/6.jpg",
-                "cat": 12
-            },
-            {
-                "name": "套装",
-                "key": "套装",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/7.jpg",
-                "cat": 12
-            },
-            {
-                "name": "运动裤",
-                "key": "运动裤",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/8.jpg",
-                "cat": 12
-            },
-            {
-                "name": "马甲/背心",
-                "key": "马甲背心",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/9.jpg",
-                "cat": 12
-            },
-            {
-                "name": "POLO衫",
-                "key": "POLO衫",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/10.jpg",
-                "cat": 12
-            },
-            {
-                "name": "商务装",
-                "key": "商务装",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/5/11.jpg",
-                "cat": 12
-            }
-        ]
-    },
-    {
-        "name": "鞋品",
-        "foods": [
-            {
-                "name": "单鞋",
-                "key": "单鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/1.jpg",
-                "cat": 5
-            },
-            {
-                "name": "皮鞋",
-                "key": "皮鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/2.jpg",
-                "cat": 5
-            },
-            {
-                "name": "帆布鞋",
-                "key": "帆布鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/3.jpg",
-                "cat": 5
-            },
-            {
-                "name": "北京老布鞋",
-                "key": "北京老布鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/4.jpg",
-                "cat": 5
-            },
-            {
-                "name": "运动鞋",
-                "key": "运动鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/5.jpg",
-                "cat": 5
-            },
-            {
-                "name": "拖鞋",
-                "key": "拖鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/6.jpg",
-                "cat": 5
-            },
-            {
-                "name": "凉鞋",
-                "key": "凉鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/7.jpg",
-                "cat": 5
-            },
-            {
-                "name": "休闲鞋",
-                "key": "休闲鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/8.jpg",
-                "cat": 5
-            },
-            {
-                "name": "高跟鞋",
-                "key": "高跟鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/9.jpg",
-                "cat": 5
-            },
-            {
-                "name": "老人鞋",
-                "key": "老人鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/10.jpg",
-                "cat": 5
-            },
-            {
-                "name": "懒人鞋",
-                "key": "懒人鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/6/11.jpg",
-                "cat": 5
-            }
-        ]
-    },
-    {
-        "name": "数码家电",
-        "foods": [
-            {
-                "name": "数据线",
-                "key": "数据线",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/1.jpg",
-                "cat": 8
-            },
-            {
-                "name": "耳机",
-                "key": "耳机",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/2.jpg",
-                "cat": 8
-            },
-            {
-                "name": "生活家电",
-                "key": "家电",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/3.jpg",
-                "cat": 8
-            },
-            {
-                "name": "电风扇",
-                "key": "电风扇",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/4.jpg",
-                "cat": 8
-            },
-            {
-                "name": "电吹风",
-                "key": "电吹风",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/5.jpg",
-                "cat": 8
-            },
-            {
-                "name": "手机壳",
-                "key": "手机壳",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/6.jpg",
-                "cat": 8
-            },
-            {
-                "name": "榨汁机",
-                "key": "榨汁机",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/7.jpg",
-                "cat": 8
-            },
-            {
-                "name": "小家电",
-                "key": "小家电",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/8.jpg",
-                "cat": 8
-            },
-            {
-                "name": "数码电子",
-                "key": "数码",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/9.jpg",
-                "cat": 8
-            },
-            {
-                "name": "电饭锅",
-                "key": "电饭锅",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/10.jpg",
-                "cat": 8
-            },
-            {
-                "name": "手机支架",
-                "key": "手机支架",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/11.jpg",
-                "cat": 8
-            },
-            {
-                "name": "剃须刀",
-                "key": "剃须刀",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/12.jpg",
-                "cat": 8
-            },
-            {
-                "name": "充电宝",
-                "key": "充电宝",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/13.jpg",
-                "cat": 8
-            },
-            {
-                "name": "手机配件",
-                "key": "手机配件",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/7/14.jpg",
-                "cat": 8
-            }
-        ]
-    },
-    {
-        "name": "母婴",
-        "foods": [
-            {
-              "name": "婴童服饰",
-              "key": "衣服",
-              "icon": "https://cdn.uviewui.com/uview/common/classify/8/1.jpg",
-              "cat": 2  
-            },
-            {
-                "name": "玩具乐器",
-                "key": "玩具乐器",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/2.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "尿不湿",
-                "key": "尿不湿",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/3.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "安抚牙胶",
-                "key": "安抚牙胶",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/4.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "奶瓶奶嘴",
-                "key": "奶瓶奶嘴",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/5.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "孕妈用品",
-                "key": "孕妈用品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/6.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "宝宝用品",
-                "key": "宝宝用品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/7.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "婴童湿巾",
-                "key": "湿巾",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/8.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "喂养洗护",
-                "key": "洗护",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/9.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "婴童鞋靴",
-                "key": "童鞋",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/10.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "口水巾",
-                "key": "口水巾",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/11.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "营养辅食",
-                "key": "营养",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/12.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "婴幼书籍",
-                "key": "书籍",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/13.jpg",
-                "cat": 2  
-            },
-            {
-                "name": "婴儿车",
-                "key": "婴儿车",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/8/14.jpg",
-                "cat": 2  
-            }
-        ]
-    },
-    {
-        "name": "箱包",
-        "foods": [
-            {
-                "name": "单肩包",
-                "key": "单肩包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/1.jpg",
-                "cat": 0
-            },
-            {
-                "name": "斜挎包",
-                "key": "斜挎包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/2.jpg",
-                "cat": 0
-            },
-            {
-                "name": "女包",
-                "key": "女包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/3.jpg",
-                "cat": 0
-            },
-            {
-                "name": "男包",
-                "key": "男包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/4.jpg",
-                "cat": 0
-            },
-            {
-                "name": "双肩包",
-                "key": "双肩包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/5.jpg",
-                "cat": 0
-            },
-            {
-                "name": "小方包",
-                "key": "小方包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/6.jpg",
-                "cat": 0
-            },
-            {
-                "name": "钱包",
-                "key": "钱包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/7.jpg",
-                "cat": 0
-            },
-            {
-                "name": "旅行箱包",
-                "key": "旅行箱包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/8.jpg",
-                "cat": 0
-            },
-            {
-                "name": "零钱包",
-                "key": "零钱包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/9.jpg",
-                "cat": 0
-            },
-            {
-                "name": "手提包",
-                "key": "手提包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/10.jpg",
-                "cat": 0
-            },
-            {
-                "name": "胸包",
-                "key": "胸包",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/9/11.jpg",
-                "cat": 0
-            }
-        ]
-    },
-    {
-        "name": "内衣",
-        "foods": [
-            {
-                "name": "袜子",
-                "key": "袜子",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/1.jpg",
-                "cat": 11
-            },
-            {
-                "name": "吊带背心",
-                "key": "吊带背心",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/2.jpg",
-                "cat": 11
-            },
-            {
-                "name": "抹胸",
-                "key": "抹胸",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/3.jpg",
-                "cat": 11
-            },
-            {
-                "name": "内裤",
-                "key": "内裤",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/4.jpg",
-                "cat": 11
-            },
-            {
-                "name": "文胸",
-                "key": "文胸",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/5.jpg",
-                "cat": 11
-            },
-            {
-                "name": "文胸套装",
-                "key": "文胸套装",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/6.jpg",
-                "cat": 11
-            },
-            {
-                "name": "打底塑身",
-                "key": "打底塑身",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/7.jpg",
-                "cat": 11
-            },
-            {
-                "name": "家居服",
-                "key": "家居服",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/8.jpg",
-                "cat": 11
-            },
-            {
-                "name": "船袜",
-                "key": "船袜",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/9.jpg",
-                "cat": 11
-            },
-            {
-                "name": "情侣睡衣",
-                "key": "情侣睡衣",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/10.jpg",
-                "cat": 11
-            },
-            {
-                "name": "丝袜",
-                "key": "丝袜",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/10/11.jpg",
-                "cat": 11
-            }
-        ]
-    },
-    {
-        "name": "文娱车品",
-        "foods": [
-            {
-                "name": "车市车品",
-                "key": "车市车品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/11/1.jpg",
-                "cat": 7
-            },
-            {
-                "name": "办公文具",
-                "key": "办公文具",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/11/2.jpg",
-                "cat": 7
-            },
-            {
-                "name": "考试必备",
-                "key": "考试必备",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/11/3.jpg",
-                "cat": 7
-            },
-            {
-                "name": "笔记本",
-                "key": "笔记本",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/11/4.jpg",
-                "cat": 7
-            },
-            {
-                "name": "艺术礼品",
-                "key": "礼品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/11/5.jpg",
-                "cat": 7
-            },
-            {
-                "name": "书写工具",
-                "key": "书写工具",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/11/6.jpg",
-                "cat": 7
-            },
-            {
-                "name": "车载电器",
-                "key": "车载电器",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/11/7.jpg",
-                "cat": 7
-            },
-            {
-                "name": "图书音像",
-                "key": "图书音像",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/11/8.jpg",
-                "cat": 7
-            },
-            {
-                "name": "画具画材",
-                "key": "画具画材",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/11/9.jpg",
-                "cat": 7
-            }
-        ]
-    },
-    {
-        "name": "配饰",
-        "foods": [
-            {
-                "name": "太阳镜",
-                "key": "太阳镜",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/1.jpg",
-                "cat": 0
-            },
-            {
-                "name": "皮带",
-                "key": "皮带",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/2.jpg",
-                "cat": 0
-            },
-            {
-                "name": "棒球帽",
-                "key": "棒球帽",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/3.jpg",
-                "cat": 0
-            },
-            {
-                "name": "手表",
-                "key": "手表",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/4.jpg",
-                "cat": 0
-            },
-            {
-                "name": "发饰",
-                "key": "发饰",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/5.jpg",
-                "cat": 0
-            },
-            {
-                "name": "项链",
-                "key": "项链",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/6.jpg",
-                "cat": 0
-            },
-            {
-                "name": "手饰",
-                "key": "手饰",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/7.jpg",
-                "cat": 0
-            },
-            {
-                "name": "耳环",
-                "key": "耳环",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/8.jpg",
-                "cat": 0
-            },
-            {
-                "name": "帽子丝巾",
-                "key": "帽子丝巾",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/9.jpg",
-                "cat": 0
-            },
-            {
-                "name": "眼镜墨镜",
-                "key": "眼镜墨镜",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/10.jpg",
-                "cat": 0
-            },
-            {
-                "name": "发带发箍",
-                "key": "发带发箍",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/12/11.jpg",
-                "cat": 0
-            }
-        ]
-    },
-    {
-        "name": "家装家纺",
-        "foods": [
-            {
-                "name": "家居饰品",
-                "key": "家居饰品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/1.jpg",
-                "cat": 0
-            },
-            {
-                "name": "凉席",
-                "key": "凉席",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/2.jpg",
-                "cat": 0
-            },
-            {
-                "name": "背枕靠枕",
-                "key": "靠枕",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/3.jpg",
-                "cat": 0
-            },
-            {
-                "name": "床上用品",
-                "key": "床上用品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/4.jpg",
-                "cat": 0
-            },
-            {
-                "name": "摆件",
-                "key": "摆件",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/5.jpg",
-                "cat": 0
-            },
-            {
-                "name": "四件套",
-                "key": "四件套",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/6.jpg",
-                "cat": 0
-            },
-            {
-                "name": "装饰品",
-                "key": "装饰品",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/7.jpg",
-                "cat": 0
-            },
-            {
-                "name": "卫浴用品",
-                "key": "卫浴",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/8.jpg",
-                "cat": 0
-            },
-            {
-                "name": "家居家装",
-                "key": "家具",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/9.jpg",
-                "cat": 0
-            },
-            {
-                "name": "蚊帐",
-                "key": "蚊帐",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/10.jpg",
-                "cat": 0
-            },
-            {
-                "name": "墙纸贴纸",
-                "key": "墙纸",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/11.jpg",
-                "cat": 0
-            },
-            {
-                "name": "空调被",
-                "key": "空调被",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/13/12.jpg",
-                "cat": 0
-            }
-        ]
-    },
-    {
-        "name": "户外运动",
-        "foods": [
-            {
-                "name": "游泳装备",
-                "key": "游泳",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/14/1.jpg",
-                "cat": 0
-            },
-            {
-                "name": "泳镜",
-                "key": "泳镜",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/14/2.jpg",
-                "cat": 0
-            },
-            {
-                "name": "户外装备",
-                "key": "户外",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/14/3.jpg",
-                "cat": 0
-            },
-            {
-                "name": "健身服饰",
-                "key": "健身",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/14/4.jpg",
-                "cat": 0
-            },
-            {
-                "name": "泳衣",
-                "key": "泳衣",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/14/5.jpg",
-                "cat": 0
-            },
-            {
-                "name": "瑜伽垫",
-                "key": "瑜伽垫",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/14/6.jpg",
-                "cat": 0
-            },
-            {
-                "name": "瑜伽用品",
-                "key": "瑜伽",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/14/7.jpg",
-                "cat": 0
-            },
-            {
-                "name": "健身装备",
-                "key": "健身",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/14/8.jpg",
-                "cat": 0
-            },
-            {
-                "name": "球迷用品",
-                "key": "球迷",
-                "icon": "https://cdn.uviewui.com/uview/common/classify/14/9.jpg",
-                "cat": 0
-            }
-        ]
-    }
-]

+ 0 - 206
pages/packages/mallMenu/index1.vue

@@ -1,206 +0,0 @@
-<template>
-	<view class="u-wrap">
-		<view class="u-search-box">
-			<view class="u-search-inner">
-				<u-icon name="search" color="#909399" :size="28"></u-icon>
-				<text class="u-search-text">搜索uView</text>
-			</view>
-		</view>
-		<view class="u-menu-wrap">
-			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop">
-				<view v-for="(item,index) in tabbar" :key="index" class="u-tab-item" :class="[current==index ? 'u-tab-item-active' : '']"
-				 :data-current="index" @tap.stop="swichMenu(index)">
-					<text class="u-line-1">{{item.name}}</text>
-				</view>
-			</scroll-view>
-			<block v-for="(item,index) in tabbar" :key="index">
-				<scroll-view scroll-y class="right-box" v-if="current==index">
-					<view class="page-view">
-						<view class="class-item">
-							<view class="item-title">
-								<text>{{item.name}}</text>
-							</view>
-							<view class="item-container">
-								<view class="thumb-box" v-for="(item1, index1) in item.foods" :key="index1">
-									<image class="item-menu-image" :src="item1.icon" mode=""></image>
-									<view class="item-menu-name">{{item1.name}}</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</block>
-		</view>
-	</view>
-</template>
-
-<script>
-	import classifyData from "./classify.data.js";
-	export default {
-		data() {
-			return {
-				tabbar: classifyData,
-				scrollTop: 0, //tab标题的滚动条位置
-				current: 0, // 预设当前项的值
-				menuHeight: 0, // 左边菜单的高度
-				menuItemHeight: 0, // 左边菜单item的高度
-			}
-		},
-		computed: {
-			
-		},
-		methods: {
-			getImg() {
-				return Math.floor(Math.random() * 35);
-			},
-			// 点击左边的栏目切换
-			async swichMenu(index) {
-				if(index == this.current) return ;
-				this.current = index;
-				// 如果为0,意味着尚未初始化
-				if(this.menuHeight == 0 || this.menuItemHeight == 0) {
-					await this.getElRect('menu-scroll-view', 'menuHeight');
-					await this.getElRect('u-tab-item', 'menuItemHeight');
-				}
-				// 将菜单菜单活动item垂直居中
-				this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
-			},
-			// 获取一个目标元素的高度
-			getElRect(elClass, dataVal) {
-				new Promise((resolve, reject) => {
-					const query = uni.createSelectorQuery().in(this);
-					query.select('.' + elClass).fields({size: true},res => {
-						// 如果节点尚未生成,res值为null,循环调用执行
-						if(!res) {
-							setTimeout(() => {
-								this.getElRect(elClass);
-							}, 10);
-							return ;
-						}
-						this[dataVal] = res.height;
-					}).exec();
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.u-wrap {
-		height: calc(100vh);
-		/* #ifdef H5 */
-		height: calc(100vh - var(--window-top));
-		/* #endif */
-		display: flex;
-		flex-direction: column;
-	}
-
-	.u-search-box {
-		padding: 18rpx 30rpx;
-	}
-
-	.u-menu-wrap {
-		flex: 1;
-		display: flex;
-		overflow: hidden;
-	}
-
-	.u-search-inner {
-		background-color: rgb(234, 234, 234);
-		border-radius: 100rpx;
-		display: flex;
-		align-items: center;
-		padding: 10rpx 16rpx;
-	}
-
-	.u-search-text {
-		font-size: 26rpx;
-		color: $u-tips-color;
-		margin-left: 10rpx;
-	}
-
-	.u-tab-view {
-		width: 200rpx;
-		height: 100%;
-	}
-
-	.u-tab-item {
-		height: 110rpx;
-		background: #f6f6f6;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 26rpx;
-		color: #444;
-		font-weight: 400;
-		line-height: 1;
-	}
-	
-	.u-tab-item-active {
-		position: relative;
-		color: #000;
-		font-size: 30rpx;
-		font-weight: 600;
-		background: #fff;
-	}
-	
-	.u-tab-item-active::before {
-		content: "";
-		position: absolute;
-		border-left: 4px solid $u-type-primary;
-		height: 32rpx;
-		left: 0;
-		top: 39rpx;
-	}
-
-	.u-tab-view {
-		height: 100%;
-	}
-	
-	.right-box {
-		background-color: rgb(250, 250, 250);
-	}
-	
-	.page-view {
-		padding: 16rpx;
-	}
-	
-	.class-item {
-		margin-bottom: 30rpx;
-		background-color: #fff;
-		padding: 16rpx;
-		border-radius: 8rpx;
-	}
-	
-	.item-title {
-		font-size: 26rpx;
-		color: $u-main-color;
-		font-weight: bold;
-	}
-	
-	.item-menu-name {
-		font-weight: normal;
-		font-size: 24rpx;
-		color: $u-main-color;
-	}
-	
-	.item-container {
-		display: flex;
-		flex-wrap: wrap;
-	}
-	
-	.thumb-box {
-		width: 33.333333%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		margin-top: 20rpx;
-	}
-	
-	.item-menu-image {
-		width: 120rpx;
-		height: 120rpx;
-	}
-</style>

+ 0 - 293
pages/packages/mallMenu/index2.vue

@@ -1,293 +0,0 @@
-<template>
-	<view class="u-wrap">
-		<view class="u-search-box">
-			<view class="u-search-inner">
-				<u-icon name="search" color="#909399" :size="28"></u-icon>
-				<text class="u-search-text">搜索</text>
-			</view>
-		</view>
-		<view class="u-menu-wrap">
-			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop"
-			 :scroll-into-view="itemId">
-				<view v-for="(item,index) in tabbar" :key="index" class="u-tab-item" :class="[current == index ? 'u-tab-item-active' : '']"
-				 @tap.stop="swichMenu(index)">
-					<text class="u-line-1">{{item.name}}</text>
-				</view>
-			</scroll-view>
-			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll">
-				<view class="page-view">
-					<view class="class-item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
-						<view class="item-title">
-							<text>{{item.name}}</text>
-						</view>
-						<view class="item-container">
-							<view class="thumb-box" v-for="(item1, index1) in item.foods" :key="index1">
-								<image class="item-menu-image" :src="item1.icon" mode=""></image>
-								<view class="item-menu-name">{{item1.name}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-	</view>
-</template>
-<script>
-	
-	import classifyData from "./classify.data.js";
-	
-	export default {
-		data() {
-			return {
-				scrollTop: 0, //tab标题的滚动条位置
-				oldScrollTop: 0,
-				current: 0, // 预设当前项的值
-				menuHeight: 0, // 左边菜单的高度
-				menuItemHeight: 0, // 左边菜单item的高度
-				itemId: '', // 栏目右边scroll-view用于滚动的id
-				tabbar: classifyData,
-				menuItemPos: [],
-				arr: [],
-				scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
-				timer: null, // 定时器
-				
-			}
-		},
-		onLoad() {
-			
-		},
-		onReady() {
-			this.getMenuItemTop()
-		},
-		methods: {
-			// 点击左边的栏目切换
-			async swichMenu(index) {
-				if(this.arr.length == 0) {
-					await this.getMenuItemTop();
-				}
-				if (index == this.current) return;
-				this.scrollRightTop = this.oldScrollTop;
-				this.$nextTick(function(){
-					this.scrollRightTop = this.arr[index];
-					this.current = index;
-					this.leftMenuStatus(index);
-				})
-			},
-			// 获取一个目标元素的高度
-			getElRect(elClass, dataVal) {
-				new Promise((resolve, reject) => {
-					const query = uni.createSelectorQuery().in(this);
-					query.select('.' + elClass).fields({
-						size: true
-					}, res => {
-						// 如果节点尚未生成,res值为null,循环调用执行
-						if (!res) {
-							setTimeout(() => {
-								this.getElRect(elClass);
-							}, 10);
-							return;
-						}
-						this[dataVal] = res.height;
-						resolve();
-					}).exec();
-				})
-			},
-			// 观测元素相交状态
-			async observer() {
-				this.tabbar.map((val, index) => {
-					let observer = uni.createIntersectionObserver(this);
-					// 检测右边scroll-view的id为itemxx的元素与right-box的相交状态
-					// 如果跟.right-box底部相交,就动态设置左边栏目的活动状态
-					observer.relativeTo('.right-box', {
-						top: 0
-					}).observe('#item' + index, res => {
-						if (res.intersectionRatio > 0) {
-							let id = res.id.substring(4);
-							this.leftMenuStatus(id);
-						}
-					})
-				})
-			},
-			// 设置左边菜单的滚动状态
-			async leftMenuStatus(index) {
-				this.current = index;
-				// 如果为0,意味着尚未初始化
-				if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-					await this.getElRect('menu-scroll-view', 'menuHeight');
-					await this.getElRect('u-tab-item', 'menuItemHeight');
-				}
-				// 将菜单活动item垂直居中
-				this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
-			},
-			// 获取右边菜单每个item到顶部的距离
-			getMenuItemTop() {
-				new Promise(resolve => {
-					let selectorQuery = uni.createSelectorQuery();
-					selectorQuery.selectAll('.class-item').boundingClientRect((rects) => {
-						// 如果节点尚未生成,rects值为[](因为用selectAll,所以返回的是数组),循环调用执行
-						if(!rects.length) {
-							setTimeout(() => {
-								this.getMenuItemTop();
-							}, 10);
-							return ;
-						}
-						rects.forEach((rect) => {
-							// 这里减去rects[0].top,是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
-							this.arr.push(rect.top - rects[0].top);
-							resolve();
-						})
-					}).exec()
-				})
-			},
-			// 右边菜单滚动
-			async rightScroll(e) {
-				this.oldScrollTop = e.detail.scrollTop;
-				if(this.arr.length == 0) {
-					await this.getMenuItemTop();
-				}
-				if(this.timer) return ;
-				if(!this.menuHeight) {
-					await this.getElRect('menu-scroll-view', 'menuHeight');
-				}
-				setTimeout(() => { // 节流
-					this.timer = null;
-					// scrollHeight为右边菜单垂直中点位置
-					let scrollHeight = e.detail.scrollTop + this.menuHeight / 2;
-					for (let i = 0; i < this.arr.length; i++) {
-						let height1 = this.arr[i];
-						let height2 = this.arr[i + 1];
-						// 如果不存在height2,意味着数据循环已经到了最后一个,设置左边菜单为最后一项即可
-						if (!height2 || scrollHeight >= height1 && scrollHeight < height2) {
-							this.leftMenuStatus(i);
-							return ;
-						}
-					}
-				}, 10)
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.u-wrap {
-		height: calc(100vh);
-		/* #ifdef H5 */
-		height: calc(100vh - var(--window-top));
-		/* #endif */
-		display: flex;
-		flex-direction: column;
-	}
-
-	.u-search-box {
-		padding: 18rpx 30rpx;
-	}
-
-	.u-menu-wrap {
-		flex: 1;
-		display: flex;
-		overflow: hidden;
-	}
-
-	.u-search-inner {
-		background-color: rgb(234, 234, 234);
-		border-radius: 100rpx;
-		display: flex;
-		align-items: center;
-		padding: 10rpx 16rpx;
-	}
-
-	.u-search-text {
-		font-size: 26rpx;
-		color: $u-tips-color;
-		margin-left: 10rpx;
-	}
-
-	.u-tab-view {
-		width: 200rpx;
-		height: 100%;
-	}
-
-	.u-tab-item {
-		height: 110rpx;
-		background: #f6f6f6;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 26rpx;
-		color: #444;
-		font-weight: 400;
-		line-height: 1;
-	}
-
-	.u-tab-item-active {
-		position: relative;
-		color: #000;
-		font-size: 30rpx;
-		font-weight: 600;
-		background: #fff;
-	}
-
-	.u-tab-item-active::before {
-		content: "";
-		position: absolute;
-		border-left: 4px solid $u-type-primary;
-		height: 32rpx;
-		left: 0;
-		top: 39rpx;
-	}
-
-	.u-tab-view {
-		height: 100%;
-	}
-
-	.right-box {
-		background-color: rgb(250, 250, 250);
-	}
-
-	.page-view {
-		padding: 16rpx;
-	}
-
-	.class-item {
-		margin-bottom: 30rpx;
-		background-color: #fff;
-		padding: 16rpx;
-		border-radius: 8rpx;
-	}
-
-	.class-item:last-child {
-		min-height: 100vh;
-	}
-
-	.item-title {
-		font-size: 26rpx;
-		color: $u-main-color;
-		font-weight: bold;
-	}
-
-	.item-menu-name {
-		font-weight: normal;
-		font-size: 24rpx;
-		color: $u-main-color;
-	}
-
-	.item-container {
-		display: flex;
-		flex-wrap: wrap;
-	}
-
-	.thumb-box {
-		width: 33.333333%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		margin-top: 20rpx;
-	}
-
-	.item-menu-image {
-		width: 120rpx;
-		height: 120rpx;
-	}
-</style>

+ 36 - 1
pages/packages/mine/employmentService/receiveRegistration.vue

@@ -10,6 +10,8 @@
 		<view class="receive-registration" v-for="(item,i) in list[current].list" 
 		  v-if="item.jobInformationInfo"
 		  :key="i">
+		  
+		  
 			<view class="card">
 				<view class="top">
 					
@@ -17,6 +19,7 @@
 				<view class="photo">
 					<u-avatar :src="item.jobInformationInfo.photo"></u-avatar>
 					<span>{{item.workPersonInfo?item.workPersonInfo.realName:''}}</span>
+				
 				</view>
 				<!-- 信息 -->
 				<view class="infos">
@@ -63,6 +66,7 @@
 					<view class=" view">
 						{{item.recruitInformationInfo.positionName}}-<span class="salary">{{item.recruitInformationInfo.salary}}{{getUnit(item.recruitInformationInfo)}}</span>
 					</view>
+					<span class="tag" v-if="current==0&&!item.isRead">未读</span>
 					<view class="btn check" @click="ckInfo(item,1)">
 						岗位查看
 					</view>
@@ -114,6 +118,12 @@
 				var url=""
 				if(current==0){
 					url="/pages/packages/choreInformation/jobSearchDetails?id="+item.jobInformationInfo.id
+				
+					var isread=""
+					if(!item.isRead){
+						item.isRead=true
+						url+="&isread=1&readid="+item.id
+					}
 				}
 				if(current==1){
 					url="/pages/packages/jobInformation/jobDetails?id="+item.recruitInformationInfo.id
@@ -296,6 +306,31 @@
 			}
 		}
 	}
-
+	.tag {
+	
+		 top: -260rpx;
+		left: -400rpx;
+		position: relative;
+		border-radius: 4px 4px 4px 0px;
+		color: #fff;
+		padding: 2px 6px;
+		font-size: 20rpx;
+		line-height: 20rpx;
+		height: 30rpx;
+		background: linear-gradient(to right bottom, rgba(255, 255, 255, 0.4), transparent) var(--bg, #EA3447);
+		background-blend-mode: soft-light;
+	}
+	
+	.tag::before {
+		content: '';
+		position: absolute;
+		width: 3px;
+		height: 3px;
+		left: 0;
+		bottom: -3px;
+		background-color: inherit;
+		filter: brightness(.7);
+		clip-path: polygon(0 0, 100% 0, 100% 100%);
+	}
    
 </style>

+ 1 - 1
pages/packages/mine/myJobInformation/myJobInformation.vue

@@ -378,7 +378,7 @@
 					
 					uni.showModal({
 						title: '提示',
-						content: '操作成功,等待审批',
+						content: '简历审批中,请耐心等待',
 						showCancel:false,
 						success: function (res) {
 							if (res.confirm) {

+ 259 - 212
pages/packages/mine/myJobInformation/myRegistration.vue

@@ -1,212 +1,259 @@
-<template>
-	<view>
-		<u-navbar back-text="我的报名" back-icon-size="28" back-icon-color="#ffffff"
-			:background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
-		<!-- 标签 -->
-		<view class="tabs">
-			<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
-		</view>
-		<!-- 我的报名 -->
-		<view class="my-registration"  v-for="(item,i) in list[current].list"   :key="i" >
-			<view class="card">
-				<view class="positon-salary">
-					<view class="positon">
-						{{item.recruitInformationInfo.positionName}}
-					</view>
-					<view class="salary">
-						{{item.recruitInformationInfo.salary}}{{getUnit(item.recruitInformationInfo)}}
-					</view>
-				</view>
-				<view class="tags-date">
-					<view class="company" >
-						{{item.recruitInformationInfo.enterpriseName}}
-						
-					</view>
-					<view class="tags" v-if="current==0&&false">
-						<view class="item">
-							企业
-						</view>
-						<view class="item">
-							周结
-						</view>
-					</view>
-					<view class="date">
-						{{current==0?'报名时间':'邀请时间'}}:{{item.createTime.substring(0,10)}}
-					</view>
-				</view>
-				<u-line color="#E6E6E6"></u-line>
-				<view class="check"  @click="ckInfo(item.recruitInformationInfo)">
-					查看
-				</view>
-			</view>
-		</view>
-		
-		<u-divider  v-if="list[current].recordsTotal==list[current].list.length"
-				 :isnone="list[current].recordsTotal==0" nonetext="没有找到相关内容" 
-				border-color="#CFD2D5">已经到底了</u-divider>
-		
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/packages.js'
-	
-	export default {
-		data() {
-			return {
-				list: [{
-					name: '我的报名',
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-					type: "0",
-					list: []
-				}, {
-					name: '收到的邀请',
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-					type: "1",
-					list: []
-				}],
-				current: 0
-			}
-		},
-		onLoad(op) {
-			if(op.c){
-				this.current=op.c
-			}
-			this.getList();
-		},
-		methods: {
-			ckInfo(item){
-				var url="/pages/packages/jobInformation/jobDetails?id="
-				uni.navigateTo({
-					url:url+item.id
-				})
-			},
-			getList() {
-			
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				var list = this.list[this.current].list
-				var obj = this.list[this.current]
-				var listForm = {
-					...obj
-				}
-				delete listForm.list
-			
-				API.myRegistration(listForm).then((res) => {
-			
-					if (listForm.pageIndex == 1) {
-						list = res.data.data;
-					} else {
-						list = [
-							...list,
-							...res.data.data
-						];
-					}
-			
-					this.list[this.current].list = list
-			
-					this.list[this.current].recordsTotal = res.data.recordsTotal;
-					uni.hideLoading();
-				}).catch(error => {
-					uni.showToast({icon: 'none',
-						title: error,
-						icon: "none"
-					})
-				})
-			
-			},
-			myLoadmore() {
-				this.list[this.current].pageIndex += 1;
-				this.getList();
-			},
-			change(index) {
-				this.current = index;
-				var list = this.list[this.current].list
-				if (list.length == 0) {
-					this.getList();
-				}
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background: #F0F0F2;
-		padding-bottom: 150px;
-	}
-</style>
-<style scoped lang="scss">
-	.card{
-		margin: 24rpx 32rpx;
-		background-color: #fff;
-		padding: 24rpx;
-		border-radius: 12px;
-		.positon-salary{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			.positon{
-				color: rgba(16, 16, 16, 1);
-				font-size: 36rpx;
-				
-				font-family: 'PingFangSC-medium';
-			}
-			.salary{
-				color: rgba(255, 61, 0, 1);
-				font-size: 32rpx;
-				font-family: 'PingFangSC-medium';
-			}
-		}
-		.tags-date{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-top: 16rpx;
-			margin-bottom: 24rpx;
-			.tags{
-				display: flex;
-				.item{
-					border-radius: 4px;
-					background-color: rgba(241, 241, 247, 1);
-					color: rgba(129, 127, 153, 1);
-					font-size: 12px;
-					text-align: center;
-					line-height: 36rpx;
-					height: 36rpx;
-					padding: 0 12rpx;
-					margin-right: 8rpx;
-				}
-			}
-			.company{
-				color: rgba(51, 51, 51, 1);
-				font-size: 24rpx;
-			}
-			.date{
-				color: rgba(153, 153, 153, 1);
-				font-size: 24rpx;
-			}
-		}
-		// 查看
-		.check{
-			width: 120rpx;
-			height: 56rpx;
-			line-height: 56rpx;
-			margin-left: auto;
-			margin-top: 24rpx;
-			border-radius: 50px;
-			background-color: rgba(255, 255, 255, 1);
-			color: rgba(119, 119, 119, 1);
-			text-align: center;
-			font-family: Microsoft Yahei;
-			border: 1px solid rgba(207, 210, 213, 1);
-		}
-	}
-
-   
-</style>
+<template>
+	<view>
+		<u-navbar back-text="我的报名" back-icon-size="28" back-icon-color="#ffffff"
+			:background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
+		<!-- 标签 -->
+		<view class="tabs">
+			<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		</view>
+		<!-- 我的报名 -->
+		<view class="my-registration" v-for="(item,i) in list[current].list" :key="i">
+			
+			<view class="card">
+
+				<view class="positon-salary">
+
+					<view class="positon">
+						{{item.recruitInformationInfo.positionName}}
+					</view>
+					<view class="salary">
+						{{item.recruitInformationInfo.salary}}{{getUnit(item.recruitInformationInfo)}}
+					</view>
+				</view>
+				<view class="tags-date">
+					<view class="company">
+						{{item.recruitInformationInfo.enterpriseName}}
+					</view>
+					<view class="tags" v-if="current==0&&false">
+						<view class="item">
+							企业
+						</view>
+						<view class="item">
+							周结
+						</view>
+					</view>
+					<view class="date">
+						{{current==0?'报名时间':'邀请时间'}}:{{item.createTime.substring(0,10)}}
+					</view>
+				</view>
+				<u-line color="#E6E6E6"></u-line>
+				<view  style="display: flex;
+    justify-content: space-between;" >
+					<span class="tag" v-if="current==1&&!item.isRead">未读</span>
+
+
+					<view class="check" @click="ckInfo(item.recruitInformationInfo,item)">
+						查看
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<u-divider v-if="list[current].recordsTotal==list[current].list.length" :isnone="list[current].recordsTotal==0"
+			nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
+
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/packages.js'
+
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '我的报名',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					type: "0",
+					list: []
+				}, {
+					name: '收到的邀请',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					type: "1",
+					list: []
+				}],
+				current: 0
+			}
+		},
+		onLoad(op) {
+			if (op.c) {
+				this.current = op.c
+			}
+			this.getList();
+		},
+		methods: {
+			ckInfo(item,item2) {
+				var isread=""
+				if(this.current==1&&!item2.isRead){
+					item2.isRead=true
+					isread="&isread=1&readid="+item2.id
+				}
+				var url = "/pages/packages/jobInformation/jobDetails?id="
+				uni.navigateTo({
+					url: url + item.id+isread
+				})
+			},
+			getList() {
+
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				var list = this.list[this.current].list
+				var obj = this.list[this.current]
+				var listForm = {
+					...obj
+				}
+				delete listForm.list
+
+				API.myRegistration(listForm).then((res) => {
+
+					if (listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+
+					this.list[this.current].list = list
+
+					this.list[this.current].recordsTotal = res.data.recordsTotal;
+					uni.hideLoading();
+				}).catch(error => {
+					uni.showToast({
+						icon: 'none',
+						title: error,
+						icon: "none"
+					})
+				})
+
+			},
+			myLoadmore() {
+				this.list[this.current].pageIndex += 1;
+				this.getList();
+			},
+			change(index) {
+				this.current = index;
+				var list = this.list[this.current].list
+				if (list.length == 0) {
+					this.getList();
+				}
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background: #F0F0F2;
+		padding-bottom: 150px;
+	}
+</style>
+<style scoped lang="scss">
+	.card {
+		margin: 24rpx 32rpx;
+		background-color: #fff;
+		padding: 24rpx;
+		border-radius: 12px;
+
+		.positon-salary {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.positon {
+				color: rgba(16, 16, 16, 1);
+				font-size: 36rpx;
+
+				font-family: 'PingFangSC-medium';
+			}
+
+			.salary {
+				color: rgba(255, 61, 0, 1);
+				font-size: 32rpx;
+				font-family: 'PingFangSC-medium';
+			}
+		}
+
+		.tags-date {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 16rpx;
+			margin-bottom: 24rpx;
+
+			.tags {
+				display: flex;
+
+				.item {
+					border-radius: 4px;
+					background-color: rgba(241, 241, 247, 1);
+					color: rgba(129, 127, 153, 1);
+					font-size: 12px;
+					text-align: center;
+					line-height: 36rpx;
+					height: 36rpx;
+					padding: 0 12rpx;
+					margin-right: 8rpx;
+				}
+			}
+
+			.company {
+				color: rgba(51, 51, 51, 1);
+				font-size: 24rpx;
+			}
+
+			.date {
+				color: rgba(153, 153, 153, 1);
+				font-size: 24rpx;
+			}
+		}
+
+		// 查看
+		.check {
+			width: 120rpx;
+			height: 56rpx;
+			line-height: 56rpx;
+			margin-left: auto;
+			//margin-top: 24rpx;
+			border-radius: 50px;
+			background-color: rgba(255, 255, 255, 1);
+			color: rgba(119, 119, 119, 1);
+			text-align: center;
+			font-family: Microsoft Yahei;
+			border: 1px solid rgba(207, 210, 213, 1);
+		}
+	}
+
+	.tag {
+
+		top: -160rpx;
+		left: -40rpx;
+		position: relative;
+		border-radius: 4px 4px 4px 0px;
+		color: #fff;
+		padding: 2px 6px;
+		font-size: 20rpx;
+		line-height: 20rpx;
+		height: 30rpx;
+		background: linear-gradient(to right bottom, rgba(255, 255, 255, 0.4), transparent) var(--bg, #EA3447);
+		background-blend-mode: soft-light;
+	}
+
+	.tag::before {
+		content: '';
+		position: absolute;
+		width: 3px;
+		height: 3px;
+		left: 0;
+		bottom: -3px;
+		background-color: inherit;
+		filter: brightness(.7);
+		clip-path: polygon(0 0, 100% 0, 100% 100%);
+	}
+</style>

+ 18 - 228
pages/packages/search/search.vue

@@ -44,7 +44,7 @@
 					<u-tabs bg-color="#F0F0F2" :list="tabList" :is-scroll="false" :current="current"
 						@change="change"></u-tabs>
 				</view>
-				<view class="screen" @click="popupShow = true">
+				<view class="screen" @click="popupShowtrue">
 					<view class="icon">
 						<img src="@/assets/img/riLine-filter-line@1x.png" alt="">
 					</view>
@@ -92,44 +92,7 @@
 				</view>
 				
 			</view>
-			<!-- 筛选框 -->
-			<u-popup v-model="popupShow" @close="close"  @open="popupShowOpen2" mode="bottom" border-radius="20" :closeable="true">
-				<view class="popup-content">
-					<view class="headline">
-						筛选
-					</view>
-					<!-- 薪资待遇 -->
-					<view class="salary-package">
-						<view class="title">
-							薪资待遇
-						</view>
-						<!-- 选项 -->
-						<view class="options">
-							<view :class="{item,checked:saralyChecked==index}" v-for="(item,index) in salaryList"
-								:key="index" @click="changeSaralyChecked(index)">
-								{{item.name}}
-							</view>
-						</view>
-					</view>
-					<!-- 工作经验 -->
-					<view class="work-experience">
-						<view class="title">
-							工作经验
-						</view>
-						<!-- 选项 -->
-						<view class="options">
-							<view :class="{item,checked:workChecked==index}" v-for="(item,index) in workList" :key="index"
-								@click="changeWorkChecked(index)">
-								{{item.name}}
-							</view>
-						</view>
-					</view>
-					<view class="button">
-						<button class="reset" @click="reset()">重置</button>
-						<button class="confirm" @click="queryBtn()" >确认</button>
-					</view>
-				</view>
-			</u-popup>
+			
 			<u-divider   bgNoneColor="#ffffff" style="background: #F0F0F2;" v-if="tabList[current].recordsTotal==tabList[current].list.length"
 					 :isnone="tabList[current].recordsTotal==0" nonetext="没有找到相关内容" 
 					border-color="#CFD2D5">已经到底了</u-divider>
@@ -142,7 +105,7 @@
 					<u-tabs bg-color="#F0F0F2" :list="tabList" :is-scroll="false" :current="current"
 						@change="change"></u-tabs>
 				</view>
-				<view class="screen" @click="popupShow = true">
+				<view class="screen" @click="popupShowtrue">
 					<view class="icon">
 						<img src="@/assets/img/riLine-filter-line@1x.png" alt="">
 					</view>
@@ -192,66 +155,13 @@
 				</view>
 			</view>
 			
-			<!-- 筛选框 -->
-			<u-popup v-model="popupShow"  @open="popupShowOpen1" mode="bottom" border-radius="20" :closeable="true">
-				<view class="popup-content">
-					<view class="headline">
-						筛选
-					</view>
 			
-					<!-- 行业 -->
-					<view class="industry">
-						<view class="title">
-							行业
-						</view>
-						<!-- 选项 -->
-						<view class="options">
-							<view :class="{item,checked:isChecked==index}" v-for="(item,index) in industryList" :key="index"
-								@click="changeChecked(index)">
-								<!-- 快递跑腿/配送/分拣 -->{{item.name}}
-							</view>
-						</view>
-					</view>
-					<!-- 结算方式 -->
-					<view class="clearing-form" v-if="false">
-						<view class="title">
-							结算方式
-						</view>
-						<!-- 选项 -->
-						<view class="options">
-							<view :class="{item,checked:wayChecked==index}" v-for="(item,index) in wayList" :key="index"
-								@click="changeWayChecked(index)">
-								{{item.name}}
-							</view>
-						</view>
-					</view>
-					<!-- 薪资形式 -->
-					<view class="salary-form" v-if="false">
-						<view class="title">
-							薪资形式
-						</view>
-						<!-- 选项 -->
-						<view class="options ">
-							<view :class="{item,checked:saralyChecked==index}" v-for="(item,index) in salaryList"
-								:key="index" @click="changeSaralyChecked(index)">
-								{{item.name}}
-							</view>
-						</view>
-					</view>
-			
-			
-			
-					<view class="button">
-						<button class="reset" @click="reset()">重置</button>
-						<button class="confirm" @click="queryBtn()" >确认</button>
-					</view>
-				</view>
-			</u-popup>
 			<u-divider   bgNoneColor="#ffffff"  v-if="tabList[current].recordsTotal==tabList[current].list.length"
 					 :isnone="tabList[current].recordsTotal==0" nonetext="没有找到相关内容" 
 					border-color="#CFD2D5">已经到底了</u-divider>
 		</view>
 		
+		<jkpop ref="pop"  @reset="reset" @queryBtn="queryBtn" ></jkpop>
 		
 		
 		
@@ -259,13 +169,15 @@
 </template>
 
 <script>
+	import jkpop from "@/pages/tab/as-components/jk-popup.vue"
+	
 	import * as API from '@/apis/pagejs/packages.js'
 	import nxsearch from "@/components/nx-search.vue"
 	import * as API_weixin from '@/apis/weixin.js'
 
 	export default {
 		components: {
-			nxsearch
+			jkpop,nxsearch
 		},
 
 		data() {
@@ -332,43 +244,7 @@
 					recordsTotal:0
 				}],
 				
-				industryList: [
-				],
 				
-				salaryList: [{
-						name: '100元/天以下',
-						//min:0,
-						max:100
-					},
-					{
-						name: '100-150元/天',
-						min:100,
-						max:150
-					}, {
-						name: '150-200元/天',
-						min:150,
-						max:200
-					}, {
-						name: '200-300元/天',
-						
-						min:200,
-						max:300
-					}, {
-						name: '300-400元/天',
-						
-						min:300,
-						max:400
-					}, {
-						name: '400-500元/天',
-						min:400,
-						max:500
-					},
-					{
-						name: '500元/天以上',
-						min:500,
-					
-					}
-				],
 				tabList1: [{
 					name: '最新',
 					pageIndex: 1,
@@ -387,11 +263,7 @@
 				workList: [
 				
 				],
-				saralyChecked: -1,
-				workChecked: -1,
-				isChecked: -1,
-				wayChecked: -1,
-				popupShow:false,
+				
 				defaultSelectIndex:0,
 				queryForm:{
 					
@@ -423,74 +295,8 @@
 			}
 		},
 		methods: {
-			selectItem(i){
-				this.searchQuery.selectIndex=i;
-			},
-			changeSaralyChecked(index) {
-				this.saralyChecked = index;
-			},
-			changeWorkChecked(index) {
-				this.workChecked = index;
-			},
-			changeChecked(index) {
-				this.isChecked = index;
 			
-			},
-			popupShowOpen2(){
-				
-				if(this.workList.length==0){
-				
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-					API_weixin.findListByCatalogName({
-						name:'工作经验',
-						
-					}).then((res) => {
-						uni.hideLoading();
-						
-						this.workList=res.data.dictionaryList
-						
-					}).catch(error => {
-					
-						uni.showToast({icon: 'none',
-							title: error
-						})
-						//this.getPhone()
-						
-					})
-					
-				}
-			},
-			popupShowOpen1(){
-				
-				
-				if(this.industryList.length==0){
-					
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-					API_weixin.findListByCatalogName({
-						name:'意向行业',
-						
-					}).then((res) => {
-						uni.hideLoading();
-						
-						this.industryList=res.data.dictionaryList
-						
-					}).catch(error => {
-					
-						uni.showToast({icon: 'none',
-							title: error
-						})
-						//this.getPhone()
-						
-					})
-					
-				}
-			},
+			
 			ckInfo(id) {
 				var url = "/pages/news/articleDetails?id=" + id;
 				uni.navigateTo({
@@ -627,8 +433,11 @@
 				}
 			},
 			close(){},
-			queryBtn(){
-				this.popupShow=false;
+			popupShowtrue(){
+				this.$refs.pop.show();
+			},
+			queryBtn(queryForm){
+				this.$refs.pop.hide();
 				this.current = 0;
 				 this.tabList[this.current].list=[]
 				
@@ -641,33 +450,14 @@
 				// this.queryForm.salaryEnd=""
 				// this.queryForm.workExp=""
 				
-				if(this.isChecked!=-1){
-					this.queryForm.industry=this.industryList[this.isChecked].value
-				} 
-				
-				if(this.saralyChecked!=-1){
-					this.queryForm.salaryStart=this.salaryList[this.saralyChecked].min
-					this.queryForm.salaryEnd=this.salaryList[this.saralyChecked].max
-					
-				} 
-				if(this.workChecked!=-1){
-					this.queryForm.workExp=this.workList[this.workChecked].value
-				} 
+				 this.queryForm=queryForm
 				
 				this.query();
 			},
-			reset() {
+			reset(queryForm) {
 			
-				this.saralyChecked = -1;
-				this.workChecked = -1;
-				
-				this.isChecked = -1;
-				this.queryForm.industry=""
-				
-				this.queryForm.salaryStart=""
-				this.queryForm.salaryEnd=""
-				this.queryForm.workExp=""
-				this.queryBtn()
+			
+				this.queryBtn(queryForm)
 			}
 
 		}

+ 363 - 0
pages/tab/as-components/jk-popup.vue

@@ -0,0 +1,363 @@
+<template >
+	<view>
+		<!-- 筛选框 -->
+		<u-popup v-model="popupShow" @close="close"  @open="popupShowOpen" mode="bottom" border-radius="20" :closeable="true">
+			<view class="popup-content">
+				<view class="headline">
+					筛选
+				</view>
+				<!-- 工作经验 -->
+				<view class="work-experience">
+					<view class="title">
+						结算方式
+					</view>
+					<!-- 选项 -->
+					<view class="options">
+						<view :class="{item,checked:methodChecked==index}" v-for="(item,index) in methodList" :key="index"
+							@click="methodChecked=index">
+							{{item.name}}
+						</view>
+					</view>
+				</view>
+				<!-- 薪资待遇 -->
+				<view class="salary-package" v-show="methodChecked!=-1">
+					<view class="title">
+						薪资待遇
+					</view>
+					<!-- 选项 -->
+					<view class="options">
+						<view :class="{item,checked:saralyChecked==index}" v-for="(item,index) in salaryList"
+							:key="index" @click="saralyChecked=index">
+							{{item.name}}
+						</view>
+					</view>
+				</view>
+				<!-- 行业 -->
+				<view class="industry">
+					<view class="title">
+						<view>意向行业 <span style="color: #4696f6;">{{industryChecked!=-1?'已选中:'+industryList[industryChecked].name:''}}</span> (向下拉可滑动)</view>
+						
+						<u-search v-model="querypop"></u-search>
+					</view>
+						<!-- 选项 -->
+						
+						<scroll-view  class="scrollview" scroll-y="true" style="height: 420rpx;">
+						
+							<view class="options">
+								
+									<view 
+									:class="{item,checked:industryChecked==index}" v-for="(item,index) in industryList"
+									  v-show="item.name.indexOf(querypop)!=-1"
+									 :key="index"
+										@click="industryChecked=index">
+										<!-- 快递跑腿/配送/分拣 -->{{item.name}}
+									</view>
+								
+							</view>
+						</scroll-view>
+					
+				</view>
+				<view class="button">
+					<button class="reset" @click="reset()">重置</button>
+					<button class="confirm" @click="queryBtn()" >确认</button>
+				</view>
+			</view>
+		</u-popup>
+		
+	</view>
+</template>
+
+<script>
+	import * as API_weixin from '@/apis/weixin.js'
+	
+ 	export default {
+		name:"tabbarJob",
+		props:{
+			current: 0,
+			elderStatus: false
+		},
+		data() {
+			return {
+				popupShow: false,
+				querypop:"",
+				methodChecked: -1,
+				industryChecked: -1,
+				saralyChecked:-1,
+				salaryStart:'',
+				salaryEnd:'',
+				
+				methodList:[
+					{
+						name: '日结',
+						value:"1"
+					}, {
+						name: '周结',
+						value:"2"
+					
+					}, {
+						name: '月结',
+						value:"3"
+					}
+				],//结算方式
+				industryList:[],// 
+				//salaryList: [],
+				salaryList3: [{
+						name: '1000元/月以下',
+						max:1000
+					},
+					 {
+						name: '1000-1500元/月',
+						min:1000,
+						max:1500
+					}, {
+						name: '1500-3000元/月',
+						
+						min:1500,
+						max:3000
+					}, {
+						name: '3000-5000元/月',
+						min:3000,
+						max:5000
+					}, 
+					{
+						name: '5000元/月以上',
+						min:5000,
+					}
+				],
+				salaryList2: [{
+						name: '500元/周以下',
+						max:500
+					},
+					 {
+						name: '500-800元/周',
+						min:500,
+						max:800
+					}, {
+						name: '800-1200元/周',
+						
+						min:800,
+						max:1200
+					}, {
+						name: '1200-2000元/周',
+						min:1200,
+						max:2000
+					}, 
+					{
+						name: '2000元/周以上',
+						min:2000,
+					
+					}
+				],
+				salaryList1: [{
+						name: '100元/天以下',
+						max:100
+					},
+					 {
+						name: '100-200元/天',
+						min:100,
+						max:200
+					}, {
+						name: '200-300元/天',
+						
+						min:200,
+						max:300
+					}, {
+						name: '300-500元/天',
+						min:300,
+						max:500
+					}, 
+					{
+						name: '500元/天以上',
+						min:500,
+						
+					
+					}
+				],
+				
+			};
+			
+		},
+		computed:{
+			salaryList(){
+				if(this.methodChecked!=-1){
+					if(this.methodChecked==0){
+						return this.salaryList1
+					}
+					if(this.methodChecked==1){
+						return this.salaryList2
+					}
+					if(this.methodChecked==2){
+						return this.salaryList3
+					}
+				}
+				return []
+			}
+		},
+		methods:{
+			show(){
+				this.popupShow=true;
+			},
+			hide(){
+				this.popupShow=false;
+			},
+			popupShowOpen(){
+				if(this.industryList.length==0){
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					API_weixin.findListByCatalogName({
+						name:'意向行业',
+						
+					}).then((res) => {
+						uni.hideLoading();
+						
+						this.industryList=res.data.dictionaryList
+						
+					}).catch(error => {
+					
+						uni.showToast({icon: 'none',
+							title: error
+						})
+						//this.getPhone()
+						
+					})
+				}
+				 
+			},
+			close(){},
+			reset() {
+			
+				this.querypop=""
+				this.methodChecked= -1
+				this.industryChecked= -1
+				this.saralyChecked=-1
+				this.salaryStart=''
+				this.salaryEnd=''
+				this.$emit("reset",{})
+			},
+			queryBtn(){
+				var queryForm={}
+				if(this.saralyChecked!=-1){
+					queryForm.salaryStart=this.salaryList[this.saralyChecked].min
+					if(queryForm.salaryStart==undefined){
+						queryForm.salaryStart=''
+					}
+					queryForm.salaryEnd=this.salaryList[this.saralyChecked].max
+					if(queryForm.salaryEnd==undefined){
+											queryForm.salaryEnd=''
+					}
+					
+				} 
+				if(this.methodChecked!=-1){
+					queryForm.settlementMethod=this.methodList[this.methodChecked].value
+				} 
+				if(this.industryChecked!=-1){
+					queryForm.industry=this.industryList[this.industryChecked].value
+				} 
+				
+				this.$emit("queryBtn",queryForm)
+			},
+			
+		},
+		mounted(){
+			
+		},destroyed(){
+			
+		}
+		
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	 // 筛选框
+	 .popup-content {
+	 	padding: 32rpx;
+	 
+	 	.headline {
+	 		color: #101010;
+	 		font-size: 40rpx;
+	 		text-align: center;
+	 	}
+	 
+	 	// 薪资待遇
+		.industry,
+	 	.salary-package,
+	 	.work-experience {
+	 		margin-top: 16rpx;
+	 
+	 		.title {
+	 			font-size: 32rpx;
+	 			color: #111111;
+	 		}
+	 
+	 		// 选项
+	 		.options {
+	 			display: flex;
+	 			flex-wrap: wrap;
+	 			justify-content: flex-start;
+	 			margin-top: 24rpx;
+	 
+	 			.item {
+	 				height: 56rpx;
+	 				line-height: 56rpx;
+	 				min-width: 210rpx;
+	 				text-align: center;
+	 				margin-bottom: 16rpx;
+	 				margin-right: 16rpx;
+	 				color: #999999;
+	 				background-color: #F3F3F4;
+	 				border-radius: 4px;
+	 			}
+	 
+	 			.checked {
+	 				background-color: #2795FD;
+	 				color: #fff;
+	 			}
+	 		}
+	 	}
+	 
+	 	.button {
+	 		display: flex;
+	 
+	 		margin-top: 8rpx;
+	 		.reset:after{
+	 				border:0
+	 		}
+	 		.reset {
+	 			color: #999999;
+	 			background-color: #F3F3F4;
+	 			width: 200rpx;
+	 			height: 72rpx;
+	 			line-height: 72rpx;
+	 			border-radius: 8px;
+	 		}
+	 
+	 		.confirm {
+	 			width: 440rpx;
+	 			background-color: #2795FD;
+	 			color: #fff;
+	 			height: 72rpx;
+	 			line-height: 72rpx;
+	 			border-radius: 8px;
+	 		}
+	 	}
+	 }
+	 .industry,
+	 .salary-form,
+	 .clearing-form {
+	 	.options {
+	 		justify-content: start !important;
+	 	}
+	 
+	 	.item {
+	 		margin-right: 24rpx;
+	 	}
+	 }
+	 .scrollview{
+	 	border: 1px #101010 dashed;
+		margin-bottom: 40rpx;
+	 }
+	 
+</style>

+ 22 - 221
pages/tab/choreInformation/choreInformation.vue

@@ -21,7 +21,7 @@
 					<u-tabs bg-color="#F0F0F2" :list="tabList" :is-scroll="false" :current="current"
 						@change="change"></u-tabs>
 				</view>
-				<view class="screen" @click="popupShow = true">
+				<view class="screen" @click="popupShowtrue">
 					<view class="icon">
 						<img src="@/assets/img/riLine-filter-line@1x.png" alt="">
 					</view>
@@ -74,47 +74,9 @@
 					 :isnone="tabList[current].recordsTotal==0" nonetext="没有找到相关内容" 
 					border-color="#CFD2D5">已经到底了</u-divider>
 		</view>
-		<!-- 筛选框 -->
-		<u-popup v-model="popupShow" @close="close"  @open="popupShowOpen" mode="bottom" border-radius="20" :closeable="true">
-			<view class="popup-content">
-				<view class="headline">
-					筛选
-				</view>
-				<!-- 工作经验 -->
-				<view class="work-experience">
-					<view class="title">
-						结算方式
-					</view>
-					<!-- 选项 -->
-					<view class="options">
-						<view :class="{item,checked:workChecked==index}" v-for="(item,index) in workList" :key="index"
-							@click="changeWorkChecked(index)">
-							{{item.name}}
-						</view>
-					</view>
-				</view>
-				<!-- 薪资待遇 -->
-				<view class="salary-package">
-					<view class="title">
-						薪资待遇
-					</view>
-					<!-- 选项 -->
-					<view class="options">
-						<view :class="{item,checked:saralyChecked==index}" v-for="(item,index) in salaryList"
-							:key="index" @click="changeSaralyChecked(index)">
-							{{item.name}}
-						</view>
-					</view>
-				</view>
-				
-				<view class="button">
-					<button class="reset" @click="reset()">重置</button>
-					<button class="confirm" @click="queryBtn()" >确认</button>
-				</view>
-			</view>
-		</u-popup>
-
-		<tabbar :current="3"></tabbar>
+		
+		<jkpop ref="pop"  @reset="reset" @queryBtn="queryBtn" ></jkpop>
+		<tabbar  :current="3"></tabbar>
 	</view>
 </template>
 
@@ -122,58 +84,24 @@
 	import * as API from '@/apis/pagejs/tab.js'
 	import tabbar from "@/components/Tabbar.vue"
 	import * as API_weixin from '@/apis/weixin.js'
+	import jkpop from "@/pages/tab/as-components/jk-popup.vue"
 	
 	import nxsearch from "@/components/nx-search.vue"
 	export default {
 		components: {
-			nxsearch,
+			nxsearch,jkpop,
 			tabbar
 		},
 		data() {
 			return {
 				keyword: '',
-				popupShow: false,
-				saralyChecked: -1,
-				workChecked: -1,
+			
+				
 				searchQuery: {
 					keyword: '',
 					selectIndex: 0
 				},
-
-				salaryList: [{
-						name: '100元/天以下',
-						//min:0,
-						max:100
-					},
-					{
-						name: '100-150元/天',
-						min:100,
-						max:150
-					}, {
-						name: '150-200元/天',
-						min:150,
-						max:200
-					}, {
-						name: '200-300元/天',
-						
-						min:200,
-						max:300
-					}, {
-						name: '300-400元/天',
-						
-						min:300,
-						max:400
-					}, {
-						name: '400-500元/天',
-						min:400,
-						max:500
-					},
-					{
-						name: '500元/天以上',
-						min:500,
-					
-					}
-				],
+				
 
 				workList: [
 
@@ -219,55 +147,20 @@
 			}
 		},
 		methods: {
-			
-			queryBtn(){
-				this.popupShow=false;
+			popupShowtrue(){
+				this.$refs.pop.show();
+			},
+			queryBtn(queryForm){
+				this.$refs.pop.hide();
 				this.current = 0;
 				 this.tabList[this.current].list=[]
 				
 				this.tabList[this.current].pageIndex = 1;
-				
-				// this.saralyChecked = -1;
-				// this.workChecked = -1;
-				
-				// this.queryForm.salaryStart=""
-				// this.queryForm.salaryEnd=""
-				// this.queryForm.workExp=""
-				
-				if(this.saralyChecked!=-1){
-					this.queryForm.salaryStart=this.salaryList[this.saralyChecked].min
-					this.queryForm.salaryEnd=this.salaryList[this.saralyChecked].max
-					
-				} 
-				if(this.workChecked!=-1){
-					this.queryForm.settlementMethod=this.workList[this.workChecked].value
-				} 
+				queryForm.status=1
+				this.queryForm=queryForm
 				this.findRecruitSearch()
 			},
-			popupShowOpen(){
-				if(this.workList.length==0){
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-					API_weixin.findListByCatalogName({
-						name:'结算方式',
-						
-					}).then((res) => {
-						uni.hideLoading();
-						
-						this.workList=res.data.dictionaryList
-						
-					}).catch(error => {
-					
-						uni.showToast({icon: 'none',
-							title: error
-						})
-						//this.getPhone()
-						
-					})
-				}
-			},
+			
 			myLoadmore() {
 				this.tabList[this.current].pageIndex += 1;
 				this.findRecruitSearch();
@@ -322,21 +215,11 @@
 					this.findRecruitSearch();
 				}
 			},
-			changeSaralyChecked(index) {
-				this.saralyChecked = index;
-			},
-			changeWorkChecked(index) {
-				this.workChecked = index;
-			},
+		
 			close(){},
-			reset() {
-
-				this.saralyChecked = -1;
-				this.workChecked = -1;
-				this.queryForm.salaryStart=""
-				this.queryForm.salaryEnd=""
-				this.queryForm.settlementMethod=""
-				this.queryBtn()
+			reset(queryForm) {
+
+				this.queryBtn(queryForm)
 			}
 
 
@@ -483,89 +366,7 @@
 
 	}
 
-	// 筛选框
-	.popup-content {
-		padding: 32rpx;
-
-		.headline {
-			color: #101010;
-			font-size: 40rpx;
-			text-align: center;
-		}
-
-		// 薪资待遇
-		.salary-package,
-		.work-experience {
-			margin-top: 16rpx;
-
-			.title {
-				font-size: 32rpx;
-				color: #111111;
-			}
-
-			// 选项
-			.options {
-				display: flex;
-				flex-wrap: wrap;
-				justify-content: flex-start;
-				margin-top: 24rpx;
-
-				.item {
-					height: 56rpx;
-					line-height: 56rpx;
-					width: 210rpx;
-					text-align: center;
-					margin-bottom: 16rpx;
-					margin-right: 16rpx;
-					color: #999999;
-					background-color: #F3F3F4;
-					border-radius: 4px;
-				}
-
-				.checked {
-					background-color: #2795FD;
-					color: #fff;
-				}
-			}
-		}
-
-		.button {
-			display: flex;
-
-			margin-top: 8rpx;
-			.reset:after{
-					border:0
-			}
-			.reset {
-				color: #999999;
-				background-color: #F3F3F4;
-				width: 200rpx;
-				height: 72rpx;
-				line-height: 72rpx;
-				border-radius: 8px;
-			}
-
-			.confirm {
-				width: 440rpx;
-				background-color: #2795FD;
-				color: #fff;
-				height: 72rpx;
-				line-height: 72rpx;
-				border-radius: 8px;
-			}
-		}
-	}
-
-	.salary-form,
-	.clearing-form {
-		.options {
-			justify-content: start !important;
-		}
-
-		.item {
-			margin-right: 24rpx;
-		}
-	}
+	
 
 	/deep/.u-close--top-right {
 		top: 44rpx;

+ 20 - 143
pages/tab/jobInformation/jobInformation.vue

@@ -22,7 +22,7 @@
 					<u-tabs bg-color="#F0F0F2" :list="tabList" :is-scroll="false" :current="current"
 						@change="change"></u-tabs>
 				</view>
-				<view class="screen" @click="popupShow = true">
+				<view class="screen" @click="popupShowtrue">
 					<view class="icon">
 						<img src="@/assets/img/riLine-filter-line@1x.png" alt="">
 					</view>
@@ -79,75 +79,9 @@
 					border-color="#CFD2D5">已经到底了</u-divider>
 		</view>
 
-
-		<!-- 筛选框 -->
-		<u-popup v-model="popupShow"  @open="popupShowOpen" mode="bottom" border-radius="20" :closeable="true">
-			<view class="popup-content">
-				<view class="headline">
-					筛选
-				</view>
-
-				<!-- 行业 -->
-				<view class="industry">
-					<view class="title">
-						<u-search v-model="querypop"></u-search>
-						<view>意向行业 <span style="color: #4696f6;">{{isChecked!=-1?'已选中:'+industryList[isChecked].name:''}}</span> (向下拉可滑动)</view>
-					</view>
-						<!-- 选项 -->
-						
-						<scroll-view  class="scrollview" scroll-y="true" style="height: 420rpx;">
-						
-							<view class="options">
-								
-									<view 
-									:class="{item,checked:isChecked==index}" v-for="(item,index) in industryList"
-									  v-show="item.name.indexOf(querypop)!=-1"
-									 :key="index"
-										@click="changeChecked(index)">
-										<!-- 快递跑腿/配送/分拣 -->{{item.name}}
-									</view>
-								
-							</view>
-						</scroll-view>
-					
-				</view>
-				<!-- 结算方式 -->
-				<view class="clearing-form" v-if="false">
-					<view class="title">
-						结算方式
-					</view>
-					<!-- 选项 -->
-					<view class="options">
-						<view :class="{item,checked:wayChecked==index}" v-for="(item,index) in wayList" :key="index"
-							@click="changeWayChecked(index)">
-							{{item.name}}
-						</view>
-					</view>
-				</view>
-				<!-- 薪资形式 -->
-				<view class="salary-form" v-if="false">
-					<view class="title">
-						薪资形式
-					</view>
-					<!-- 选项 -->
-					<view class="options ">
-						<view :class="{item,checked:saralyChecked==index}" v-for="(item,index) in salaryList"
-							:key="index" @click="changeSaralyChecked(index)">
-							{{item.name}}
-						</view>
-					</view>
-				</view>
-
-
-
-				<view class="button">
-					<button class="reset" @click="reset()">重置</button>
-					<button class="confirm" @click="queryBtn()" >确认</button>
-				</view>
-			</view>
-		</u-popup>
 		<tabbar :current="1"></tabbar>
-
+		<jkpop ref="pop"  @reset="reset" @queryBtn="queryBtn" ></jkpop>
+		
 	</view>
 </template>
 
@@ -155,22 +89,19 @@
 	import * as API from '@/apis/pagejs/tab.js'
 	import tabbar from "@/components/Tabbar.vue"
 	import * as API_weixin from '@/apis/weixin.js'
+	import jkpop from "@/pages/tab/as-components/jk-popup.vue"
 	
 	import nxsearch from "@/components/nx-search.vue"
 	export default {
 		components: {
-			nxsearch,
+			nxsearch,jkpop,
 			tabbar
 
 		},
 		data() {
 			return {
 				keyword: '',
-				querypop:"",
-				popupShow: false,
-				isChecked: -1,
-				wayChecked: -1,
-				saralyChecked: -1,
+			
 
 				searchQuery: {
 					keyword: '',
@@ -212,29 +143,7 @@
 
 				industryList: [
 				],
-				wayList: [{
-						name: '日结'
-					},
-					{
-						name: '周结'
-					},
-					{
-						name: '月结'
-					},
-					{
-						name: '完工结算'
-					}
-				],
-				salaryList: [{
-						name: '计件'
-					},
-					{
-						name: '计时'
-					},
-					{
-						name: '定额'
-					}
-				],
+				
 				selectList: [{
 						id: 0,
 						name: '找工作'
@@ -259,41 +168,20 @@
 			}
 		},
 		methods: {
-			queryBtn(){
-				this.popupShow=false;
+			popupShowtrue(){
+				this.$refs.pop.show();
+			},
+			queryBtn(queryForm){
+				this.$refs.pop.hide();
 				this.current = 0;
 				 this.tabList[this.current].list=[]
 				
 				this.tabList[this.current].pageIndex = 1;
-				if(this.isChecked!=-1){
-					this.queryForm.industry=this.industryList[this.isChecked].value
-				} 
+				 queryForm.status=0
+				 this.queryForm=queryForm
 				this.findRecruitSearch()
 			},
-			popupShowOpen(){
-				if(this.industryList.length==0){
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-					API_weixin.findListByCatalogName({
-						name:'意向行业',
-						
-					}).then((res) => {
-						uni.hideLoading();
-						
-						this.industryList=res.data.dictionaryList
-						
-					}).catch(error => {
-					
-						uni.showToast({icon: 'none',
-							title: error
-						})
-						//this.getPhone()
-						
-					})
-				}
-			},
+			
 			myLoadmore() {
 				this.tabList[this.current].pageIndex += 1;
 				this.findRecruitSearch();
@@ -351,22 +239,11 @@
 				}
 			},
 
-			changeChecked(index) {
-				this.isChecked = index;
-
-			},
-			changeWayChecked(index) {
-				this.wayChecked = index;
-			},
-			changeSaralyChecked(index) {
-				this.saralyChecked = index;
-			},
-			reset() {
-				this.isChecked = -1;
-				this.queryForm.industry=""
-				this.wayChecked = -1;
-				this.saralyChecked = -1;
-				this.queryBtn()
+			
+			reset(queryForm) {
+			
+				
+				this.queryBtn(queryForm)
 			}
 
 		}

+ 25 - 16
pages/tab/mine/mine.vue

@@ -41,10 +41,15 @@
 			</view>
 			<u-grid :col="3" :border="false">
 				<u-grid-item @click="gotoUrl1('pages/packages/mine/myJobInformation/myJobInformation')">
+					<u-badge :count="num3==2?0:(num3==0?'未创建':'审批中')"
+					 :type="num3==0?'error':'warning'"
+					 size="mini" :offset="[18,4]"></u-badge>
+					
 					<view class="icon">
 						<img src="@/assets/img/riLine-folder-user-line@1x.png" alt="">
 					</view>
-					<view class="grid-text">求职信息</view>
+					<view class="grid-text">我的简历</view>
+					
 				</u-grid-item>
 				<u-grid-item @click="gotoUrl1('pages/packages/mine/myJobInformation/myRegistration?c=0')">
 					<view class="icon">
@@ -202,6 +207,7 @@
 				content: "",
 				num1: 0,
 				num2: 0,
+				num3: 0,//0 未创建 ,1 审批中, 2 成功
 				isReady:false,
 				
 			}
@@ -245,8 +251,6 @@
 
 				if (!enterpriseInfo || enterpriseInfo.status != 1) {
 
-
-
 					return false
 				}
 				return true
@@ -317,25 +321,17 @@
 
 			},
 			getNum1() {
-				API.myRegistration({
-					pageIndex: 1,
-					pageSize: 0,
-					type: 1
-				}).then((res) => {
+				API.myRegistrationNotReadNum().then((res) => {
 
-					this.num1 = res.data.recordsTotal
+					this.num1 = res.data.notReadNum
 				}).catch(error => {
 					//.log(error)
 
 				})
 			},
 			getNum2() {
-				API.myReceivedRegistration({
-					pageIndex: 1,
-					pageSize: 0,
-					status: 0
-				}).then((res) => {
-					this.num2 = res.data.recordsTotal
+				API.myReceivedRegistrationNotReadNum().then((res) => {
+					this.num2 = res.data.notReadNum
 				}).catch(error => {
 					//.log(error)
 
@@ -357,7 +353,20 @@
 					this.userInfo = res.data.regUser;
 					this.src = this.userInfo.photo
 					uni.hideLoading();
-					this.show = false;
+					this.show = false;
+					
+					var jobInformationInfo = this.carhelp.getPersonInfoPlus().jobInformationInfo;
+					if(jobInformationInfo==null){
+						this.num3=0
+					}else{
+						if(jobInformationInfo.status==1){
+							this.num3=2
+						}else{
+							this.num3=1
+						}
+					}
+					
+					
 					if (this.ck1()) {
 						this.getNum1()
 					}