给后端测试

pages/oldmanindex/message.vue

@@ -46,7 +46,7 @@
 					<view class="card-right">
 						{{ item.createTime.substring(item.createTime.indexOf("-") + 1, item.createTime.indexOf("-") + 6) }}
 
-						<view class="card-dian" v-if="item.izRead==`1`"></view>
+						<view class="card-dian" v-if="item.izRead==`N`"></view>
 					</view>
 
 				</view>
@@ -87,7 +87,7 @@
 
 	const clickCard = (type : string) => {
 		// console.log("???",type.id)
-		if (type.izRead == "1") {
+		if (type.izRead == "N") {
 			upRead({ id: type.id }).then(res => {
 				if (res.success) {
 					search()
@@ -115,7 +115,7 @@
 
 	}
 	const checkRed = () => {
-		if (hulijigouArray.value.every(item => item.izRead == `0`)) {
+		if (hulijigouArray.value.every(item => item.izRead == `Y`)) {
 			hong.value = false;
 		} else {
 			hong.value = true;

pages/yuangongindex/api.js

@@ -37,7 +37,7 @@ export function getEmployeesOrgRela(openId){
 //主页
 export function getIndex(openId){
     return request({
-        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&izHistory=1`,
+        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&izHistory=N`,
 		method: 'get',
     })
 }
@@ -45,14 +45,14 @@ export function getIndex(openId){
 //机构邀请
 export function getInvited(openId){
     return request({
-        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0&izHistory=1`,
+        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0&izHistory=N`,
 		method: 'get',
     })
 }
 //单独机构邀请
 export function getId(id){
     return request({
-        url: `/api/employessapply/getEmployeesOrgRela?openId=${uni.getStorageSync('openid')}&invited=0&id=${id}&izHistory=1`,
+        url: `/api/employessapply/getEmployeesOrgRela?openId=${uni.getStorageSync('openid')}&invited=0&id=${id}&izHistory=N`,
 		method: 'get',
     })
 }

pages/yuangongindex/index.vue

@@ -99,7 +99,8 @@
 
 						</view>
 
-						<view style="z-index: 1;width: 100%;margin-top: 100rpx;" v-if=" item.applyStatus==`2` || item.applyType == `2`">
+						<view style="z-index: 1;width: 100%;margin-top: 100rpx;"
+							v-if=" item.applyStatus==`2` || item.applyType == `2`">
 							<view class="fuwu-button">
 								<view class="fuwu-button-top">
 									<view style="display: flex;">
@@ -248,6 +249,23 @@
 			</view>
 		</view>
 		<downMenu :itemTarget="0" />
+		<u-popup v-model="popupshow" mode="bottom" border-radius="40">
+			<view class="popop-father">
+				<image style="width: 100rpx;height: 100rpx;"
+					src="https://www.focusnu.com/media/directive/index/tishi.png" />
+				<view class="popop-font">
+					入驻申请已提交，请到
+					<text style="color: #01A9FF;">
+						"我的-审核记录"
+					</text>
+
+					查看审核进度
+				</view>
+				<view class="popop-blue" @click="jumpRuzhu()">
+					查看
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -270,7 +288,8 @@
 	import {
 		getIndex,
 		isRead,
-		invitedConfirm
+		invitedConfirm,
+		Apply
 	} from './api.js'
 	import request from '@/request/index.js'
 	import downMenu from '@/compontent/public/yuangongdownmenu.vue'
@@ -280,7 +299,7 @@
 
 	const content = ref("");
 
-	const jineng = () =>{
+	const jineng = () => {
 		// uni.showLoading()
 	}
 
@@ -340,8 +359,61 @@
 		});
 	}
 	const again = (item) => {
-		uni.navigateTo({
+
-			url: "/pages/yuangongindex/searchjigou"
+		getMessageList().then(res => {
+			console.log("这里面有啥", res.result[0])
+			let data = res.result[0]
+			data = {
+				...data,
+				dateOfBirth: data.birthDate,
+				marriedOrNot: data.maritalStatus,
+				address: data.address,
+				emergencyContact: data.contactName,
+				emergencyTel: data.contactTel,
+				emergencyRelationship: data.contactRelationship,
+				hukouNature: data.hukouType,
+				idCardPositive: data.cardZmPath,
+				idCardNegative: data.cardFmPath,
+				healthCertificatePositive: data.healthZmPath,
+				healthCertificateNegative: data.healthFmPath,
+				bankPositive: data.bankZmPath,
+				bankNegative: data.bankFmPath,
+				qualification: data.qualificationPath,
+				noCrimeCertificate: data.noCrimeCertificate,
+				houseAddress: data.idCardAddress,
+				employeeId: data.id,
+				id: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+				orgCode: item.orgCode
+			}
+			Apply(data).then((data) => {
+				if (data.success) {
+					uni.requestSubscribeMessage({
+						// 这里填后台申请好的 templateId 数组
+						tmplIds: ['cWVzXm1C-iitx1gNFn1nZdijq9R_3fCv8vLbiqs9zww'],
+						success: (res) => {
+							popupshow.value = true
+							setTimeout(() => {
+								loadingData()
+							}, 1000)
+						},
+						fail: (err) => {
+							console.error('订阅接口调用失败：', err);
+							uni.showToast({
+								title: '订阅失败',
+								icon: 'none'
+							});
+						}
+					});
+
+
+				}
+
+
+			})
+
 		})
 	}
 	const jumpTo = () => {
@@ -402,7 +474,7 @@
 					})
 				})
 				getMessageList().then(res => {
-					console.log("special",res)
+					console.log("special", res)
 					uni.setStorageSync("staff", res.result[0])
 				})
 			}
@@ -463,6 +535,13 @@
 		})
 		uni.stopPullDownRefresh()
 	})
+	const popupshow = ref(false);
+	const jumpRuzhu = () => {
+		popupshow.value = false
+		uni.navigateTo({
+			url: "/pages/yuangongindex/workjoin"
+		})
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -1026,4 +1105,39 @@
 		align-items: center;
 		margin-left: 20rpx;
 	}
+
+	.popop-father {
+		width: 100%;
+		height: 600rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	}
+
+	.popop-font {
+		margin-top: 40rpx;
+		width: 70%;
+		text-align: center;
+		line-height: 40rpx;
+		font-size: 30rpx;
+		margin-bottom: 100rpx;
+	}
+
+	.popop-blue {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 80%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 90rpx;
+		border-radius: 35rpx;
+		background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
+		border: 2rpx solid #9AD1FF;
+		color: #007CFF;
+		font-size: 33rpx;
+		margin-bottom: 30rpx;
+	}
 </style>

pages/yuangongindex/message.vue

@@ -46,7 +46,7 @@
 					<view class="card-right">
 						{{ item.createTime.substring(item.createTime.indexOf("-") + 1, item.createTime.indexOf("-") + 6) }}
 
-						<view class="card-dian" v-if="item.izRead==`1`"></view>
+						<view class="card-dian" v-if="item.izRead==`N`"></view>
 					</view>
 
 				</view>
@@ -87,7 +87,7 @@
 
 	const clickCard = (type : string) => {
 		// console.log("???",type.id)
-		if (type.izRead == "1") {
+		if (type.izRead == "N") {
 			upRead({ id: type.id }).then(res => {
 				if (res.success) {
 					search()
@@ -115,7 +115,7 @@
 
 	}
 	const checkRed = () => {
-		if (hulijigouArray.value.every(item => item.izRead == `0`)) {
+		if (hulijigouArray.value.every(item => item.izRead == `Y`)) {
 			hong.value = false;
 		} else {
 			hong.value = true;

pages/yuangongindex/searchjigou.vue

@@ -240,7 +240,7 @@
 		// let data = typeof storageData === 'string' ? JSON.parse(storageData) : { ...storageData }
 
 		// 避免污染原对象，拷贝一份
-		console.log("?????",data)
+		// console.log("?????",data)
 		data = {
 			...data,
 			dateOfBirth: data.birthDate,
@@ -267,7 +267,8 @@
 			orgCode: hulijigouArray.value[hulitarget.value].orgCode
 		}
 		getMessageList().then(res => {
-			// console.log("?????",res.result)
+			// console.log("有啥啊",res.result)
+			// return
 			if (Array.isArray(res.result) && res.result.length === 0) {
 				// 这个是检测他有没有员工信息，没有的话让他去填员工信息，别忘了用完去掉
 				uni.setStorageSync('nostaffmessage', hulijigouArray.value[hulitarget.value].orgCode);

pages/yuangongindex/workjoin.vue

@@ -76,7 +76,7 @@
 						</view>
 						<view style="width: 100%;display: flex;justify-content: center;">
 							<view class="blue-button"
-								v-if="item.applyStatus != 1 && item.applyStatus != 2 && item.izHistory == 1 && item.applyType!=`2`"
+								v-if="item.applyStatus != 1 && item.applyStatus != 2 && item.izHistory == `N` && item.applyType!=`2`"
 								@click.stop="again(item)">
 								重新申请
 							</view>
@@ -154,6 +154,9 @@
 	}
 
 	const again = (item) => {
+		
+		console.log("click",item)
+		
 		uni.navigateTo({
 			url: "/pages/yuangongindex/searchjigou"
 		})

request/index.js

@@ -1,6 +1,6 @@
 // 全局请求封装
-// export const base_url = 'http://192.168.2.22:8081/opeapi'
+export const base_url = 'http://192.168.2.22:8081/opeapi'
-export const base_url = 'https://www.focusnu.com/opeapi'
+// export const base_url = 'https://www.focusnu.com/opeapi'
 
 export const media_base_url = 'https://www.focusnu.com/media/upFiles/'
 

unpackage/dist/dev/.sourcemap/mp-weixin/pages/yuangongindex/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sources":["pages/yuangongindex/api.js"],"sourcesContent":["// src/composables/useWeChatAuth.js\nimport { ref } from 'vue';\nimport request from '@/request/index.js';\r\n\r\n//向机构申请\r\nexport function Apply(data){\r\n    return request({\r\n        url: `/api/employessapply/apply`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n//向机构接受拒绝\r\nexport function invitedConfirm(data){\r\n    return request({\r\n        url: `/api/employessapply/invitedConfirm`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n//获取机构的列表\r\nexport function getOrgInfo(title){\r\n    return request({\r\n        url: `/api/employessapply/getOrgInfo?title=${title}&pageSize=-1&openId=${uni.getStorageSync('openid')}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//获取审核的列表\r\nexport function getEmployeesOrgRela(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0,1,2`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//主页\r\nexport function getIndex(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&izHistory=1`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//机构邀请\r\nexport function getInvited(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0&izHistory=1`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//单独机构邀请\r\nexport function getId(id){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${uni.getStorageSync('openid')}&invited=0&id=${id}&izHistory=1`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//消息队列\r\nexport function getNotice(){\r\n    return request({\r\n        url: `/api/wx/notice/query?openId=${uni.getStorageSync('openid')}&clientType=${uni.getStorageSync('jumpIndex')}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//检测有没有已读\r\nexport function isRead(openId){\r\n    return request({\r\n        url: `/api/wx/notice/unreadCount?openId=${uni.getStorageSync('openid')}&clientType=2`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n \r\n//向机构申请\r\nexport function upRead(data){\r\n    return request({\r\n        url: `/api/wx/notice/upRead`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n} "],"names":["request","uni"],"mappings":";;;AAKO,SAAS,MAAM,MAAK;AACvB,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;AAEO,SAAS,eAAe,MAAK;AAChC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;AAEO,SAAS,WAAW,OAAM;AAC7B,SAAOA,sBAAQ;AAAA,IACX,KAAK,wCAAwC,KAAK,uBAAuBC,cAAAA,MAAI,eAAe,QAAQ,CAAC;AAAA,IAC3G,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,oBAAoB,QAAO;AACvC,SAAOD,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,SAAS,QAAO;AAC5B,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,WAAW,QAAO;AAC9B,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAEO,SAAS,MAAM,IAAG;AACrB,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkDC,oBAAI,eAAe,QAAQ,CAAC,iBAAiB,EAAE;AAAA,IAC5G,QAAQ;AAAA,EACV,CAAK;AACL;AAEO,SAAS,YAAW;AACvB,SAAOD,sBAAQ;AAAA,IACX,KAAK,+BAA+BC,cAAG,MAAC,eAAe,QAAQ,CAAC,eAAeA,cAAG,MAAC,eAAe,WAAW,CAAC;AAAA,IACpH,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,OAAO,QAAO;AAC1B,SAAOD,sBAAQ;AAAA,IACX,KAAK,qCAAqCC,cAAAA,MAAI,eAAe,QAAQ,CAAC;AAAA,IAC5E,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,OAAO,MAAK;AACxB,SAAOD,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;;;;;;;;;;;"}
+{"version":3,"file":"api.js","sources":["pages/yuangongindex/api.js"],"sourcesContent":["// src/composables/useWeChatAuth.js\nimport { ref } from 'vue';\nimport request from '@/request/index.js';\r\n\r\n//向机构申请\r\nexport function Apply(data){\r\n    return request({\r\n        url: `/api/employessapply/apply`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n//向机构接受拒绝\r\nexport function invitedConfirm(data){\r\n    return request({\r\n        url: `/api/employessapply/invitedConfirm`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n//获取机构的列表\r\nexport function getOrgInfo(title){\r\n    return request({\r\n        url: `/api/employessapply/getOrgInfo?title=${title}&pageSize=-1&openId=${uni.getStorageSync('openid')}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//获取审核的列表\r\nexport function getEmployeesOrgRela(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0,1,2`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//主页\r\nexport function getIndex(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&izHistory=N`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//机构邀请\r\nexport function getInvited(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0&izHistory=N`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//单独机构邀请\r\nexport function getId(id){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${uni.getStorageSync('openid')}&invited=0&id=${id}&izHistory=N`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//消息队列\r\nexport function getNotice(){\r\n    return request({\r\n        url: `/api/wx/notice/query?openId=${uni.getStorageSync('openid')}&clientType=${uni.getStorageSync('jumpIndex')}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//检测有没有已读\r\nexport function isRead(openId){\r\n    return request({\r\n        url: `/api/wx/notice/unreadCount?openId=${uni.getStorageSync('openid')}&clientType=2`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n \r\n//向机构申请\r\nexport function upRead(data){\r\n    return request({\r\n        url: `/api/wx/notice/upRead`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n} "],"names":["request","uni"],"mappings":";;;AAKO,SAAS,MAAM,MAAK;AACvB,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;AAEO,SAAS,eAAe,MAAK;AAChC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;AAEO,SAAS,WAAW,OAAM;AAC7B,SAAOA,sBAAQ;AAAA,IACX,KAAK,wCAAwC,KAAK,uBAAuBC,cAAAA,MAAI,eAAe,QAAQ,CAAC;AAAA,IAC3G,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,oBAAoB,QAAO;AACvC,SAAOD,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,SAAS,QAAO;AAC5B,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,WAAW,QAAO;AAC9B,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAEO,SAAS,MAAM,IAAG;AACrB,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkDC,oBAAI,eAAe,QAAQ,CAAC,iBAAiB,EAAE;AAAA,IAC5G,QAAQ;AAAA,EACV,CAAK;AACL;AAEO,SAAS,YAAW;AACvB,SAAOD,sBAAQ;AAAA,IACX,KAAK,+BAA+BC,cAAG,MAAC,eAAe,QAAQ,CAAC,eAAeA,cAAG,MAAC,eAAe,WAAW,CAAC;AAAA,IACpH,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,OAAO,QAAO;AAC1B,SAAOD,sBAAQ;AAAA,IACX,KAAK,qCAAqCC,cAAAA,MAAI,eAAe,QAAQ,CAAC;AAAA,IAC5E,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,OAAO,MAAK;AACxB,SAAOD,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;;;;;;;;;;;"}

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -7052,7 +7052,7 @@ function isConsoleWritable() {
 function initRuntimeSocketService() {
   const hosts = "192.168.2.27,127.0.0.1";
   const port = "8090";
-  const id = "mp-weixin_EISx9u";
+  const id = "mp-weixin_iKurH_";
   const lazy = typeof swan !== "undefined";
   let restoreError = lazy ? () => {
   } : initOnError();

unpackage/dist/dev/mp-weixin/pages/oldmanindex/message.js

@@ -8,7 +8,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     common_vendor.ref(false);
     common_vendor.ref("");
     const clickCard = (type) => {
-      if (type.izRead == "1") {
+      if (type.izRead == "N") {
         pages_oldmanindex_api.upRead({ id: type.id }).then((res) => {
           if (res.success) {
             search();
@@ -32,7 +32,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       }
     };
     const checkRed = () => {
-      if (hulijigouArray.value.every((item) => item.izRead == `0`)) {
+      if (hulijigouArray.value.every((item) => item.izRead == `Y`)) {
         hong.value = false;
       } else {
         hong.value = true;
@@ -71,8 +71,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           return common_vendor.e({
             a: common_vendor.t(item.title),
             b: common_vendor.t(item.createTime.substring(item.createTime.indexOf("-") + 1, item.createTime.indexOf("-") + 6)),
-            c: item.izRead == `1`
+            c: item.izRead == `N`
-          }, item.izRead == `1` ? {} : {}, {
+          }, item.izRead == `N` ? {} : {}, {
             d: common_vendor.t(item.content),
             e: index,
             f: common_vendor.o(($event) => clickCard(item), index)

unpackage/dist/dev/mp-weixin/pages/yuangongindex/api.js

@@ -29,19 +29,19 @@ function getEmployeesOrgRela(openId) {
 }
 function getIndex(openId) {
   return request_index.request({
-    url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&izHistory=1`,
+    url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&izHistory=N`,
     method: "get"
   });
 }
 function getInvited(openId) {
   return request_index.request({
-    url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0&izHistory=1`,
+    url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0&izHistory=N`,
     method: "get"
   });
 }
 function getId(id) {
   return request_index.request({
-    url: `/api/employessapply/getEmployeesOrgRela?openId=${common_vendor.index.getStorageSync("openid")}&invited=0&id=${id}&izHistory=1`,
+    url: `/api/employessapply/getEmployeesOrgRela?openId=${common_vendor.index.getStorageSync("openid")}&invited=0&id=${id}&izHistory=N`,
     method: "get"
   });
 }

unpackage/dist/dev/mp-weixin/pages/yuangongindex/index.js

@@ -2,8 +2,13 @@
 const common_vendor = require("../../common/vendor.js");
 const pages_addstaff_api_addjigou = require("../addstaff/api/addjigou.js");
 const pages_yuangongindex_api = require("./api.js");
+if (!Array) {
+  const _easycom_u_popup2 = common_vendor.resolveComponent("u-popup");
+  _easycom_u_popup2();
+}
+const _easycom_u_popup = () => "../../uni_modules/vk-uview-ui/components/u-popup/u-popup.js";
 if (!Math) {
-  (model + downMenu)();
+  (model + downMenu + _easycom_u_popup)();
 }
 const downMenu = () => "../../compontent/public/yuangongdownmenu.js";
 const model = () => "../../compontent/public/model.js";
@@ -53,8 +58,55 @@ const _sfc_main = {
       });
     };
     const again = (item) => {
-      common_vendor.index.navigateTo({
+      pages_addstaff_api_addjigou.getMessageList().then((res) => {
-        url: "/pages/yuangongindex/searchjigou"
+        common_vendor.index.__f__("log", "at pages/yuangongindex/index.vue:364", "这里面有啥", res.result[0]);
+        let data = res.result[0];
+        data = {
+          ...data,
+          dateOfBirth: data.birthDate,
+          marriedOrNot: data.maritalStatus,
+          address: data.address,
+          emergencyContact: data.contactName,
+          emergencyTel: data.contactTel,
+          emergencyRelationship: data.contactRelationship,
+          hukouNature: data.hukouType,
+          idCardPositive: data.cardZmPath,
+          idCardNegative: data.cardFmPath,
+          healthCertificatePositive: data.healthZmPath,
+          healthCertificateNegative: data.healthFmPath,
+          bankPositive: data.bankZmPath,
+          bankNegative: data.bankFmPath,
+          qualification: data.qualificationPath,
+          noCrimeCertificate: data.noCrimeCertificate,
+          houseAddress: data.idCardAddress,
+          employeeId: data.id,
+          id: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          orgCode: item.orgCode
+        };
+        pages_yuangongindex_api.Apply(data).then((data2) => {
+          if (data2.success) {
+            common_vendor.index.requestSubscribeMessage({
+              // 这里填后台申请好的 templateId 数组
+              tmplIds: ["cWVzXm1C-iitx1gNFn1nZdijq9R_3fCv8vLbiqs9zww"],
+              success: (res2) => {
+                popupshow.value = true;
+                setTimeout(() => {
+                  loadingData();
+                }, 1e3);
+              },
+              fail: (err) => {
+                common_vendor.index.__f__("error", "at pages/yuangongindex/index.vue:403", "订阅接口调用失败：", err);
+                common_vendor.index.showToast({
+                  title: "订阅失败",
+                  icon: "none"
+                });
+              }
+            });
+          }
+        });
       });
     };
     const whichMenu = common_vendor.ref(0);
@@ -96,7 +148,7 @@ const _sfc_main = {
             });
           });
           pages_addstaff_api_addjigou.getMessageList().then((res2) => {
-            common_vendor.index.__f__("log", "at pages/yuangongindex/index.vue:405", "special", res2);
+            common_vendor.index.__f__("log", "at pages/yuangongindex/index.vue:477", "special", res2);
             common_vendor.index.setStorageSync("staff", res2.result[0]);
           });
         }
@@ -150,6 +202,13 @@ const _sfc_main = {
       });
       common_vendor.index.stopPullDownRefresh();
     });
+    const popupshow = common_vendor.ref(false);
+    const jumpRuzhu = () => {
+      popupshow.value = false;
+      common_vendor.index.navigateTo({
+        url: "/pages/yuangongindex/workjoin"
+      });
+    };
     return (_ctx, _cache) => {
       var _a;
       return common_vendor.e({
@@ -193,7 +252,7 @@ const _sfc_main = {
             q: `https://www.focusnu.com/media/directive/index/${statusarray[Number(item.applyStatus) - 1]}.png`,
             r: common_vendor.t(item.comName),
             s: common_vendor.o(($event) => jumptolist(item.auditContent), index),
-            t: common_vendor.o(($event) => again(), index)
+            t: common_vendor.o(($event) => again(item), index)
           } : {}, {
             v: item.applyStatus == `2` || item.applyType == `2`
           }, item.applyStatus == `2` || item.applyType == `2` ? {
@@ -247,6 +306,13 @@ const _sfc_main = {
         l: common_vendor.t((_a = menuArray.value[which.value]) == null ? void 0 : _a.comName),
         m: common_vendor.p({
           itemTarget: 0
+        }),
+        n: common_vendor.o(($event) => jumpRuzhu()),
+        o: common_vendor.o(($event) => popupshow.value = $event),
+        p: common_vendor.p({
+          mode: "bottom",
+          ["border-radius"]: "40",
+          modelValue: popupshow.value
         })
       });
     };

unpackage/dist/dev/mp-weixin/pages/yuangongindex/index.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "首页",
   "enablePullDownRefresh": true,
   "usingComponents": {
+    "u-popup": "../../uni_modules/vk-uview-ui/components/u-popup/u-popup",
     "down-menu": "../../compontent/public/yuangongdownmenu",
     "model": "../../compontent/public/model"
   }

unpackage/dist/dev/mp-weixin/pages/yuangongindex/index.wxss

@@ -517,3 +517,35 @@
   align-items: center;
   margin-left: 20rpx;
 }
+.popop-father.data-v-f6d04c18 {
+  width: 100%;
+  height: 600rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+.popop-font.data-v-f6d04c18 {
+  margin-top: 40rpx;
+  width: 70%;
+  text-align: center;
+  line-height: 40rpx;
+  font-size: 30rpx;
+  margin-bottom: 100rpx;
+}
+.popop-blue.data-v-f6d04c18 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 80%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 90rpx;
+  border-radius: 35rpx;
+  background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
+  border: 2rpx solid #9AD1FF;
+  color: #007CFF;
+  font-size: 33rpx;
+  margin-bottom: 30rpx;
+}

unpackage/dist/dev/mp-weixin/pages/yuangongindex/message.js

@@ -8,7 +8,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     common_vendor.ref(false);
     common_vendor.ref("");
     const clickCard = (type) => {
-      if (type.izRead == "1") {
+      if (type.izRead == "N") {
         pages_yuangongindex_api.upRead({ id: type.id }).then((res) => {
           if (res.success) {
             search();
@@ -17,7 +17,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       }
     };
     const checkRed = () => {
-      if (hulijigouArray.value.every((item) => item.izRead == `0`)) {
+      if (hulijigouArray.value.every((item) => item.izRead == `Y`)) {
         hong.value = false;
       } else {
         hong.value = true;
@@ -65,8 +65,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           return common_vendor.e({
             a: common_vendor.t(item.title),
             b: common_vendor.t(item.createTime.substring(item.createTime.indexOf("-") + 1, item.createTime.indexOf("-") + 6)),
-            c: item.izRead == `1`
+            c: item.izRead == `N`
-          }, item.izRead == `1` ? {} : {}, {
+          }, item.izRead == `N` ? {} : {}, {
             d: common_vendor.t(item.content),
             e: index,
             f: common_vendor.o(($event) => clickCard(item), index)

unpackage/dist/dev/mp-weixin/pages/yuangongindex/searchjigou.js

@@ -75,7 +75,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const apply = () => {
       sumbit.value = true;
       let data = common_vendor.index.getStorageSync("staff") || {};
-      common_vendor.index.__f__("log", "at pages/yuangongindex/searchjigou.vue:243", "?????", data);
       data = {
         ...data,
         dateOfBirth: data.birthDate,
@@ -121,7 +120,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
                   setTimeout(() => search(), 1e3);
                 },
                 fail: (err) => {
-                  common_vendor.index.__f__("error", "at pages/yuangongindex/searchjigou.vue:294", "订阅接口调用失败：", err);
+                  common_vendor.index.__f__("error", "at pages/yuangongindex/searchjigou.vue:295", "订阅接口调用失败：", err);
                   common_vendor.index.showToast({
                     title: "订阅失败",
                     icon: "none"

unpackage/dist/dev/mp-weixin/pages/yuangongindex/workjoin.js

@@ -45,6 +45,7 @@ const _sfc_main = {
       common_vendor.index.navigateBack();
     };
     const again = (item) => {
+      common_vendor.index.__f__("log", "at pages/yuangongindex/workjoin.vue:158", "click", item);
       common_vendor.index.navigateTo({
         url: "/pages/yuangongindex/searchjigou"
       });
@@ -96,9 +97,9 @@ const _sfc_main = {
             l: item.applyStatus === `3` && item.applyType == `2`
           }, item.applyStatus === `3` && item.applyType == `2` ? {} : {}, {
             m: common_vendor.t(item.comRegisterAddress),
-            n: item.applyStatus != 1 && item.applyStatus != 2 && item.izHistory == 1 && item.applyType != `2`
+            n: item.applyStatus != 1 && item.applyStatus != 2 && item.izHistory == `N` && item.applyType != `2`
-          }, item.applyStatus != 1 && item.applyStatus != 2 && item.izHistory == 1 && item.applyType != `2` ? {
+          }, item.applyStatus != 1 && item.applyStatus != 2 && item.izHistory == `N` && item.applyType != `2` ? {
-            o: common_vendor.o(($event) => again(), index)
+            o: common_vendor.o(($event) => again(item), index)
           } : {}, {
             p: item.applyStatus != 1 && item.applyStatus != 2 && item.applyType != "0"
           }, item.applyStatus != 1 && item.applyStatus != 2 && item.applyType != "0" ? {

unpackage/dist/dev/mp-weixin/request/index.js

@@ -1,6 +1,6 @@
 "use strict";
 const common_vendor = require("../common/vendor.js");
-const base_url = "https://www.focusnu.com/opeapi";
+const base_url = "http://192.168.2.22:8081/opeapi";
 const media_base_url = "https://www.focusnu.com/media/upFiles/";
 const timeout = 5e3;
 const request = (params) => {