From f9fa14f4c2723c15c383feb1a014041f80271871 Mon Sep 17 00:00:00 2001
From: itgaojian163 <itgaojian@163.com>
Date: Mon, 19 May 2025 17:47:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/copyright/applyRefund/applyRefund.vue       |  3 ++-
 pages/copyright/applyRepair/applyRepair.vue       |  3 ++-
 pages/copyright/refund/refund.vue                 |  3 ++-
 pages/copyright/repair/repair.vue                 |  3 ++-
 .../mine/mineAccount/invoiceInfo/invoiceInfo.vue  |  3 ++-
 .../mine/mineAccount/mineCoupons/mineCoupons.vue  |  3 ++-
 .../mineAccount/mineMsgNotice/mineMsgNotice.vue   | 15 ++++++++-------
 pages/mine/mineAccount/mineOrder/mineOrder.vue    |  2 +-
 .../mineAccount/minePayRecord/minePayRecord.vue   |  1 +
 pages/pay/payment/payment.vue                     | 14 ++++++++++++--
 10 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/pages/copyright/applyRefund/applyRefund.vue b/pages/copyright/applyRefund/applyRefund.vue
index ddcbedb..2798fa5 100644
--- a/pages/copyright/applyRefund/applyRefund.vue
+++ b/pages/copyright/applyRefund/applyRefund.vue
@@ -212,7 +212,8 @@
 				if (_self.isLoadMore || _self.hasMore == 'noMore') {
 					return
 				}
-				_self.isLoadMore = true
+				_self.isLoadMore = true
+				_self.hasMore= 'loading'
 				_self.proPageData.page = ++_self.proPageData.page
 				_self.proPageData.keywords = _self.proKeywords
 				_self.getCanRefundList(false)
diff --git a/pages/copyright/applyRepair/applyRepair.vue b/pages/copyright/applyRepair/applyRepair.vue
index f658a30..7ae52e1 100644
--- a/pages/copyright/applyRepair/applyRepair.vue
+++ b/pages/copyright/applyRepair/applyRepair.vue
@@ -262,7 +262,8 @@
 				if (_self.isLoadMore || _self.hasMore == 'noMore') {
 					return
 				}
-				_self.isLoadMore = true
+				_self.isLoadMore = true
+				_self.hasMore= 'loading'
 				_self.proPageData.page = ++_self.proPageData.page
 				_self.proPageData.keywords = _self.proKeywords
 				_self.getCanRefundList(false)
diff --git a/pages/copyright/refund/refund.vue b/pages/copyright/refund/refund.vue
index 44aa666..e6e4aa3 100644
--- a/pages/copyright/refund/refund.vue
+++ b/pages/copyright/refund/refund.vue
@@ -263,7 +263,8 @@
 				if (_self.isLoadMore || _self.hasMore == 'noMore') {
 					return
 				}
-				_self.isLoadMore = true
+				_self.isLoadMore = true
+				_self.hasMore= 'loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.projName = _self.keywords
 				_self.pageData.applyStatus = _self.selectState
diff --git a/pages/copyright/repair/repair.vue b/pages/copyright/repair/repair.vue
index 58b01cb..8f765df 100644
--- a/pages/copyright/repair/repair.vue
+++ b/pages/copyright/repair/repair.vue
@@ -465,7 +465,8 @@
 				if (_self.isLoadMore || _self.hasMore == 'noMore') {
 					return
 				}
-				_self.isLoadMore = true
+				_self.isLoadMore = true
+				_self.hasMore= 'loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.projName = _self.keywords
 				_self.pageData.type = _self.selectType
diff --git a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.vue b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.vue
index 725827e..e91d25d 100644
--- a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.vue
+++ b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.vue
@@ -255,7 +255,8 @@
 				if (_self.data.isLoadMore || _self.hasMore == 'noMore') {
 					return
 				}
-				_self.isLoadMore = true
+				_self.isLoadMore = true
+				_self.hasMore= 'loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.keywords = _self.keywords
 				_self.doGetInvoiceInfoList(false)
diff --git a/pages/mine/mineAccount/mineCoupons/mineCoupons.vue b/pages/mine/mineAccount/mineCoupons/mineCoupons.vue
index 852b5f8..c5308ae 100644
--- a/pages/mine/mineAccount/mineCoupons/mineCoupons.vue
+++ b/pages/mine/mineAccount/mineCoupons/mineCoupons.vue
@@ -183,7 +183,8 @@
 					isEffective = 0
 					isUsed = 0
 				}
-				_self.isLoadMore = true
+				_self.isLoadMore = true
+				_self.hasMore='loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.isEffective = isEffective
 				_self.pageData.isUsed = isUsed
diff --git a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.vue b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.vue
index c94dd2b..24ec3c9 100644
--- a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.vue
+++ b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.vue
@@ -1,22 +1,22 @@
 <template>
 	<view class="page-container">
 		<view class="list-title-btns">
