فهرست منبع

Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

wkw 7 ماه پیش
والد
کامیت
db1fde946a

+ 2 - 2
androidPrivacy.json

@@ -2,14 +2,14 @@
     "version" : "1",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "message" : "  请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  你可阅读<a href=\"https://bossweb.edccc.cn/my/setting/xieyi\">《服务协议》</a>和<a href=\"https://bossweb.edccc.cn/my/setting/mimi\">《隐私政策》</a>了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
+    "message" : "  请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  你可阅读<a href=\"https://h5.bosszan.com/my/setting/xieyi\">《服务协议》</a>和<a href=\"https://h5.bosszan.com/my/setting/mimi\">《隐私政策》</a>了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "hrefLoader" : "system",
     "backToExit" : "false",
     "second" : {
         "title" : "确认提示",
-        "message" : "  进入应用前,你需先同意<a href=\"https://bossweb.edccc.cn/my/setting/xieyi\">《服务协议》</a>和<a href=\"https://bossweb.edccc.cn/my/setting/mimi\">《隐私政策》</a>,否则将退出应用。",
+        "message" : "  进入应用前,你需先同意<a href=\"https://h5.bosszan.com/my/setting/xieyi\">《服务协议》</a>和<a href=\"https://h5.bosszan.com/my/setting/mimi\">《隐私政策》</a>,否则将退出应用。",
         "buttonAccept" : "同意并继续",
         "buttonRefuse" : "退出应用"
     },

+ 9 - 8
common/config.js

@@ -1,4 +1,4 @@
-const h5Url='https://bossweb.edccc.cn'
+const h5Url='https://h5.bosszan.com'
 const ossUrl='https://yi-zhipin.oss-cn-hangzhou.aliyuncs.com/emoji/'
 let mobile=0;
 // #ifdef APP-PLUS
