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

# Conflicts:
#	manifest.json

common/config.js

@@ -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,

manifest.json

@@ -23,7 +23,9 @@
             "Share" : {},
             "OAuth" : {},
             "Maps" : {},
-            "Push" : {}
+            "Push" : {},
+            "Camera" : {},
+            "Geolocation" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -53,8 +55,14 @@
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>"
                 ],
                 "autoSdkPermissions" : true,
+<<<<<<< HEAD
                 "minSdkVersion" : 21,
                 "targetSdkVersion" : 33
+=======
+                "targetSdkVersion" : 33,
+                "minSdkVersion" : 21,
+                "abiFilters" : [ "arm64-v8a" ]
+>>>>>>> e94ad6588e8751b05722903cedbb8b768aa63524
             },
             /* ios打包配置 */
             "ios" : {
@@ -96,7 +104,14 @@
                 "push" : {
                     "unipush" : {}
                 },
-                "geolocation" : {}
+                "geolocation" : {
+                    "amap" : {
+                        "name" : "amap6EYNrBli",
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "d359b4a4f42b069cf18a46e1bf6f5db1",
+                        "appkey_android" : "766b93984c7d9fdd4a537d541a8a4733"
+                    }
+                }
             },
             "icons" : {
                 "android" : {
@@ -181,7 +196,8 @@
         "usingComponents" : true
     },
     "uniStatistics" : {
-        "enable" : false
+        "enable" : false,
+        "version" : "2"
     },
     "h5" : {
         "router" : {

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;
 						}
 					});
 				}

pages/public/login.vue

@@ -55,12 +55,12 @@
 			<view class="login-btn wechat" :class="{ disabled: !checked }" :disabled="checked" @click="register(2)">
 				<image src="@/static/images/jobApplicant/phone.svg" mode="scaleToFill" />手机验证码登录
 			</view>
-			<view class="" v-if="isopen" @click="weixinLo" style="width: 100%; padding-top: 100rpx">
+			<!-- <view class="" v-if="isopen" @click="weixinLo" style="width: 100%; padding-top: 100rpx">
 				<view class="">
 					<u-icon name="weixin-circle-fill" color="#5fcd73" size="100"></u-icon>
 				</view>
 				<view class="login-btn wechat"> 公众号快捷登录 </view>
-			</view>
+			</view> -->
 
 			<!-- 底部信息 -->
 			<view class="footer">