-			<view @click="doChangeStatus" data-value="" :class="currentStatus==''? 'btn-select':'btn-normal'"
-				class="border-left">
+			<view @click="doChangeStatus" data-value=""
+				:class="['border-right',currentStatus==''? 'btn-select':'btn-normal']">
 				<view class="tab">
 					<text>全部</text>
 					<view :class="currentStatus==''?'border-select':'border-normal'"></view>
 				</view>
 			</view>
-			<view @click="doChangeStatus" data-value="0" :class="currentStatus=='0'? 'btn-select':'btn-normal'"
-				class="border-right">
+			<view @click="doChangeStatus" data-value="0"
+				:class="['border-right',currentStatus=='0'? 'btn-select':'btn-normal']">
 				<view class="tab">
 					<text>未读</text>
 					<view :class="currentStatus=='0'?'border-select':'border-normal'"></view>
 				</view>
 			</view>
-			<view @click="doChangeStatus" data-value="1" :class="currentStatus=='1'? 'btn-select':'btn-normal'"
-				class="border-right">
+			<view @click="doChangeStatus" data-value="1"
+				:class="['border-right',currentStatus=='1'? 'btn-select':'btn-normal']">
 				<view class="tab">
 					<text>已读</text>
 					<view :class="currentStatus=='1'?'border-select':'border-normal'"></view>
@@ -139,10 +139,11 @@
 			doLoadMore() {
 				//判断是否正在加载中 与是否存在更多数据
 				const _self = this
-				if (_self.isLoadMore || _self.hasMore=='noMore') {
+				if (_self.isLoadMore || _self.hasMore == 'noMore') {
 					return
 				}
 				_self.isLoadMore = true
+				_self.hasMore = 'loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.isRead = _self.currentStatus
 				_self.doGetMineMsgList(false)
diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.vue b/pages/mine/mineAccount/mineOrder/mineOrder.vue
index 69d4dd5..41cb727 100644
--- a/pages/mine/mineAccount/mineOrder/mineOrder.vue
+++ b/pages/mine/mineAccount/mineOrder/mineOrder.vue
@@ -155,7 +155,7 @@
 					return
 				}
 				_self.isLoadMore = true
-				_self.loadMore = 'loading'
+				_self.hasMore = 'loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.keywords = _self.keywords
 				_self.doGetMineOrderList(false)
diff --git a/pages/mine/mineAccount/minePayRecord/minePayRecord.vue b/pages/mine/mineAccount/minePayRecord/minePayRecord.vue
index feca029..d924f1a 100644
--- a/pages/mine/mineAccount/minePayRecord/minePayRecord.vue
+++ b/pages/mine/mineAccount/minePayRecord/minePayRecord.vue
@@ -171,6 +171,7 @@
 					return
 				}
 				_self.isLoadMore = true
+				_self.hasMore = 'loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.keywords = _self.keywords
 				_self.pageData.startTime = _self.startDate
diff --git a/pages/pay/payment/payment.vue b/pages/pay/payment/payment.vue
index 853619f..0606cb3 100644
--- a/pages/pay/payment/payment.vue
+++ b/pages/pay/payment/payment.vue
@@ -36,14 +36,14 @@
 						<view class="icon icon-wechat"></view>
 						<view>微信支付</view>
 					</view>
-					<radio color="#FFA900" style="transform:scale(0.8)" :checked="payWay==1" value="1"></radio>
+					<radio :color="primaryColor" style="transform:scale(0.7)" :checked="payWay==1" value="1"></radio>
 				</view>
 				<view class="pay-option-item" @click="doChangePayWay" data-value="2">
 					<view class="option-type">
 						<view class="icon icon-card"></view>
 						<view>对公转账</view>
 					</view>
-					<radio color="#FFA900" style="transform:scale(0.8)" :checked="payWay==2" value="2"></radio>
+					<radio :color="primaryColor" style="transform:scale(0.7)" :checked="payWay==2" value="2"></radio>
 				</view>
 			</radio-group>
 		</view>
@@ -87,10 +87,19 @@
 <script>
 	import ContainerLoading from '@/components/container-loading.vue';
 	import PayService from '@/common/js/net/payApi.js';
+	import {
+		inject
+	} from 'vue';
 	export default {
 		components: {
 			ContainerLoading
 		},
+		setup() {
+			const globalData = inject('globalData')
+			return {
+				globalData
+			}
+		},
 		data() {
 			return {
 				paySumOptions: [100, 300, 500, 1000, 2000, 5000],
@@ -107,6 +116,7 @@
 				selectBag: {}, //选中的套餐包
 				msgType: 'info',
 				msgTxt: '',
+				primaryColor: this.globalData.primaryColor
 			}
 		},
 		onLoad() {