ソースを参照

调整图片url

littleblue55 1 週間 前
コミット
1e1c3dabe6

+ 26 - 0
api/report.js

@@ -54,4 +54,30 @@ export function getReportDetail(id){
 		},
 		'method': 'get'
 	})
+}
+
+export function reportFavi(id){
+	return request({
+		url: '/report/favi',
+		headers: {
+			isToken: true
+		},
+		data: {
+			id
+		},
+		'method': 'post'
+	})
+}
+
+export function cancelReportFavi(id){
+	return request({
+		url: '/report/favi',
+		headers: {
+			isToken: true
+		},
+		data: {
+			id
+		},
+		'method': 'post'
+	})
 }

+ 5 - 4
components/creditCard.vue

@@ -24,7 +24,7 @@
 			</view>
 			<view class="image-item-box">
 				<view class="qrcode-box">
-					<image class="qrcode" src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/zhengshu/qrCode.png"></image>
+					<image class="qrcode" :src="`${FILE_URL}/zhengshu/qrCode.png`"></image>
 				</view>
 				<view class="text">
 					扫码查信用
@@ -66,7 +66,8 @@
 <script setup>
 	import { ref, defineProps, computed, defineEmits } from 'vue'
 	import { getToken } from '@/utils/auth.js'
-	
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	const emit = defineEmits(['guide'])
 	const props = defineProps({
 		isLogin: {
@@ -147,7 +148,7 @@
 	}
 	
 	.mini {
-		@include backgroundImg('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/zhengshu/credit-card-empty.png');
+		@include backgroundImg('http://www.gzrea.org.cn:8543/icon/wxmp/zhengshu/credit-card-empty.png');
 		padding: 15rpx 10rpx;
 		.title-box {
 			font-weight: bold;
@@ -255,7 +256,7 @@
 		background: -webkit-linear-gradient(49deg, rgba(234,252,254,1) 0%, rgba(255, 255, 255, 1) 49%, $color 100%);
 		background: -o-linear-gradient(49deg, rgba(234,252,254,1) 0%, rgba(255, 255, 255, 1) 49%, $color 100%);
 		background: -ms-linear-gradient(49deg, rgba(234,252,254,1) 0%, rgba(255, 255, 255, 1) 49%, $color 100%);
-		background: repeating-linear-gradient(49deg, rgba(234,252,254,1) 0%, rgba(255, 255, 255, 1) 49%, $color 100%), url('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/zhengshu/credit-card-perview.png');
+		background: repeating-linear-gradient(49deg, rgba(234,252,254,1) 0%, rgba(255, 255, 255, 1) 49%, $color 100%), url('http://www.gzrea.org.cn:8543/icon/wxmp/zhengshu/credit-card-perview.png');
 		background-blend-mode: darken;
 		background-repeat: no-repeat;
 		background-size: 100% 100%;

+ 1 - 4
pages/chat/chat.vue

@@ -23,10 +23,6 @@
 		<view class="list-box">
 			<view class="list-item-box" v-for="item in list" :key="item.id" @click="onChatClick(item)">
 				<view class="main-box">
-					<!-- <view class="icon-box">
-						<cover-image class="icon" :src="`https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/chat-icon/${item.type}.png`"></cover-image>
-						<view class="tag" v-show="item.isRead"></view>
-					</view> -->
 					<view class="content-box">
 						<view class="title">
 							{{item.title}}
@@ -56,6 +52,7 @@
 	import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
 	import { query, count } from '@/api/chat.js'
 	import { useTabbarStore } from '@/store/tabbarStore.js'
+
 	const tabbarStore = useTabbarStore()
 	// 底部导航栏数据
 	const tabbarList = computed(() => {

+ 7 - 6
pages/chatDetail/chatDetail.vue

@@ -3,7 +3,7 @@
 		<view class="chat-box">
 			<view class="header-box">
 				<view class="icon-box">
-					<cover-image class="icon" :src="`https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/chat-icon/${chat.type}.png`"></cover-image>
+					<cover-image class="icon" :src="`${FILE_URL}/chat-icon/${chat.type}.png`"></cover-image>
 				</view>
 				<view class="title-box">
 					{{chat.title}}
@@ -20,17 +20,18 @@
 	import { ref } from 'vue'
 	import { onLoad } from '@dcloudio/uni-app'
 	import { detail } from '@/api/chat.js'
-	
+  import configService from '@/utils/baseurl.js'
+  const FILE_URL = configService.FILE_URL;
 	const chatId = ref()
 	const chatTitle = ref('')
-	
+
 	const chat = ref({
 		id: '1',
 		title: '课程提醒',
 		content: '尊敬的用户,您预约2023年8月16日《广州市存量房网……》直播课堂已经开始,请及时观看!',
 		createTime: '8/16',
 	})
-	
+
 	onLoad((load) => {
 		chatId.value = load.id
 		detail(chatId.value).then(res => {
@@ -51,7 +52,7 @@
 		width: 100vw;
 		background-color: $uni-bg-color;
 		padding: 0 40rpx;
-		
+
 		.chat-box {
 			padding: 20rpx;
 			background-color: $uni-text-color-inverse;
@@ -85,4 +86,4 @@
 			}
 		}
 	}
-</style>
+</style>

+ 3 - 2
pages/dynamic/dynamic/dynamic.vue

@@ -4,7 +4,7 @@
 			<view class="list-item-box" v-for="item in list" :key="item.id" @click="onDynamicClick(item)">
 				<view class="main-box">
 					<view class="icon-box">
-						<cover-image class="icon" :src="`https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/notice/icon-1.jpg`"></cover-image>
+						<cover-image class="icon" :src="`${FILE_URL}/notice/icon-1.jpg`"></cover-image>
 					</view>
 					<view class="content-box">
 						<view class="title">
@@ -31,7 +31,8 @@
 	import { onLoad } from '@dcloudio/uni-app'
 	import { getDynamicList } from '@/api/notice.js'
 	const uToast = ref()
-	
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	const searchInputStyle = {
 		backgroundColor: '#E5E5E5'
 	}

+ 11 - 9
pages/goOnEdu/course/courseDetail/component/courseComment/courseComment.vue

@@ -2,7 +2,7 @@
 	<view class="tabs-content" :style="{ paddingBottom : `${props.paddingBottom || 0}rpx` }">
 		<view v-for="(comment, index) in sortedCommentList" :key="index" class="comment-list-item">
 			<view class="comment-list-left">
-				<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/weixin.png" class="comment-list-avator"></image>
+				<image :src="`${FILE_URL}/weixin.png`" class="comment-list-avator"></image>
 			</view>
 			<view class="comment-list-right">
 				<view style="margin-bottom: 15rpx;">
@@ -21,6 +21,8 @@
 		defineProps,
 		computed
 	} from 'vue'
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	const props = defineProps({
 	  paddingBottom: {
 	    type: Number,
@@ -33,20 +35,20 @@
 	    default: () => []
 	  },
 	});
-	
+
 	function formatDate(dateStr) {
 		return dateStr.replace(" ", "T");
 	}
-	
+
 	function formatTime(timeString) {
 	    const commentDate = new Date(formatDate(timeString));
 	    const now = new Date();
 	    const diff = now - commentDate;
-	
-	    const minutes = Math.floor(diff / 60000); 
-	    const hours = Math.floor(diff / 3600000); 
+
+	    const minutes = Math.floor(diff / 60000);
+	    const hours = Math.floor(diff / 3600000);
 	    const days = Math.floor(diff / 86400000);
-	
+
 	    if (minutes < 1) { // 修改这里以处理0分钟
 	        return "刚刚";
 	    } else if (minutes < 60) {
@@ -58,9 +60,9 @@
 	    }
 	}
 
-	
+
 	const sortedCommentList = computed(() => {
-		return props.commentList.sort((a, b) => 
+		return props.commentList.sort((a, b) =>
 			new Date(formatDate(b.commentTime)) - new Date(formatDate(a.commentTime))
 		);
 	});

+ 4 - 2
pages/goOnEdu/course/courseDetail/courseOrder.vue

@@ -8,7 +8,7 @@
 				<view class="course-title">
 					<text>{{ course.courseName }}</text>
 					<image style="width: 25rpx;height: 25rpx;padding-left: 20rpx;"
-						:src="course.hasFavi ? 'https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/favi-icon.png' : 'https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/no-favi-icon.png'">
+						:src="course.hasFavi ? `${FILE_URL}/edu-icon/favi-icon.png` : `${FILE_URL}/edu-icon/no-favi-icon.png`">
 					</image>
 				</view>
 				<view class="course-type">{{ course.courseType }}</view>
@@ -98,6 +98,8 @@
 	import {
 		onLoad
 	} from '@dcloudio/uni-app'
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	const courseId = ref("");
 	const course = ref({})
 	const price = ref(0)
@@ -247,7 +249,7 @@
 
 			.member-free {
 				background-color: transparent;
-				background-image: url('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/bg-label.png');
+				background-image: url('http://www.gzrea.org.cn:8543/icon/wxmp/bg-label.png');
 				background-size: cover;
 				background-repeat: no-repeat;
 				color: #000;

+ 3 - 1
pages/goOnEdu/course/courseDetail/coursePay.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="pay-content">
-			<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/pay.png" class="pay-img"></image>
+			<image :src="`${FILE_URL}/edu-icon/pay.png`" class="pay-img"></image>
 			<text class="pay-text">支付成功</text>
 			<button class="play-btn" @click="toWatch">点击观看</button>
 		</view>
@@ -14,6 +14,8 @@
 <script setup>
 	import { ref } from 'vue'
 	import { onLoad } from '@dcloudio/uni-app'
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	const courseId = ref("");
 	const toWatch = () => {
 		// uni.redirectTo({

+ 4 - 2
pages/goOnEdu/course/courseHome/courseHome.vue

@@ -21,7 +21,7 @@
 						<view class="course-title">
 							<text>{{ course.courseName }}</text>
 							<image style="width: 25rpx;height: 25rpx;padding-left: 20rpx;"
-								:src="course.hasFavi ? 'https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/favi-icon.png' : 'https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/no-favi-icon.png'"
+								:src="course.hasFavi ? `${FILE_URL}/edu-icon/favi-icon.png` : `${FILE_URL}/edu-icon/no-favi-icon.png`"
 								@click.stop="collectCourse(course.id, index, course.hasFavi)">
 							</image>
 						</view>
@@ -57,6 +57,8 @@
 	import { loadCourseCate, loadCourseList, courseFavi, courseCancelFavi } from "@/api/edu.js"
 	import { useCourseStore } from "@/store/courseStore.js"
 	import { useAuthStore } from '@/store/authStore.js';
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	const courseStore = useCourseStore();
 	const authStore = useAuthStore();
 	const isMember = ref(false);
@@ -319,7 +321,7 @@
 
 			.member-free {
 				background-color: transparent;
-				background-image: url('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/bg-label.png');
+				background-image: url('http://www.gzrea.org.cn:8543/icon/wxmp/bg-label.png');
 				background-size: cover;
 				background-repeat: no-repeat;
 				color: #000;

+ 1 - 4
pages/goOnEdu/course/courseMine/mineFavi/mineFavi.vue

@@ -9,9 +9,6 @@
 					<view class="course-item-content">
 						<view class="course-title">
 							<text>{{ course.keChengMingCheng }}</text>
-							<!-- <image style="width: 25rpx;height: 25rpx;padding-left: 20rpx;"
-								:src="course.isShouCang ? 'https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/favi-icon.png' : 'https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/no-favi-icon.png'">
-							</image> -->
 						</view>
 						<view class="course-type">{{ course.keChengLeXing }}</view>
 						<view class="course-teacher">
@@ -224,7 +221,7 @@
 	
 			.member-free {
 				background-color: transparent;
-				background-image: url('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/bg-label.png');
+				background-image: url('http://www.gzrea.org.cn:8543/icon/wxmp/bg-label.png');
 				background-size: cover;
 				background-repeat: no-repeat;
 				color: #000;

+ 2 - 4
pages/goOnEdu/course/courseMine/mineRecord/mineRecord.vue

@@ -9,9 +9,7 @@
 					<view class="course-item-content">
 						<view class="course-title">
 							<text>{{ course.keChengMingCheng }}</text>
-							<!-- <image style="width: 25rpx;height: 25rpx;padding-left: 20rpx;"
-								:src="course.isShouCang ? 'https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/favi-icon.png' : 'https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/no-favi-icon.png'">
-							</image> -->
+							
 						</view>
 						<view class="course-type">{{ course.keChengLeXing }}</view>
 						<view class="course-teacher">
@@ -224,7 +222,7 @@
 	
 			.member-free {
 				background-color: transparent;
-				background-image: url('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/bg-label.png');
+				background-image: url('http://www.gzrea.org.cn:8543/icon/wxmp/bg-label.png');
 				background-size: cover;
 				background-repeat: no-repeat;
 				color: #000;

+ 0 - 13
pages/goOnEdu/course/index.vue

@@ -4,19 +4,6 @@
 			<course-home v-if="tabValue === 'courseHome'"></course-home>
 			<course-mine v-if="tabValue === 'courseMine'"></course-mine>
 		</view>
-		<!-- <view class="tabbar-block"></view>
-		<view class="tabbar">
-			<view  class="tab-item" :class="{ active: tabValue === 'courseHome' }" @click="selectTab('courseHome')">
-				<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/tabbar-icon/home-fill.png" v-if="tabValue === 'courseHome'"></image>
-				<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/tabbar-icon/home.png" v-else></image>
-				<text>首页</text>
-			</view>-
-			<view  class="tab-item" :class="{ active: tabValue === 'courseMine' }" @click="selectTab('courseMine')">
-				<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/tabbar-icon/user-s.png" v-if="tabValue === 'courseMine'"></image>
-				<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/tabbar-icon/user-line.png" v-else></image>
-				<text>我的</text>
-			</view>
-		</view> -->
 		<view class="bottom-block"></view>
 		<view class="bottom-box">
 			<view class="menu-box">

+ 4 - 2
pages/goOnEdu/index.vue

@@ -1,20 +1,22 @@
 <template>
 	<view>
 		<view class="main-btn" @click="toPage(courseUrl)">
-			<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/course.png"></image>
+			<image :src="`${FILE_URL}/edu-icon/course.png`"></image>
 			<text>培训课程</text>
 		</view>
 		<view class="main-btn" @click="toOtherApp">
-			<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/edu-icon/net.png"></image>
+			<image :src="`${FILE_URL}/edu-icon/net.png`"></image>
 			<text>网络教育</text>
 		</view>
 	</view>
 </template>
 
 <script>
+	import configService from '@/utils/baseurl.js'
 	export default {
 		data() {
 			return {
+				FILE_URL: configService.FILE_URL,
 				netAppid: "",
 				courseUrl: "/pages/goOnEdu/course/index"
 			};

+ 3 - 1
pages/guide/guide/guide.vue

@@ -5,7 +5,7 @@
 				<view class="main-box">
 					<view class="icon-box">
 						<cover-image class="icon"
-							:src="`https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/notice/icon-1.jpg`"></cover-image>
+							:src="`${FILE_URL}/notice/icon-1.jpg`"></cover-image>
 					</view>
 					<view class="content-box">
 						<view class="title">
@@ -35,6 +35,8 @@
 		onLoad
 	} from '@dcloudio/uni-app'
 	import { getGuideList } from '@/api/notice.js'
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	const uToast = ref()
 
 	const searchInputStyle = {

+ 5 - 8
pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view class="container" :style="{backgroundColor: `${backgroundColor}`}">
 		<u-navbar :is-back="false" title="" :style="{backgroundColor: `${backgroundColor}`}" :border-bottom="false">
 			<view class="slot-wrap">
-				<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/login-icon.png"
+				<image :src="`${FILE_URL}/login-icon.png`"
 					mode="aspectFit" style="width: 300rpx;"></image>
 			</view>
 		</u-navbar>
@@ -17,10 +17,6 @@
 			<u-grid :col="4" :border="false" style="margin: 10rpx 0 ;">
 				<template v-for="(item,index) in navList" :key="index">
 					<u-grid-item bg-color="none" @click="jumpToPage(item)" class="menu-item">
-						<!-- <image
-							:src="`https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/index-icon/${item.image}.png`"
-							style="height: 70rpx;width: 70rpx;">
-						</image> -->
 						<i :class="['iconfont', `${item.icon}`]" :style="{ color: `${tabbarActiveColor}` }"></i>
 						<view class="grid-text">{{item.title}}</view>
 					</u-grid-item>
@@ -143,7 +139,8 @@
 	import {
 		me
 	} from '@/api/user.js'
-	
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	import { useTabbarStore } from '@/store/tabbarStore.js'
 	const tabbarStore = useTabbarStore()
 	// 底部导航栏数据
@@ -486,7 +483,7 @@
 					padding: 15rpx 0 5rpx;
 					text-align: center;
 					width: 150rpx;
-					background-image: url('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/bg-label.png');
+					background-image: url('http://www.gzrea.org.cn:8543/icon/wxmp/bg-label.png');
 					background-size: cover;
 					background-repeat: no-repeat;
 					// background-position: center;
@@ -643,7 +640,7 @@
 	
 		.member-free {
 			padding: 10rpx 20rpx;
-			@include backgroundImg('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/bg-label.png');
+			@include backgroundImg('http://www.gzrea.org.cn:8543/icon/wxmp/bg-label.png');
 			color: $uni-text-color;
 		}
 	}

+ 1 - 1
pages/initial/initial.vue

@@ -2,7 +2,7 @@
 	<view class="app-login-page">
 		<view class="app-login">
 			<view class="app-icon u-m-b-30 ">
-				<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/login-icon.png"
+				<image src="http://www.gzrea.org.cn:8543/icon/wxmp/login-icon.png"
 					mode="aspectFit" style="height: 40px;"></image>
 			</view>
 			<view class="app-title u-m-b-60">

+ 80 - 15
pages/login/login.vue

@@ -2,7 +2,7 @@
 	<view class="app-login-page">
 		<view class="app-login">
 			<view class="app-icon mb-30">
-				<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/login-icon.png"
+				<image :src="`${FILE_URL}/login-icon.png`"
 					mode="aspectFit" style="height: 40px;"></image>
 			</view>
 			<view class="app-title mb-30">
@@ -57,14 +57,22 @@
 					<u-checkbox v-model="userBook" name="yes" shape="circle">我已阅读&#x300A;用户手册&#x300B;及隐私政策</u-checkbox>
 				</u-checkbox-group>
 			</view>
-			<!-- <u-divider bg-color="transparent" margin-bottom="30" color="#010101" border-color="#010101"
-				half-width="200">使用第三方账号登录</u-divider> -->
-			<!-- <view class="app-icon mb-30">
-				<u-button @click="handleWxLogin()" class="custom-button" style="width: 40px;" plain :hair-line="false">
-					<image src="https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/weixin.png"
+			<u-divider bg-color="transparent" margin-bottom="30" color="#010101" border-color="#010101"
+				half-width="200">使用第三方账号登录</u-divider>
+			<view class="app-icon mb-30">
+				<!-- <u-button @click="handleWxLogin()" class="custom-button" style="width: 40px;" plain :hair-line="false">
+					<image :src="`${FILE_URL}/weixin.png`"
+						mode="aspectFit" style="width: 40px;height: 40px;" />
+				</u-button> -->
+				<u-button v-if="userBook" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber" class="custom-button" style="width: 40px;" plain :hair-line="false">
+					<image :src="`${FILE_URL}/weixin.png`"
+						mode="aspectFit" style="width: 40px;height: 40px;" />
+				</u-button>
+				<u-button v-else class="custom-button" style="width: 40px;" plain :hair-line="false" @click="checkBook">
+					<image :src="`${FILE_URL}/weixin.png`"
 						mode="aspectFit" style="width: 40px;height: 40px;" />
 				</u-button>
-			</view> -->
+			</view>
 		</view>
 		<u-verification-code :seconds="seconds" ref="uCode1" @change="codeChange"></u-verification-code>
 		<u-popup v-model="show" mode="center" border-radius="10">
@@ -90,6 +98,13 @@
 				<text class="content-a">&#x300A;用户手册&#x300B;及隐私政策</text>
 			</view>
 		</u-modal>
+		<u-modal v-model="weixinUserBookModal" mask-close-able class="modal" show-cancel-button
+			:title-style="{fontWeight: 'bold'}" @confirm="confirmModalWeixin">
+			<view class="modal-content">
+				为了更好地保障你的合法权益,进行下一步前,请阅读并同意
+				<text class="content-a">&#x300A;用户手册&#x300B;及隐私政策</text>
+			</view>
+		</u-modal>
 	</view>
 </template>
 
@@ -100,7 +115,7 @@
 		checknumberCaptcha,
 		smsSend,
 		loginPhone,
-		wxLoginOpenid
+		wxLoginOpenid, wxloginPhone
 	} from "@/api/login.js"
 	import {
 		msg,
@@ -112,13 +127,16 @@
 	import {
 		encryptAESCBC
 	} from "@/utils/crypto.js"
+	import configService from '@/utils/baseurl.js'
 	export default {
 		data() {
 			return {
+				FILE_URL: configService.FILE_URL,
 				getPhoneCapt: 0,
 				canIUseGetUserProfile: false,
 				loginCode: '',
 				userBookModal: false,
+				weixinUserBookModal: false,
 				// ----验证码 start -----
 				numberCaptchaForm: {
 					numberCaptcha: '',
@@ -151,6 +169,13 @@
 				}
 				return true
 			},
+			checkWeixinUserBook(){
+				if (!this.userBook) {
+					this.weixinUserBookModal = true
+					return false;
+				}
+				return true
+			},
 			// 用户手册模拟态确认勾选
 			confirmModal() {
 				this.userBook = true;
@@ -161,6 +186,9 @@
 				// 调用相应的登录处理函数
 				(loginTypeHandler[this.loginType] || (() => {})).call(this);
 			},
+			confirmModalWeixin() {
+				this.userBook = true;
+			},
 			// 手机登录
 			async phoneLoginHandle() {
 				const {
@@ -308,7 +336,7 @@
 					this.closePopup();
 					this.$refs.uCode1.start()
 				}
-				
+
 				uni.hideLoading();
 			},
 			// 加载验证码图片
@@ -335,8 +363,8 @@
 						const { openid, sessionKey } = res.data
 					}
 				})
-				
-				
+
+
 				// try {
 				// 	// 获取code
 				// 	const code = loginRes.code;
@@ -348,15 +376,52 @@
 				// 	console.log('微信登录失败:', error);
 				// }
 			},
-			decryptPhoneNumber(e) {
-				console.log(1111, e)
+			async checkBook(){
+				let checkUserBook = await this.checkWeixinUserBook()
+				if (!this.checkWeixinUserBook()) {
+					return;
+				};
+			},
+			async decryptPhoneNumber(e){
 				if (e.detail.encryptedData) {
 					const {
 						encryptedData,
 						iv,
 						code
 					} = e.detail;
-					console.log(code)
+					const loginRes = await wx.login();
+					const wxcode = loginRes.code;
+					try{
+						const openidRes = await wxLoginOpenid({code : wxcode})
+						if(openidRes?.data){
+							const { openid, sessionKey } = openidRes.data
+							const phoneRes = await wxloginPhone({ openid, phoneCode: code})
+							const { phone, token, isNewUser } = phoneRes.data;
+							this.useAuthStore.setPhone(phone);
+							this.useAuthStore.setAuthToken(token);
+							// uni.reLaunch({
+							// 	url: "/pages/register/register?mode=refine"
+							// })
+							if(isNewUser){
+								//新用户,跳转:完善用户信息
+								// console.log("完善用户信息")
+								uni.reLaunch({
+									url: "/pages/register/register?mode=refine"
+								})
+							}else{
+								// 老用户,跳转至:首页
+								msgSuccess("授权成功!")
+								setTimeout(()=>{
+									uni.switchTab({
+										url: "/pages/index/index"
+									})
+								}, 1000)
+							}
+						}
+					}catch(err){
+						console.log("ee", err)
+					}
+					
 					// 将 encryptedData 和 iv 发送到后端进行解密
 				} else {
 					msg('取消授权手机号');
@@ -555,4 +620,4 @@
 			}
 		}
 	}
-</style>
+</style>

+ 3 - 1
pages/notice/notice/notice.vue

@@ -13,7 +13,7 @@
 			<view class="list-item-box" v-for="item in list" :key="item.id" @click="onNoticeClick(item)">
 				<view class="main-box">
 					<view class="icon-box">
-						<cover-image class="icon" :src="`https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/notice/icon-2.jpg`"></cover-image>
+						<cover-image class="icon" :src="`${FILE_URL}/notice/icon-2.jpg`"></cover-image>
 					</view>
 					<view class="content-box">
 						<view class="title">
@@ -39,6 +39,8 @@
 	import { ref } from 'vue'
 	import { onLoad } from '@dcloudio/uni-app'
 	import { getNoticeList } from '@/api/notice.js'
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	const uToast = ref()
 	
 	const searchInputStyle = {

+ 7 - 7
pages/personalCenter/personalCenter.vue

@@ -253,7 +253,7 @@
 		date: '2018年6月22日',
 		publisher: '广州市住房和城乡建设委员会',
 		photo: 'https://ok.166.net/reunionpub/1_20210628_17a5105e667995566.jpeg',
-		qrCode: 'https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/zhengshu/qrCode.png'
+		qrCode: 'http://www.gzrea.org.cn:8543/icon/wxmp/zhengshu/qrCode.png'
 	})
 	function onShowCreditCard(valid) {
 		showCreditCard.value = false
@@ -469,23 +469,23 @@
 				
 				.zhongjie-back {
 					z-index: 999;
-					@include backgroundImg('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/zhengshu/zhongjie-back.png')
+					@include backgroundImg('http://www.gzrea.org.cn:8543/icon/wxmp/zhengshu/zhongjie-back.png')
 				}
 				.zhongjie-back-login {
-					@include backgroundImg('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/zhengshu/zhongjie-back-login.png')
+					@include backgroundImg('http://www.gzrea.org.cn:8543/icon/wxmp/zhengshu/zhongjie-back-login.png')
 				}
 				.zhongjie-back-zhiyin {
-					@include backgroundImg('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/zhengshu/zhongjie-back-zhiyin.png')
+					@include backgroundImg('http://www.gzrea.org.cn:8543/icon/wxmp/zhengshu/zhongjie-back-zhiyin.png')
 				}
 				.anjie-back {
 					z-index: 999;
-					@include backgroundImg('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/zhengshu/anjie-back.png')
+					@include backgroundImg('http://www.gzrea.org.cn:8543/icon/wxmp/zhengshu/anjie-back.png')
 				}
 				.anjie-back-login {
-					@include backgroundImg('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/zhengshu/anjie-back-login.png')
+					@include backgroundImg('http://www.gzrea.org.cn:8543/icon/wxmp/zhengshu/anjie-back-login.png')
 				}
 				.anjie-back-zhiyin {
-					@include backgroundImg('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/zhengshu/anjie-back-zhiyin.png')
+					@include backgroundImg('http://www.gzrea.org.cn:8543/icon/wxmp/zhengshu/anjie-back-zhiyin.png')
 				}
 			}
 		}

+ 1 - 1
pages/researchReport/reportHome/reportHome.vue

@@ -382,7 +382,7 @@
 						}
 						.member-free {
 							padding: 10rpx 20rpx;
-							@include backgroundImg('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/bg-label.png');
+							@include backgroundImg('http://www.gzrea.org.cn:8543/icon/wxmp/bg-label.png');
 							color: $uni-text-color;
 						}
 					}

+ 1 - 1
pages/researchReport/reportList/reportList.vue

@@ -372,7 +372,7 @@
 
 						.member-free {
 							padding: 10rpx 20rpx;
-							@include backgroundImg('https://sylwt.top/api/visitor/resources/image?name=/ydl/menber-center/bg-label.png');
+							@include backgroundImg('http://www.gzrea.org.cn:8543/icon/wxmp/bg-label.png');
 							color: $uni-text-color;
 						}
 					}

+ 3 - 3
utils/baseurl.js

@@ -3,10 +3,10 @@ let FILE_URL = ''
 // baseurl  联调时改url
 if (process.env.NODE_ENV == 'development') {
 	BASE_URL = 'https://www.gzrea.org.cn:8443/wxmp/api';
-	FILE_URL = 'https://www.gzrea.org.cn:8443/wxmp/api';
+	FILE_URL = 'http://www.gzrea.org.cn:8543/icon/wxmp';
 }else{
-	BASE_URL = '';
-	FILE_URL = '';
+	BASE_URL = 'https://www.gzrea.org.cn:8443/wxmp/api';
+	FILE_URL = 'http://www.gzrea.org.cn:8543/icon/wxmp';
 }
 
 const configService = {