20260305更新

index_fenbao/GuanLi/XiangQing.vue

@@ -142,7 +142,11 @@
 					<view class="mn_text">{{ item.title }}</view>
 				</view>
 			</view>
+			
 		</view>
+		<view class="box-guanzhu3" v-if="loginShow">
+				<view class="guanzhu-1" @click="loginPopUp()">点击登录，获取更多资讯</view>
+			</view>
 	</view>
 </template>
 
@@ -154,12 +158,28 @@ export default {
 			list: [],
 			association: [],
 			showadmin: false,
+			id:0,
+			loginShow:false,
 			imageList: ['https://huli-app.wenlvti.net/app_static/WenWuGuanJia/image/sh_lb1.jpg']
 		};
 	},
 	onLoad(e) {
 		that = this;
-		this.getContentDetail(e.id);
+		this.id =e.id;
+		// this.getContentDetail(e.id);
+	},
+	onShow() {
+		this.user = this.$common.userInfo();
+		if (this.user === 'undefined' || this.user === '' || this.user === [] || this.user === null || this.user === false) {
+			/* 跳转到登录页 */
+			this.loginShow=true;
+			// this.$common.toLogin();
+		} else {
+			// console.log(this.user);
+			// 如果登录自动打卡
+			this.loginShow=false;
+		this.getContentDetail(that.id);
+		}
 	},
 	computed: {
 		citySection() {
@@ -199,7 +219,7 @@ export default {
 
 					let auth = that.$common.userInfo();
 					//获取用户权限
-					if (!(auth === 'undefined' || auth === '' || auth === [] || auth === null) && auth.token !== 'undefined') {
+					if (!(auth === 'undefined' || auth === '' || auth === [] || auth === null || auth === false) && auth.token !== 'undefined') {
 						that.$api.userManageCrAuth(
 							{
 								main_body_id: 1,
@@ -216,6 +236,9 @@ export default {
 				}
 			);
 		},
+		loginPopUp(){
+			this.$common.toLogin();
+		},
 		// 图片预览
 		clickImg(index) {
 			// console.log(index, 555);
@@ -340,4 +363,22 @@ export default {
 	/* 	width: 260rpx;
 	height: 182rpx; */
 }
+.box-guanzhu3{
+	background-image: linear-gradient(160deg, rgba(162, 255, 146, 1.0) 0, rgba(84, 218, 255, 1.0) 100%);
+	border-radius: 52rpx;
+	height: 55rpx;
+	display: flex;
+	flex-direction: row;
+	justify-self: center;
+	width: 80%;
+	position: fixed;
+	bottom: 95rpx;
+	right: 66rpx;
+	z-index: 992;
+}
+.guanzhu-1{
+	flex-grow: 5;
+	text-align: center;
+	margin-top: 10rpx;
+}
 </style>

index_fenbao/fuWu/baoMing/baoMing2.vue

@@ -36,9 +36,7 @@
 				<uni-forms-item label="您的身份证" label-width="100px" required name="id_card">
 					<uni-easyinput type="idcard" v-model="valiFormData.id_card" placeholder="请输入身份证号" />
 				</uni-forms-item>
-				<uni-forms-item label="您的区域" label-width="100px" required name="id_card">
-					<uni-data-picker :localdata="regionList" popup-title="请选择班级" @change="onchange" @nodeclick="onnodeclick"></uni-data-picker>
-				</uni-forms-item>
+				
 				<uni-forms-item label="住址" label-width="100px" required name="address">
 					<uni-easyinput v-model="valiFormData.address" placeholder="请输入住址" />
 				</uni-forms-item>
@@ -78,19 +76,21 @@
 					]" multiple="true" />
 				</view>
 			</uni-forms-item>
-			
+			<uni-forms-item label="您的选择" label-width="100px" required name="id_card">
+				<uni-data-picker :localdata="regionList" placeholder="请选择地区" popup-title="请选择所在地区" @change="onchange" @nodeclick="onnodeclick"></uni-data-picker>
+			</uni-forms-item>
 			<!-- 本人承诺 -->
 				<uni-forms-item label="本人承诺" label-width="100px" required name="commitment" >
 					<view class="commitment-text">
 						本人保证以上所填信息真实、有效，如有虚假，由此产生的一切后果由本人承担。
 					</view>
-          <view style="background-color: #fdfaf6;">
-            <uni-data-checkbox v-model="valiFormData.commitment" :localdata="[
-              {value: 1, text: '我已阅读并同意以上承诺'},
-              {value: 0, text: '不同意'}
-            ]" />
-          </view>
-        </uni-forms-item>
+				  <view style="background-color: #fdfaf6;">
+					<uni-data-checkbox v-model="valiFormData.commitment" :localdata="[
+					  {value: 1, text: '我已阅读并同意以上承诺'},
+					  {value: 0, text: '不同意'}
+					]" />
+				  </view>
+				</uni-forms-item>
 			</uni-forms>
 		</view>
 		<view class="text-wrapper_3" @click="submit('valiForm')">

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "文物管家",
-    "appid" : "__UNI__A1BB0F7",
+    "appid" : "__UNI__630FB2B",
     "description" : "文物管家",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/index/index.vue

@@ -102,7 +102,7 @@
 				<image style="margin-left: 10rpx; width: 40rpx; height: 40rpx" src="/static/img/more.png"></image>
 			</view>
 		</view> -->
-
+		
 		<!-- 经典文物 -->
 		<view class="map_tit" style="margin-left: 90rpx">
 			<image style="width: 211rpx; height: 52rpx" src="/static/img/right_img.png"></image>
@@ -125,6 +125,9 @@
 			</view>
 		</view>
 		<u-back-top :scrollTop="scrollTop" mode="square" top="1000" customStyle="background-color: #f1ceb4" :iconStyle="iconStyle"></u-back-top>
+		<view class="box-guanzhu3" v-if="loginShow">
+				<view class="guanzhu-1" @click="loginPopUp()">点击登录，获取更多资讯</view>
+			</view>
 	</view>
 </template>
 
@@ -148,6 +151,7 @@ export default {
 			isLoading2: false,
 			recommendList: [],
 			swiperList: [],
+			loginShow:false,
 			menuList: [
 				{
 					image: '/static/img/cd_bg2.png',
@@ -192,23 +196,26 @@ export default {
 		this.page2 = 1;
 		that.information = [];
 		this.gitRankingList();
-	},
-	onLoad(option) {
-		that = this;
 		this.user = this.$common.userInfo();
-		if (this.user === 'undefined' || this.user === '' || this.user === [] || this.user === null) {
+		if (this.user === 'undefined' || this.user === '' || this.user === [] || this.user === null || this.user === false) {
 			/* 跳转到登录页 */
-			this.$common.toLogin();
+			this.loginShow=true;
+			// this.$common.toLogin();
 		} else {
 			// console.log(this.user);
 			// 如果登录自动打卡
+			this.loginShow=false;
 			this.checkInOnce();
 		}
+	},
+	onLoad(option) {
+		that = this;
+		
 		this.getIndexBanner();
 		this.getContentList();
 		this.getCategoryOnlyChildList();
 		this.getNewsNotice();
-		// this.checkInOnce()
+		// // this.checkInOnce()
 		this.activityLists();
 		this.loadGlobalFont();
 	},
@@ -218,6 +225,9 @@ export default {
 				url: '/index_fenbao/XuanJiangYuan/index'
 			});
 		},
+		loginPopUp(){
+			this.$common.toLogin();
+		},
 		// 轮播
 		getIndexBanner() {
 			this.$api.getIndexBanner({ main_body_id: 1 }, function (res) {
@@ -668,4 +678,22 @@ export default {
 /deep/.u-notice-bar.data-v-6862e5d8 {
 	border: 2rpx solid #ebc9a9;
 }
+.box-guanzhu3{
+	background-image: linear-gradient(160deg, rgba(162, 255, 146, 1.0) 0, rgba(84, 218, 255, 1.0) 100%);
+	border-radius: 52rpx;
+	height: 55rpx;
+	display: flex;
+	flex-direction: row;
+	justify-self: center;
+	width: 80%;
+	position: fixed;
+	bottom: 95rpx;
+	right: 66rpx;
+	z-index: 992;
+}
+.guanzhu-1{
+	flex-grow: 5;
+	text-align: center;
+	margin-top: 10rpx;
+}
 </style>

pages/shouhu/shouhu.vue

@@ -212,6 +212,9 @@
 				<view @click="goSignUp" class="bt2">去报名</view>
 			</view>
 		</u-popup>
+		<view class="box-guanzhu3" v-if="loginShow">
+				<view class="guanzhu-1" @click="loginPopUp()">点击登录，获取更多资讯</view>
+			</view>
 	</view>
 </template>
 
@@ -228,6 +231,7 @@ export default {
 			volhow: false /* 非志愿者弹层 */,
 			volunteerShow: false /* 是否是志愿者控制页面去报名弹层 */,
 			Tab: 0,
+			loginShow:false,
 			show: false,
 			latitudeAndLongitude: {
 				latitude: '',
@@ -270,9 +274,24 @@ export default {
 	},
 	onLoad() {
 		that = this;
-		this.loadGlobalFont();
+		
 	},
 
+	onShow() {
+		
+		this.loadGlobalFont();
+		this.user = this.$common.userInfo();
+		if (this.user === 'undefined' || this.user === '' || this.user === [] || this.user === null || this.user === false) {
+			/* 跳转到登录页 */
+			this.loginShow=true;
+			// this.$common.toLogin();
+		} else {
+			// console.log(this.user);
+			// 如果登录自动打卡
+			this.loginShow=false;
+			this.details();
+		}
+	},
 	filters: {
 		completedBtn(t) {
 			let s = that.getitem(t);
@@ -282,9 +301,6 @@ export default {
 	beforeCreate() {
 		that = this;
 	},
-	onShow() {
-		this.details();
-	},
 	methods: {
 		// 根据任务状态控制字体颜色
 		getTextColor(index) {
@@ -304,6 +320,9 @@ export default {
 			}
 		},
 
+		loginPopUp(){
+			this.$common.toLogin();
+		},
 		// 已完成
 		getitem(t) {
 			let s = {
@@ -855,4 +874,22 @@ export default {
 	line-height: 78rpx;
 	color: #ffffff;
 }
+.box-guanzhu3{
+	background-image: linear-gradient(160deg, rgba(162, 255, 146, 1.0) 0, rgba(84, 218, 255, 1.0) 100%);
+	border-radius: 52rpx;
+	height: 55rpx;
+	display: flex;
+	flex-direction: row;
+	justify-self: center;
+	width: 80%;
+	position: fixed;
+	bottom: 95rpx;
+	right: 66rpx;
+	z-index: 992;
+}
+.guanzhu-1{
+	flex-grow: 5;
+	text-align: center;
+	margin-top: 10rpx;
+}
 </style>

pages/user/index.vue

@@ -52,7 +52,9 @@
 				<view class="">客服电话：18050125110</view>
 			</view>
 		</view>
-
+		<view class="box-guanzhu3" v-if="loginShow">
+				<view class="guanzhu-1" @click="loginPopUp()">点击登录，获取更多资讯</view>
+			</view>
 		<u-modal :show="modifyShow" title="修改昵称和头像" @close="modifyShow = false" :showCancelButton="true" @cancel="modifyShow = false" @confirm="isOk">
 			<view class="slot-content" style="text-align: center">
 				<view>
@@ -76,6 +78,7 @@
 				</view> -->
 			</view>
 		</u-modal>
+		
 	</view>
 </template>
 <script>
@@ -87,6 +90,8 @@ export default {
 		return {
 			modifyShow: false /*修改资料  */,
 			face: '',
+			
+			loginShow:false,
 			mainBodyUserInfo: {
 				nickname: '',
 				avatar: 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
@@ -144,38 +149,43 @@ export default {
 		if (this.user && this.user.nickname.indexOf('微信') >= 0) {
 			this.getFace = true;
 		}
-	},
-	onLoad(option) {
-		/* 来到我的页面判断用户是否登录 */
-		_this = this;
-		this.user = this.$common.userInfo();
 		this.mainBodyUserInfo = this.$db.get('mainBodyUserInfo');
 		// console.log(this.user);
-		if (this.user === 'undefined' || this.user === '' || this.user === [] || this.user === null) {
+		if (this.user === 'undefined' || this.user === '' || this.user === [] || this.user === null || this.user === false) {
 			/* 跳转到登录页 */
-			//this.$common.toLogin();
+			// this.$common.toLogin();
+			this.loginShow=true;
 		} else {
 			/* 刷新 */
-			this.$api.refreshUser(
-				{
-					main_body_id: 1
-				},
-				(val) => {
-					console.log(val, 999);
-					if (val.code == 401) {
-						this.$common.navigateTo('/pages/user/login');
-						return;
+			if(this.loginShow){
+				this.$api.refreshUser(
+					{
+						main_body_id: 1
+					},
+					(val) => {
+						console.log(val, 999);
+						if (val.code == 401) {
+							this.$common.navigateTo('/pages/user/login');
+							return;
+						}
+						this.user = val.data.user;
+						// this.avatarUrl = this.user.avatar;
+						this.auth = val.data.auth;
+						this.$db.set('user', val.data.user);
+						this.$db.set('auth', val.data.auth);
+						_this.$db.set('mainBodyUserInfo', val.data.mainBodyUserInfo);
+						this.mainBodyUserInfo = this.$db.get('mainBodyUserInfo');
+						this.loginShow=false;
 					}
-					this.user = val.data.user;
-					// this.avatarUrl = this.user.avatar;
-					this.auth = val.data.auth;
-					this.$db.set('user', val.data.user);
-					this.$db.set('auth', val.data.auth);
-					_this.$db.set('mainBodyUserInfo', val.data.mainBodyUserInfo);
-					this.mainBodyUserInfo = this.$db.get('mainBodyUserInfo');
-				}
-			);
+				);
+			}
+			
 		}
+	},
+	onLoad(option) {
+		/* 来到我的页面判断用户是否登录 */
+		_this = this;
+		
 		// this.getMainBodyUser()
 	},
 
@@ -186,6 +196,9 @@ export default {
 		// 		console.log(res,78787878)
 		// 	})
 		// },
+		loginPopUp(){
+			this.$common.toLogin();
+		},
 		handleTopBoxClick() {
 			// 检查登录状态
 			this.user = this.$common.userInfo();
@@ -389,4 +402,22 @@ button {
 	-webkit-background-clip: text;
 	-webkit-text-fill-color: transparent;
 }
+.box-guanzhu3{
+	background-image: linear-gradient(160deg, rgba(162, 255, 146, 1.0) 0, rgba(84, 218, 255, 1.0) 100%);
+	border-radius: 52rpx;
+	height: 55rpx;
+	display: flex;
+	flex-direction: row;
+	justify-self: center;
+	width: 80%;
+	position: fixed;
+	bottom: 95rpx;
+	right: 66rpx;
+	z-index:999;
+}
+.guanzhu-1{
+	flex-grow: 5;
+	text-align: center;
+	margin-top: 10rpx;
+}
 </style>

pages/user/login.vue

@@ -254,9 +254,7 @@ export default {
 								} catch (e) {
 									console.log('e: ', e);
 								}
-								uni.switchTab({
-									url: '/pages/index/index'
-								});
+								uni.navigateBack();
 								if (this.redirect != '') {
 									console.log(this.redirect);
 									if (this.redirect.indexOf('%2F') > 0) {

pages/wenWuPage/wenWuPage.vue

@@ -19,6 +19,9 @@
 		</view>
 
 		<view style="width: 92%; margin: auto">
+			<view class="box-guanzhu3" v-if="loginShow">
+					<view class="guanzhu-1" @click="loginPopUp()">点击登录，获取更多资讯</view>
+				</view>
 			<!-- 		<view class="ranking_menu">
 				<scroll-view scroll-x style="display: flex; white-space: nowrap" class="">
 					<view @click="menuTab(index)" v-for="(item, index) in menuList" :key="item.index" class="ranking_item" :class="{ active: tab == index }">
@@ -143,17 +146,32 @@ export default {
 			tab: 11,
 			swiperList: [],
 			menuList: [],
+			loginShow:false,
 			characterList: [] /*人物 */,
 			recommendList: [] /* 文物 */,
 			CulturalRelics: [] /* 文物故事 */,
 			CulturalVideo: [] /* 文物视频 */
+			
 		};
 	},
 
 	onLoad(option) {
 		that = this;
-		this.getCategoryOnlyChildList();
+		
+	},
+	onShow() {
+		this.user = this.$common.userInfo();
+		if (this.user === 'undefined' || this.user === '' || this.user === [] || this.user === null || this.user === false) {
+			/* 跳转到登录页 */
+			this.loginShow=true;
+			// this.$common.toLogin();
+		} else {
+			// console.log(this.user);
+			// 如果登录自动打卡
+			this.loginShow=false;
 		this.getMainBodyColumnContentList();
+		}
+		this.getCategoryOnlyChildList();
 		this.getContentList();
 		this.getrelicList();
 		this.loadGlobalFont();
@@ -168,6 +186,9 @@ export default {
 				});
 			});
 		},
+		loginPopUp(){
+			this.$common.toLogin();
+		},
 		getCategoryOnlyChildList() {
 			this.$api.getCategoryOnlyChildList({ main_body_id: 1, pid: '5' }, function (res) {
 				if (res.code == 1) {
@@ -393,4 +414,22 @@ export default {
 	z-index: 1;
 	background: linear-gradient(0deg, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0) 100%);
 }
+.box-guanzhu3{
+	background-image: linear-gradient(160deg, rgba(162, 255, 146, 1.0) 0, rgba(84, 218, 255, 1.0) 100%);
+	border-radius: 52rpx;
+	height: 55rpx;
+	display: flex;
+	flex-direction: row;
+	justify-self: center;
+	width: 80%;
+	position: fixed;
+	bottom: 95rpx;
+	right: 66rpx;
+	z-index: 92;
+}
+.guanzhu-1{
+	flex-grow: 5;
+	text-align: center;
+	margin-top: 10rpx;
+}
 </style>