修改

assets/http/config.js

@@ -1,6 +1,7 @@
 let config = {}
 
-
+config.baseURL = 'http://192.168.1.168:2888'
+// config.baseURL='https://vote.guosen-fumao.cn/api'
 //是否需要获取手机号
 config.isAuthPhone=true
 

assets/http/service.js

@@ -1,8 +1,8 @@
 import Request from 'luch-request'
-
+import config from './config.js'
 // let baseURL = 'http://192.168.1.91:2888'
 // let baseURL = 'http://192.168.1.168:2888'
-let baseURL = 'https://vote.guosen-fumao.cn/api'
+let baseURL = config.baseURL
 
 
 let tokenUrl = baseURL +
@@ -47,7 +47,7 @@ http.interceptors.response.use(async (response) => {
 	//200 返回数据成功 0
 	return response;
 }, async (err) => { // 请求错误做点什么
-	console.log(err,1234123);
+	console.log(err, 1234123);
 	if (err.statusCode == 401) {
 		let {
 			config
@@ -55,8 +55,8 @@ http.interceptors.response.use(async (response) => {
 		if (!isRefreshing) {
 			isRefreshing = true
 			let token = uni.getStorageSync('token')
-			let [,res] = await uni.request({
-				url:  tokenUrl,
+			let [, res] = await uni.request({
+				url: tokenUrl,
 				method: 'POST',
 				header: {
 					Authorization: "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
@@ -78,7 +78,7 @@ http.interceptors.response.use(async (response) => {
 				})
 			})
 		}
-	}else{
+	} else {
 		return err.data
 	}
 	return Promise.reject(err)

components/alert/pointAuth.vue

@@ -1,7 +1,10 @@
 <template>
 	<view>
-		<u-popup :custom-style="popupStyle" @close="close" class="auth-point" v-model="show" mode="center" width="80%"
-			height="680rpx" border-radius="16">
+		<u-popup :custom-style="popupStyle"
+			close-icon-size="50"
+			:mask-close-able="false"
+			@close="close" class="auth-point" :closeable="true" close-icon-color="#fff"
+			close-icon="close-circle" v-model="show" mode="center" width="80%" height="680rpx" border-radius="16">
 			<view class="">
 				<image class="auth-bg" mode="aspectFill" src="../../static/poster/bg_shouyetc.png">
 					<view class="auth-msg" style="display: flex;flex-direction: column;">
@@ -51,6 +54,7 @@
 				this.show = false;
 			},
 			close() {
+				console.log("close");
 				this.$emit('close')
 			},
 			toAuth() {

components/alert/votePopup.vue

@@ -51,6 +51,7 @@
 		},
 		data() {
 			return {
+				productId:0,
 				show: false,
 				selected: 0,
 				count: 0,
@@ -58,12 +59,15 @@
 				gitfs: [],
 			};
 		},
-
 		methods: {
-			pointAuthClose(){
+		   async pointAuthClose(){
 				this.$refs.loading.hide()
+				await this.fetchGiftsData()
+				this.show=true
+				console.log(this.gitfs[this.selected].point);
 			},
 			async showVote(mobile,productId) {
+				this.productId=productId
 				this.$refs.loading.showLoading("礼物获取中")
 				let params = {
 					mobile
@@ -78,16 +82,20 @@
 					const pointDetail = JSON.parse(queryRes.data.data.data);
 					this.pointNum = pointDetail['points'];
 				}
+				await this.fetchGiftsData()
+				this.$refs.loading.hide()
+				this.show = true;
+			},
+			async fetchGiftsData(){
 				let data = {
-					productId,
+					productId:this.productId,
 					userId: this.vuex_userId,
 					current: 1,
 					size: 99
 				}
 				const res = await this.$api.activity.getGiftList(data);
 				this.gitfs = res.data.data.records;
-				this.$refs.loading.hide()
-				this.show = true;
+				console.log(this.gitfs,"/**//**/");
 			},
 			hideVote() {
 				this.show = false;

components/poster/poster.vue

@@ -98,7 +98,7 @@
 				let titleSize = 19
 				let titleParams = {
 					color: '#fff',
-					x: (hW / 2) - (this.title.length * titleSize / 2) + 10,
+					x: (hW / 2) - (this.title.length * titleSize / 2) - 10,
 					y: (hH / 2) + uni.upx2px(110)
 				}
 				this.ctx.font = "19px 华文楷体"

pages/activity/activityDetail.vue

@@ -130,7 +130,7 @@
 				this.posetrParams = {
 					avatar: 'https://gx.vote.activity.obs.cn-south-1.myhuaweicloud.com:443/446d9e043f3748e4a47ea4d0de81b140-3b748fea4150c469b8eb66f98cd29e2.png',
 					title: '我是普法帮帮代言人',
-					subTitle: `邀请您为${this.activity.productNo}号作品投票！`
+					subTitle: '邀请您为'+this.activity.productNo+'号作品投票！'
 				}
 				let userId = this.vuex_userId || '000000' //游客
 				let sharePath = '/pages/activity/activityDetail?id=' + this.activity.id + '&userId=' + userId
@@ -179,8 +179,10 @@
 			},
 			//去投票
 			toVote(item) {
-				this.orderResult=this.$cache.get('orderResult')
-				this.orderResult.goodsId=item.id
+				if (this.$cache.get('orderResult')) {
+					this.orderResult=this.$cache.get('orderResult')
+					this.orderResult.goodsId=item.id
+				}
 				this.selectGoods=item
 				if (item.point == 0) {
 					//免费投票
@@ -194,7 +196,7 @@
 					return
 				}
 				let params = {
-					url: 'https://ldt.guosen-fumao.cn/wapp/order.html',
+					url: 'https://vote.guosen-fumao.cn/order.html',
 					goodsId: this.selectGoods.id
 				}
 				this.$jump('/pages/webview/createOrder' + this.$u.queryParams(params))

pages/mine/mine.vue

@@ -137,7 +137,7 @@
 					{
 						name: '更换主题',
 						icon: '/static/mine/theme.png',
-						url: '',
+						url: 'theme',
 						auth: false //是否登录验证
 					},
 				],

pages/rank/rank.vue

@@ -19,7 +19,7 @@
 					<view class=" flex align-center"
 						style="height: 230rpx;position: relative;margin: 10rpx 20rpx 20rpx 20rpx;"
 						:class="index == 0 ? 'first' : index == 1 ? 'second' : index == 2 ? 'third' : '' ">
-						<u-image width="220" height="220" border-radius="10" :src="item.imgUrl"></u-image>
+						<u-image width="220" height="220" mode="aspectFill" border-radius="10" :src="item.imgUrl"></u-image>
 						<view class="flex justify-between container" style="width: 100%;">
 							<view class="left" style="width: 95%;">
 								<view class="name text-cut ">{{item.title}}</view>

pages/shop/shop.vue

@@ -39,7 +39,7 @@
 							<image :src="item.imgUrl"></image>
 						</view>
 						<view class="title-tag" style="text-align: center;font-weight: 800;">
-							<text>{{item.name}}</text>
+							<text class="text-cut-1">{{item.name}}</text>
 						</view>
 						<view class="price-info">
 							<view class="user-price">