页面优化

pages/copyright/applyRefund/applyRefund.vue

@@ -213,6 +213,7 @@
 					return
 				}
 				_self.isLoadMore = true
+				_self.hasMore= 'loading'
 				_self.proPageData.page = ++_self.proPageData.page
 				_self.proPageData.keywords = _self.proKeywords
 				_self.getCanRefundList(false)

pages/copyright/applyRepair/applyRepair.vue

@@ -263,6 +263,7 @@
 					return
 				}
 				_self.isLoadMore = true
+				_self.hasMore= 'loading'
 				_self.proPageData.page = ++_self.proPageData.page
 				_self.proPageData.keywords = _self.proKeywords
 				_self.getCanRefundList(false)

pages/copyright/refund/refund.vue

@@ -264,6 +264,7 @@
 					return
 				}
 				_self.isLoadMore = true
+				_self.hasMore= 'loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.projName = _self.keywords
 				_self.pageData.applyStatus = _self.selectState

pages/copyright/repair/repair.vue

@@ -466,6 +466,7 @@
 					return
 				}
 				_self.isLoadMore = true
+				_self.hasMore= 'loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.projName = _self.keywords
 				_self.pageData.type = _self.selectType

pages/mine/mineAccount/invoiceInfo/invoiceInfo.vue

@@ -256,6 +256,7 @@
 					return
 				}
 				_self.isLoadMore = true
+				_self.hasMore= 'loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.keywords = _self.keywords
 				_self.doGetInvoiceInfoList(false)

pages/mine/mineAccount/mineCoupons/mineCoupons.vue

@@ -184,6 +184,7 @@
 					isUsed = 0
 				}
 				_self.isLoadMore = true
+				_self.hasMore='loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.isEffective = isEffective
 				_self.pageData.isUsed = isUsed

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'"
+			<view @click="doChangeStatus" data-value=""
-				class="border-left">
+				: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'"
+			<view @click="doChangeStatus" data-value="0"
-				class="border-right">
+				: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'"
+			<view @click="doChangeStatus" data-value="1"
-				class="border-right">
+				:class="['border-right',currentStatus=='1'? 'btn-select':'btn-normal']">
 				<view class="tab">
 					<text>已读</text>
 					<view :class="currentStatus=='1'?'border-select':'border-normal'"></view>
@@ -143,6 +143,7 @@
 					return
 				}
 				_self.isLoadMore = true
+				_self.hasMore = 'loading'
 				_self.pageData.page = ++_self.pageData.page
 				_self.pageData.isRead = _self.currentStatus
 				_self.doGetMineMsgList(false)

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)

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

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() {