From 867ee16cf7f78428d28824b4d04c2061147c21fa Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sat, 28 Dec 2024 20:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/config/customerServicePopup.vue | 34 +++++------
 main.js                                    |  2 +
 mixins/configList.js                       |  4 +-
 pages/index/center.vue                     |  4 +-
 pages/index/index.vue                      |  7 ++-
 pages/index/keepAccounts.vue               | 12 ++--
 pages_order/kepp/MechanicProblem.vue       |  5 +-
 pages_order/mine/GainPoints.vue            | 49 +++++++++++++--
 pages_order/mine/IntegralRecord.vue        |  1 +
 pages_order/mine/InvitationCredit.vue      | 10 +++-
 pages_order/mine/MemberRecharge.vue        | 95 ++++++++++++++++--------------
 pages_order/mine/contactRecord.vue         |  4 +-
 pages_order/mine/promotion.vue             |  2 +-
 pages_order/mine/setting.vue               |  4 +-
 pages_order/work/addResume.vue             |  2 +-
 store/store.js                             |  2 +-
 16 files changed, 152 insertions(+), 85 deletions(-)

diff --git a/components/config/customerServicePopup.vue b/components/config/customerServicePopup.vue
index d2d73a6..c894531 100644
--- a/components/config/customerServicePopup.vue
+++ b/components/config/customerServicePopup.vue
@@ -1,10 +1,12 @@
 <template>
 	<!-- 联系客服弹框 -->
-	<uv-overlay :show="show" @click="close">
+	<uv-popup ref="popup" 
+	:safeAreaInsetBottom="false"
+	:round="30">
 		<view class="warp">
 			<view class="rect" @tap.stop>
-				<view class="title">联系客服</view>
-				<view class="center">确定拨打客服电话?</view>
+				<view class="title">联系{{ bTitle || title }}</view>
+				<view class="center">确定拨打{{ bTitle || title }}电话?</view>
 				<view class="bottom">
 					<view class="btn1"
 					@click="close">
@@ -17,37 +19,35 @@
 				</view>
 			</view>
 		</view>
-	</uv-overlay>
+	</uv-popup>
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				show: false,
 				phone:'',
+				title : '客服',
+				bPhone : '',
+				bTitle : '',
 			}
 		},
