岗位切换问题处理

components/uni-datetime-picker/uni-datetime-picker.vue

@@ -240,7 +240,7 @@
 			},
 			},
 			clearIcon: {
 			clearIcon: {
 				type: [Boolean],
 				type: [Boolean],
-				default: true
+				default: false
 			},
 			},
 			hideSecond: {
 			hideSecond: {
 				type: [Boolean],
 				type: [Boolean],

pagesSub/mine/changeCompany/changeCompany.vue

@@ -128,7 +128,20 @@
 					let result = res.data
 					let result = res.data
 					if (result.code == 0) {
 					if (result.code == 0) {
 						// this.getUserInfo()
 						// this.getUserInfo()
-						this.switchJob()
+						uni.setStorageSync("token", result.data.access_token)
+						uni.setStorageSync("short_token", result.data.short_token)
+						uni.setStorageSync("user_info", result.data)
+						uni.setStorageSync("company_id", result.data.comp_id)
+						uni.setStorageSync("org_no", result.data.org_no)
+						uni.setStorageSync("org_id", result.data.org_id)
+						if (this.currentJob.job_id != result.data.job_id) {
+							this.switchJob()
+						} else {
+							getApp().globalData.isInit = true
+							uni.switchTab({
+								url: "/pages/index/index"
+							})
+						}
 					} else {
 					} else {
 						this.$toast.showToast(result.msg)
 						this.$toast.showToast(result.msg)
 					}
 					}

pagesSub/mine/changeOrg/changeOrg.vue

@@ -106,7 +106,7 @@
 					content: '确定切换到该组织？',
 					content: '确定切换到该组织？',
 					showCancel: true,
 					showCancel: true,
 					confirmText: "切换",
 					confirmText: "切换",
-					confirmColor: '#1890FF',
+					confirmColor: '#3B73FE',
 					success: res => {
 					success: res => {
 						if (res.confirm) {
 						if (res.confirm) {
 							that.switchOrg(node[0])
 							that.switchOrg(node[0])

pagesSub/mine/historyScore/historyScore.vue

@@ -69,6 +69,7 @@
 				uni.showModal({
 				uni.showModal({
 					title: '提示',
 					title: '提示',
 					content: '是否取消兑换',
 					content: '是否取消兑换',
+					confirmColor: '#3B73FE',
 					success: (res) => {
 					success: (res) => {
 						if (res.confirm) {
 						if (res.confirm) {
 							Api.cancelExchange({
 							Api.cancelExchange({
@@ -94,6 +95,7 @@
 				uni.showModal({
 				uni.showModal({
 					title: '提示',
 					title: '提示',
 					content: '是否确认领取',
 					content: '是否确认领取',
+					confirmColor: '#3B73FE',
 					success: (res) => {
 					success: (res) => {
 						if (res.confirm) {
 						if (res.confirm) {
 							Api.confirmReceive({
 							Api.confirmReceive({

pagesSub/mine/scoreDetail/scoreDetail.vue

@@ -27,7 +27,7 @@
 				<view class="score-item" @click="toExcahngeDetail">
 				<view class="score-item" @click="toExcahngeDetail">
 					<view class="s-left">
 					<view class="s-left">
 						<text class="name">已兑换积分</text>
 						<text class="name">已兑换积分</text>
-						<text class="score">{{scoreDetail.his_integral || 0}}</text>
+						<text class="score">{{scoreDetail.ex_integral || 0}}</text>
 					</view>
 					</view>
 					<image src="../../../static/s-arrow-left-ic.png" class="image"></image>
 					<image src="../../../static/s-arrow-left-ic.png" class="image"></image>
 				</view>
 				</view>