@@ -6,11 +6,12 @@ mobile=1
 //#endif
 if (process.env.NODE_ENV !== 'development'||mobile) {
 	//正式环境
-	const ROOTPATH = "https://yizhizan.edccc.cn/sqx_fast";
-	const ROOTPATH1 = "https://yizhizan.edccc.cn/sqx_fast";
-	const ROOTPATH2 = "wss://yizhizan.edccc.cn/wss/websocket/"; //联系客服
-	const ROOTPATH3 = "wss://yizhizan.edccc.cn/wss/chatSocket/" ; //聊天
-	const ROOTPATH4 = "https://yizhizan.edccc.cn";
+	const ROOTPATH = "http://www.bosszan.com/sqx_fast";
+	const ROOTPATH1 = "http://www.bosszan.com/sqx_fast";
+	const ROOTPATH2 = "wss://www.bosszan.com/wss/websocket/"; //联系客服
+	const ROOTPATH3 = "wss://www.bosszan.com/wss/chatSocket/" ; //聊天
+	const ROOTPATH4 = "https://www.bosszan.com";
+	const ROOTPATH5 = "https://yf327682.natappfree.cc";
 	module.exports = {
 		APIHOST: ROOTPATH,
 		APIHOST1: ROOTPATH1,
@@ -24,8 +25,8 @@ if (process.env.NODE_ENV !== 'development'||mobile) {
 	//测试环境
 	const ROOTPATH = "/sqx_fast";
 	const ROOTPATH1 = "/sqx_fast";
-	const ROOTPATH2 = "wss://yizhizan.edccc.cn/wss/websocket/"; //联系客服
-	const ROOTPATH3 = "wss://yizhizan.edccc.cn/wss/chatSocket/"; //聊天
+	const ROOTPATH2 = "wss://www.bosszan.com/wss/websocket/"; //联系客服
+	const ROOTPATH3 = "wss://www.bosszan.com/wss/chatSocket/"; //聊天
 	const ROOTPATH4 = "";
 	module.exports = {
 		APIHOST: ROOTPATH,

+ 6 - 2
manifest.json

@@ -54,7 +54,10 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>"
                 ],
-                "autoSdkPermissions" : true
+                "autoSdkPermissions" : true,
+                "targetSdkVersion" : 33,
+                "minSdkVersion" : 21,
+                "abiFilters" : [ "arm64-v8a" ]
             },
             /* ios打包配置 */
             "ios" : {
@@ -188,7 +191,8 @@
         "usingComponents" : true
     },
     "uniStatistics" : {
-        "enable" : false
+        "enable" : false,
+        "version" : "2"
     },
     "h5" : {
         "router" : {

+ 4 - 0
pages/index/webView.vue

@@ -11,6 +11,10 @@
         },
         onLoad: function (option) {
             this.url = option.url
+			if(option&&option.title)
+				uni.setNavigationBarTitle({
+					title:option.title
+				})
         }
     }
 </script>

+ 92 - 11
pages/my/VIP/benefits.vue

@@ -218,6 +218,24 @@
 				// 当前会员信息
 				currentPlan: 'regular',
 				remainingDays: 5,
+				openWay: 1,
+				isVip: false,
+				isVipC: "",
+				dataTime: "", //到期时间
+				dataTimeC: "",
+				isTrue: true,
+				msgNum: 0, //非会员每天免费联系次数
+				vipMsgNum: 0, //会员每天免费联系次数
+				msgPrice: 0, //非会员每次联系价格
+				vipMsgPrice: 0, //会员每次联系价格
+				vipNum: 0,
+				noVipNum: 0,
+				vipNumCom: 0,
+				noVipNumCom: 0,
+				userMonthTime: "", //用户会员到期时间
+				companyMonthTime: "", //企业会员到期时间
+				vipPrice: "0", //会员价格
+				
 				// 权益使用情况
 				benefits: {
 					view: {
@@ -252,6 +270,69 @@
 			// 获取状态栏高度
 			let systemInfo = uni.getSystemInfoSync();
 			this.statusBarHeight = systemInfo.statusBarHeight || 0;
+			
+			
+			this.userType = uni.getStorageSync("userType");
+			if (this.userType == 1) {
+				//用户简历的刷新次数
+				this.getVipPeople();
+				this.getNoVipPeople();
+			} else {
+				this.getVipCom();
+				this.getNoVipCom();
+			}
+			this.getVipPrice();
+			// #ifdef APP-PLUS
+			this.openLists = [{
+					image: "../../static/images/my/zhifubao.png",
+					text: "支付宝",
+					id: 1,
+				},
+				{
+					image: "../../static/images/my/icon_weixin.png",
+					text: "微信",
+					id: 2,
+				},
+			];
+			this.openWay = 1;
+			// #endif
+			
+			// #ifdef MP-WEIXIN
+			this.openLists = [{
+				image: "../../static/share/icon_weixin.png",
+				text: "微信",
+				id: 2,
+			}, ];
+			this.openWay = 2;
+			// #endif
+			
+			// #ifdef H5
+			let ua = navigator.userAgent.toLowerCase();
+			if (ua.indexOf("micromessenger") !== -1) {
+				this.openLists = [{
+						image: "../../static/images/my/zhifubao.png",
+						text: "支付宝",
+						id: 1,
+					},
+					{
+						image: "../../static/share/icon_weixin.png",
+						text: "微信",
+						id: 2,
+					},
+				];
+			} else {
+				this.openLists = [{
+					image: "../../static/images/my/zhifubao.png",
+					text: "支付宝",
+					id: 1,
+				}, ];
+			}
+			
+			this.openWay = 1;
+			// #endif
+			
+			
+			
 		},
 		methods: {
 			// 返回上一页
@@ -282,7 +363,7 @@
 					this.$Request
 						.post("/app/wxPay/wxPayOrder", {
 							classify: 1,
-							money: this.vipPrice,
+							money: this.planPrices,
 							type: 2,
 						})
 						.then((ret) => {
@@ -295,7 +376,7 @@
 					this.$Request
 						.post("/app/wxPay/wxPayOrder", {
 							classify: 3,
-							money: this.vipPrice,
+							money: this.planPrices,
 							type: 2,
 						})
 						.then((ret) => {
@@ -335,7 +416,7 @@
 					if (ua.indexOf("micromessenger") !== -1) {
 						let data = {
 							classify: 2,
-							money: this.vipPrice,
+							money: this.planPrices,
 							type: 2,
 						};
 						this.$Request.postJson("/app/wxPay/wxPayOrder", data).then((res) => {
@@ -357,7 +438,7 @@
 					console.log("APP进入支付。");
 					const datas = {
 						classify: 4,
-						money: 0.1,
+						money: this.planPrices,
 						type: 2,
 					}
 					this.$Request.postT("/app/aliPay/payMoneyOrder", datas).then((ret) => {
@@ -368,18 +449,18 @@
 					// #endif
 					// #ifdef H5
 					let data = {
-						classify: 4,
-						money: this.vipPrice,
+						classify: 5,
+						money:this.planPrices,
 						type: 2,
 					};
-					this.$Request.postJson("/app/aliPay/payMoneyOrder", data).then((res) => {
+					this.$Request.postT("/app/aliPay/payMoneyOrder", data).then((res) => {
 						if (res.code === 0) {
 							this.show = false;
 							that.isTrue = true;
 							const div = document.createElement("div");
 							div.innerHTML = res.data; //此处form就是后台返回接收到的数据
-							// document.body.appendChild(div);
-							// document.forms[0].submit();
+							document.body.appendChild(div);
+							document.forms[0].submit();
 						} else {
 							that.isTrue = true;
 							uni.showToast({
@@ -493,14 +574,14 @@
 					//用户会员价格
 					this.$Request.get("/app/common/type/331").then((res) => {
 						if (res.code == 0) {
-							this.vipPrice = res.data.value;
+							this.planPrices = res.data.value;
 						}
 					});
 				} else {
 					//企业会员价格
 					this.$Request.get("/app/common/type/332").then((res) => {
 						if (res.code == 0) {
-							this.vipPrice = res.data.value;
+							this.planPrices = res.data.value;
 						}
 					});
 				}

+ 26 - 10
pages/my/attachment.vue

@@ -19,10 +19,10 @@
 					<view class="usermain-item item-padding" v-for="item in content">
 						<view class="usermain-item-title c-flex-center"><image src="../../static/images/pdf.svg" class="header-icon" /></view>
 						<view @click="seekDoc(item)" class="fileContent c-flex-center">
-							<view class="fileName">{{item.attachment_name}}</view>
-							<view class="filedesc">{{item.attachment_size}} 更新于{{item.create_time}}</view>
+							<view class="fileName">{{item.attachmentName}}</view>
+							<view class="filedesc">{{item.attachmentSize}}kb 更新于{{item.createTime}}</view>
 						</view>
-						<view @click.stop="more(item.resumes_attachment_id)" class="c-flex-center">
+						<view @click.stop="more(item.resumesAttachmentId)" class="c-flex-center">
 							<u-icon name="more-dot-fill"></u-icon>
 						</view>
 					</view>
@@ -242,9 +242,9 @@
 					that.$queue.uploadFile(e.path,function(path){
 						if(path)
 							that.$Request.postJson("/app/resumes/saveAttachment", {
-							  		attachment_address:path,
-									attachment_name:e.name,
-									attachment_size
+							  		attachmentAddress:path,
+									attachmentName:e.name,
+									attachmentSize:attachment_size
 							  	}).then(res => {
 							  		if (res.code === 0) {
 							  			that.getUserInfo()
@@ -287,11 +287,11 @@
 			    success(res) {
 			      if (res.confirm) {
 			        that.$Request.postJson("/app/resumes/deleteAttachment", {
-			        		resumes_attachment_id: id
+			        		resumesAttachmentId: id
 			        	}).then(res => {
 			        		if (res.code === 0) {
 			        			var info = that.content.filter(function (item) {
-			        			  return item.resumes_attachment_id != id;
+			        			  return item.resumesAttachmentId != id;
 			        			});
 			        			that.content=info
 			        		} else {
@@ -311,8 +311,23 @@
 				console.log(e)
 			},
 			seekDoc(it){
+				//#ifdef APP-PLUS
+				uni.downloadFile({
+				  url: it.attachmentAddress,
+				  success: function (res) {
+				    var filePath = res.tempFilePath;
+				    uni.openDocument({
+				      filePath: filePath,
+				      showMenu: true,
+				      success: function (res) {
+				        console.log('打开文档成功');
+				      }
+				    });
+				  }
+				});
+				//#endif
 				uni.navigateTo({
-					url: '/pages/index/webView?url=' + it.attachment_address
+					url: '/pages/index/webView?url=' + it.attachmentAddress+'&title='+it.attachmentName
 				});
 			}
 		},
@@ -420,10 +435,11 @@
 		}
 		.fileName{
 			color: #222;
+			font-size: 32rpx;
 		}
 		.filedesc{
 			margin-top: 10rpx;
-			font-size: 20rpx;
+			font-size: 24rpx;
 		}
 		.c-flex-center{
 			align-self: center;

+ 3 - 3
uni_modules/zhouquan-fileSelector/components/zhouquan-fileSelector/file-selector.vue

@@ -153,13 +153,13 @@ export default {
 
                 Array.from(e.target.files).forEach(file => {
                     //#ifdef H5
-                    ownerVm.callMethod('receiveRenderFile', {
+                    /* ownerVm.callMethod('receiveRenderFile', {
                         name: file.name,
                         filePath: URL.createObjectURL(file)
-                    })
+                    }) */
                     //#endif
 
-                    //#ifdef APP-PLUS
+                    //#ifdef APP-PLUS||H5
                     const reader = new FileReader()
                     reader.onload = ({target}) => {
                         target?.result && ownerVm.callMethod('receiveRenderFile', {