-		onLoad() {
-			this.getCustomPhone()
+		mounted() {
 		},
 		methods: {
-			getCustomPhone(){
-				this.$api('customUser', {}, res => {
-					this.phone = res.result.phone
-				})
-			},
-			open() {
-				this.show = true
+			open(phone, title) {
+				this.bPhone = phone || this.phone || this.configList.config_service_phone
+				this.bTitle = title || this.title
+				this.$refs.popup.open()
 			},
 			close() {
-				this.show = false
+				this.$refs.popup.close()
 			},
 			// 拨打电话
 			confirm() {
-				this.show = false
+				this.$refs.popup.close()
 				uni.makePhoneCall({
-					phoneNumber: this.phone,
+					phoneNumber: this.bPhone || this.phone,
 					success() {
 						console.log('安卓拨打成功');
 					},
diff --git a/main.js b/main.js
index 9f09e6f..145cf9f 100644
--- a/main.js
+++ b/main.js
@@ -22,9 +22,11 @@ Vue.mixin(mixinConfigList)
 //组件注册
 import configPopup from '@/components/config/configPopup.vue'
 import navbar from '@/components/base/navbar.vue'
+import customerServicePopup from '@/components/config/customerServicePopup.vue'
 
 Vue.component('configPopup',configPopup)
 Vue.component('navbar',navbar)
+Vue.component('customerServicePopup',customerServicePopup)
 
 const app = new Vue({
 	...App,
diff --git a/mixins/configList.js b/mixins/configList.js
index a243fc1..fd8ca93 100644
--- a/mixins/configList.js
+++ b/mixins/configList.js
@@ -20,7 +20,7 @@ export default {
     onShareAppMessage(res) {
 		let o = {
 			...this.Gshare,
-			// title : this.configList.logo_name,
+			title : this.configList.config_app_name,
 		}
 		if(this.userInfo.id){
 			o.path = this.Gshare.path + '?shareId=' + this.userInfo.id
@@ -31,7 +31,7 @@ export default {
     onShareTimeline(res) {
 		let o = {
 			...this.Gshare,
-			// title : this.configList.logo_name,
+			title : this.configList.config_app_name,
 		}
 		if(this.userInfo.id){
 			o.path = this.Gshare.path + '?shareId=' + this.userInfo.id
diff --git a/pages/index/center.vue b/pages/index/center.vue
index fe50973..d30a22c 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -115,7 +115,9 @@
 						<text class="grid-text">在线简历</text>
 					</uv-grid-item>
 					
-					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/releaseWork')">
+					<uv-grid-item 
+					v-if="role"
+					@click="$utils.navigateTo('/pages_order/mine/releaseWork')">
 						<image class="image" src="/static/image/center/a1.png" mode=""></image>
 						<text class="grid-text">{{ role ? '我的招工' : '我的找活'}}</text>
 					</uv-grid-item>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0098d8e..19b4b10 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -141,17 +141,20 @@
 			},
 			toAdd(){
 				if(this.role){
-					this.$utils.navigateTo('/pages_order/work/jobPosting')
+					// 在完成企业认证的情况下执行
+					this.$store.commit('isAuthCertificationEnterprise', state => {
+						this.$utils.navigateTo('/pages_order/work/jobPosting')
+					})
 				}else{
 					this.$utils.navigateTo('/pages_order/work/addResume')
 				}
 			},
 			search(){
 				this.$utils.navigateTo(`/pages_order/work/workList?keyword=${this.keyword}`)
+				this.keyword = ''
 			},
 			// 切换身份
 			async switchIdentity(){
-				this.$store.commit('getUserExtensionInfo')
 				
 				// 在完成实名认证的情况下执行
 				this.$store.commit('isAuthCertification', () => {
diff --git a/pages/index/keepAccounts.vue b/pages/index/keepAccounts.vue
index 6b69cce..9ea5aa3 100644
--- a/pages/index/keepAccounts.vue
+++ b/pages/index/keepAccounts.vue
@@ -164,11 +164,11 @@
 				statusList : [
 					{
 						name : '在建',
-						value : 0,
+						value : '0',
 					},
 					{
 						name : '结束',
-						value : 1,
+						value : '1',
 					},
 				],
 				show: false,
@@ -176,7 +176,7 @@
 				addOrUpdate : false,
 				form : {
 					title : '',
-					status : 0,
+					status : '0',
 				},
 			}
 		},
@@ -207,14 +207,14 @@
 				this.form.type = this.queryParams.type
 				
 				this.$api('addNoteBook', this.form, res => {
+					this.show = false
 					if(res.code == 200){
-						this.show = false
 						this.form = {
 							title : '',
-							status : 0,
+							status : '0',
 						}
-						this.getData()
 					}
+					this.getData()
 				})
 			},
 			openUpdate(item){
diff --git a/pages_order/kepp/MechanicProblem.vue b/pages_order/kepp/MechanicProblem.vue
index a59acbc..893b298 100644
--- a/pages_order/kepp/MechanicProblem.vue
+++ b/pages_order/kepp/MechanicProblem.vue
@@ -11,7 +11,8 @@
 
 			<view class="relation">
 				<view>如有疑问请联系客服：</view>
-				<view style="color: #4280FD;">4008-678-918</view>
+				<view style="color: #4280FD;"
+				@click="$refs.customerServicePopup.open()">{{ configList.config_service_phone }}</view>
 			</view>
 
 			<view class="bottom">
@@ -20,6 +21,8 @@
 				</view>
 			</view>
 		</view>
+		
+		<customerServicePopup ref="customerServicePopup"/>
 	</view>
 </template>
 
diff --git a/pages_order/mine/GainPoints.vue b/pages_order/mine/GainPoints.vue
index e024b0c..fe5b7b2 100644
--- a/pages_order/mine/GainPoints.vue
+++ b/pages_order/mine/GainPoints.vue
@@ -10,7 +10,13 @@
 					<view>签到得积分</view>
 				</view>
 				<view class="txt">签到得积分可立即领取</view>
-				<view class="button">领取</view>
+				<view class="uni-uncolor-btn" 
+				v-if="UserExtensionInfo.signFlag">已领取</view>
+				
+				<view class="button" 
+				@click="checkin"
+				v-else>领取</view>
+				
 				<view style="height: 40rpx;" />
 			</view>
 			<view class="card">
@@ -23,23 +29,55 @@
 					个正式积分。
 					<view style="color: red;">多邀多得！可叠加！</view>
 				</view>
-				<view class="button" @click="$utils.navigateTo('/pages_order/mine/InvitationCredit')">邀请</view>
+				
+				<button
+				open-type="share"
+				class="share button">
+					邀请
+				</button>
+				
+				<!-- <view class="button" 
+				@click="$utils.navigateTo('/pages_order/mine/InvitationCredit')"
+				>邀请</view> -->
+				
 				<view style="height: 40rpx;" />
 			</view>
 		</view>
-		<view class="service">如有疑问请联系客服：<text>4008-678-918</text></view>
+		
+		<view class="service">如有疑问请联系客服：<text
+		style="color: #4280FD;"
+		@click="$refs.customerServicePopup.open()"
+		>{{ configList.config_service_phone }}</text></view>
+		
+		<customerServicePopup ref="customerServicePopup"/>
 	</view>
 </template>
 
 <script>
+	import { mapState } from 'vuex'
 	export default {
 		data() {
 			return {
-
+				
 			}
 		},
+		computed : {
+			...mapState(['UserExtensionInfo']),
+		},
+		onLoad() {
+			this.$store.commit('getUserExtensionInfo')
+		},
 		methods: {
-
+			checkin(){
+				this.$api('addScoreBySign', res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '签到成功'
+						})
+						this.$store.commit('getUserExtensionInfo')
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -80,6 +118,7 @@
 				}
 
 				.button {
+					all: unset;
 					text-align: center;
 					background-color: #3796F8;
 					color: #fff;
diff --git a/pages_order/mine/IntegralRecord.vue b/pages_order/mine/IntegralRecord.vue
index f8f1f2d..be6f0a9 100644
--- a/pages_order/mine/IntegralRecord.vue
+++ b/pages_order/mine/IntegralRecord.vue
@@ -32,6 +32,7 @@
 			<view class="tab-box1" v-if="total">
 				<uv-cell center border :title="item.title"
 				v-for="(item, index) in list"
+				:key="index"
 				:value="x[item.type] + item.score" :label="item.createTime" />
 			</view>
 			<view 
diff --git a/pages_order/mine/InvitationCredit.vue b/pages_order/mine/InvitationCredit.vue
index 39613a5..2c27e7e 100644
--- a/pages_order/mine/InvitationCredit.vue
+++ b/pages_order/mine/InvitationCredit.vue
@@ -10,7 +10,8 @@
 					<view>您当前的正式积分</view>
 				</view>
 				<view class="TopBlock-balance">100</view>
-				<view class="TopBlock-button">
+				<view class="TopBlock-button"
+				@click="$utils.navigateTo('/pages_order/mine/IntegralRecord')">
 					<view>积分明细</view>
 				</view>
 			</view>
@@ -94,12 +95,19 @@
 </template>
 
 <script>
+	import { mapState } from 'vuex'
 	export default {
 		data() {
 			return {
 
 			}
 		},
+		onLoad() {
+			this.$store.commit('getUserExtensionInfo')
+		},
+		computed : {
+			...mapState(['UserExtensionInfo']),
+		},
 		methods: {
 
 		}
diff --git a/pages_order/mine/MemberRecharge.vue b/pages_order/mine/MemberRecharge.vue
index 2bb0f24..0d6589c 100644
--- a/pages_order/mine/MemberRecharge.vue
+++ b/pages_order/mine/MemberRecharge.vue
@@ -18,12 +18,12 @@
 					手机号：{{userInfo.phone}}
 				</view>
 				<!-- <view>
-					{{numInfo.vipType}}
+					{{UserExtensionInfo.vipType}}
 				</view> -->
 			</view>
 		</view>
 
-		<view class="openvip">{{numInfo.vipType}}</view>
+		<view class="openvip">{{UserExtensionInfo.vipType}}</view>
 
 		<view class="options">
 			<view @click="vipId = item.id" 
@@ -61,12 +61,21 @@
 			</view>
 			<view class="tail">
 				<view>
-					<uv-radio-group v-model="radiovalue">
-						<uv-radio size="30rpx">
-						</uv-radio>
-					</uv-radio-group>
+					<uv-checkbox-group v-model="checkboxValue">
+						<uv-checkbox
+							size="40rpx"
+							icon-size="30rpx"
+							activeColor="#3796F8"
+							:name="1"
+						></uv-checkbox>
+					</uv-checkbox-group>
 				</view>
-				<view>开通前请阅读《会员服务协议》</view>
+				
+				<!-- 缺失会员服务协议 -->
+				<view>开通前请阅读<text
+				style="color: #3796F8;"
+				@click="$refs.configPopup.open('')"
+				>《会员服务协议》</text></view>
 			</view>
 		</view>
 
@@ -75,14 +84,14 @@
 				<view>
 					总计金额：￥{{ vip.price }}
 				</view>
-				<view @click="submit(vip.id)">
+				<view @click="submit(vipId)">
 					确认协议并支付
 				</view>
 			</view>
 		</view>
+		
+		<configPopup ref="configPopup"/>
 	</view>
-
-
 </template>
 
 <script>
@@ -94,29 +103,21 @@
 		mixins: [mixinList],
 		data() {
 			return {
-				radiovalue: false,
+				checkboxValue : [],
 				mixinsListApi: 'commonQueryVipType',
 				vipId: '',
-				numInfo: {}
 			}
 		},
 		onShow() {
 			this.$store.commit('getUserInfo')
 			//判断如果是登录状态则获取信息
-			this.getUserCenterData();
+			this.$store.commit('getUserExtensionInfo')
 		},
 		computed: {
+			...mapState(['UserExtensionInfo']),
 			headImage() {
 				return '/static/image/center/headImage.png'
 			},
-			//获取个人中心基础信息的接口
-			getUserCenterData() {
-				this.$api('getUserCenterData', {}, res => {
-					if (res.code == 200) {
-						this.numInfo = res.result
-					}
-				})
-			},
 			vip() {
 				let vip = {}
 				this.list.forEach(n => {
@@ -138,31 +139,39 @@
 		},
 		methods: {
 			submit(id) {
+				if(!this.checkboxValue.length){
+					return uni.showToast({
+						title: '请先同意会员服务协议',
+						icon:'none'
+					})
+				}
 				console.log("当前标识:" + id)
 				this.$api('addVIP', {
 					id: id
 				}, res => {
-					uni.requestPayment({
-						provider: 'wxpay', // 服务提提供商
-						timeStamp: res.result.timeStamp, // 时间戳
-						nonceStr: res.result.nonceStr, // 随机字符串
-						package: res.result.packageValue,
-						signType: res.result.signType, // 签名算法
-						paySign: res.result.paySign, // 签名
-						success: function(res) {
-							console.log('支付成功', res);
-							self.$refs.confirmationPopupUpload.open()
-							// self.$refs.confirmationPopup.close()
-						},
-						fail: function(err) {
-							console.log('支付失败', err);
-							self.$refs.confirmationPopup.close()
-							uni.showToast({
-								icon: 'none',
-								title: "支付失败"
-							})
-						}
-					});
+					if(res.code == 200){
+						uni.requestPayment({
+							provider: 'wxpay', // 服务提提供商
+							timeStamp: res.result.timeStamp, // 时间戳
+							nonceStr: res.result.nonceStr, // 随机字符串
+							package: res.result.packageValue,
+							signType: res.result.signType, // 签名算法
+							paySign: res.result.paySign, // 签名
+							success: function(res) {
+								console.log('支付成功', res);
+								self.$refs.confirmationPopupUpload.open()
+								// self.$refs.confirmationPopup.close()
+							},
+							fail: function(err) {
+								console.log('支付失败', err);
+								self.$refs.confirmationPopup.close()
+								uni.showToast({
+									icon: 'none',
+									title: "支付失败"
+								})
+							}
+						});
+					}
 				})
 			},
 			getDataThen(list) {
@@ -254,7 +263,7 @@
 			}
 
 			.act {
-				border: 4rpx solid $uni-color;
+				border: 2rpx solid $uni-color;
 				box-shadow: 0 0 10rpx 10rpx rgba($uni-color, 0.2);
 			}
 		}
diff --git a/pages_order/mine/contactRecord.vue b/pages_order/mine/contactRecord.vue
index bd5dcc2..8924456 100644
--- a/pages_order/mine/contactRecord.vue
+++ b/pages_order/mine/contactRecord.vue
@@ -8,7 +8,7 @@
 		@leftClick="$utils.navigateBack"/>
 		
 		<view class="">
-			<uv-tabs :list="tabs"
+			<uv-tabs :list="tabsList"
 			lineColor="#3796F8"
 			lineHeight="8rpx"
 			lineWidth="50rpx"
@@ -53,7 +53,7 @@
 		},
 		data() {
 			return {
-				tabs: [
+				tabsList: [
 					{
 						name: '我看过谁'
 					},
diff --git a/pages_order/mine/promotion.vue b/pages_order/mine/promotion.vue
index 5d674ad..6ab59f4 100644
--- a/pages_order/mine/promotion.vue
+++ b/pages_order/mine/promotion.vue
@@ -183,7 +183,7 @@
 			border-radius: 15rpx;
 			padding: 40rpx 30rpx;
 			box-sizing: border-box;
-
+			background-color: #fff;
 			.user-info {
 				display: flex;
 				align-items: center;
diff --git a/pages_order/mine/setting.vue b/pages_order/mine/setting.vue
index f0cfab9..0db5fb0 100644
--- a/pages_order/mine/setting.vue
+++ b/pages_order/mine/setting.vue
@@ -33,7 +33,7 @@
 					</template>
 				</uv-cell>
 				
-				<uv-cell
+				<!-- <uv-cell
 				icon="coupon" 
 				title="修改密码"
 				isLink
@@ -43,7 +43,7 @@
 						<image src="../static/setting/1.png" mode=""
 						style="width: 30rpx;height: 30rpx;"></image>
 					</template>
-				</uv-cell>
+				</uv-cell> -->
 				
 				
 			</view>
diff --git a/pages_order/work/addResume.vue b/pages_order/work/addResume.vue
index 1cffc5e..d37fd6b 100644
--- a/pages_order/work/addResume.vue
+++ b/pages_order/work/addResume.vue
@@ -278,7 +278,7 @@
 			},
 			queryResumeByUserId(){
 				this.$api('queryResumeByUserId', res => {
-					if(res.code == 200 && res.result){
+					if(res.code == 200 && res.result && res.result.records[0]){
 						this.form = res.result.records[0]
 						
 						if(res.result.records[0]!=null){
diff --git a/store/store.js b/store/store.js
index ee1a5b4..90406b4 100644
--- a/store/store.js
+++ b/store/store.js
@@ -10,7 +10,7 @@ const store = new Vuex.Store({
 	state: {
 		configList: {}, //配置列表
 		// 角色 true为老板 false为工人
-		role : true,
+		role : false,
 		userInfo : {}, //用户信息
 		banner : [],//轮播图
 		jobTypeList : [],//工种