Procházet zdrojové kódy

修改对接接口后数据的样式

leaf před 4 měsíci
rodič
revize
7813a665db

+ 29 - 25
pages/address/add.vue

@@ -21,7 +21,8 @@
 							<view><text class="iconfont checkbox">&#xe656;</text></view>
 						</view>
 						<!-- 地址级联选中的字体要比不选中的要大,用picker没法实现 -->
-						<PickerAddress ref="pickerAddressRef" :province="formData.province" :city="formData.city" :area="formData.area"  @change="onChangeArea" />
+						<PickerAddress ref="pickerAddressRef" :province="formData.province" :city="formData.city"
+							:area="formData.area" @change="onChangeArea" />
 					</uni-forms-item>
 					<uni-forms-item label="详细地址(例如**街**号)" name="shrdzxxdz">
 						<uni-easyinput class="pub-input" :inputBorder="false" trim="all" v-model="formData.shrdzxxdz"
@@ -61,15 +62,15 @@
 				required: true,
 				errorMessage: '请填写手机号码',
 			}, {
-				validateFunction: function(rule, value, data, callback) {
+				validateFunction: function (rule, value, data, callback) {
 					let iphoneReg = (
-					/^(13[0-9]|14[1579]|15[0-3,5-9]|16[6]|17[0123456789]|18[0-9]|19[0-9])\d{8}$/
+						/^(13[0-9]|14[1579]|15[0-3,5-9]|16[6]|17[0123456789]|18[0-9]|19[0-9])\d{8}$/
 					); //手机号码
 					if (!iphoneReg.test(value)) {
 						callback('手机号码格式不正确,请重新填写')
 					}
 				}
-				}]
+			}]
 		},
 		province: {
 			rules: [{
@@ -98,19 +99,19 @@
 		city: '',
 		area: '',
 		shrdzxxdz: '',
-		hzid:'',
+		hzid: '',
 		isDefaulted: false
 	})
-	
+
 	// 默认地址
-	const onDefault = ()=> {
+	const onDefault = () => {
 		formData.value.isDefaulted = !formData.value.isDefaulted
 	}
-	const onChangeArea = (e)=> {
+	const onChangeArea = (e) => {
 		formData.value.province = e.province
 		formData.value.city = e.city
 		formData.value.area = e.area
-		popupText.value = e.province + e.city + e.area
+		popupText.value = e.province + ' ' + e.city + ' ' + e.area
 	}
 	// 清除
 	const onClear = () => {
@@ -122,22 +123,22 @@
 			city: '',
 			area: '',
 			shrdzxxdz: '',
-			hzid:'',
+			hzid: '',
 			isDefaulted: false
 		}
 	}
 
-	
-	const onConfirm = async()=> {
+
+	const onConfirm = async () => {
 		// 校验表单
 		formRef.value.validate().then(async res => {
 			// 提交请求
 			try {
-				if (uniType.value == 'add'){
-					await rest.post('/default/consignee-info/create',formData.value)
+				if (uniType.value == 'add') {
+					await rest.post('/default/consignee-info/create', formData.value)
 					dlg.success('新增地址管理成功!')
-				}else if (uniType.value == 'edit'){
-					await rest.put('/default/consignee-info/update',formData.value)
+				} else if (uniType.value == 'edit') {
+					await rest.put('/default/consignee-info/update', formData.value)
 					dlg.success('修改地址管理成功!')
 				}
 				link.back()
@@ -149,18 +150,18 @@
 		})
 	}
 
-	
+
 	onLoad((data) => {
 		formData.value.hzid = data.hzid
 		let res = uni.getStorageSync('addressItemInfo')//取出缓存数据
 		if (res) {
 			uni.setNavigationBarTitle({
-				title:'编辑地址'
+				title: '编辑地址'
 			})
 			uniType.value = 'edit'
 			let transitData = JSON.parse(res)
-			const { shrxm, shrsjh, province, city, area, shrdzxxdz, hzid, isDefaulted,shrxxid } = transitData 
-			Object.assign(formData.value, { shrxm, shrsjh, province, city, area, shrdzxxdz, hzid, isDefaulted,shrxxid })
+			const { shrxm, shrsjh, province, city, area, shrdzxxdz, hzid, isDefaulted, shrxxid } = transitData
+			Object.assign(formData.value, { shrxm, shrsjh, province, city, area, shrdzxxdz, hzid, isDefaulted, shrxxid })
 			popupText.value = transitData.province + transitData.city + transitData.area
 			uni.removeStorageSync('addressItemInfo')//销毁缓存数据
 		}
@@ -190,13 +191,15 @@
 			.address-new-title {
 				font-size: $uni-font-size-lg;
 				line-height: $uni-line-height-lg;
-				font-weight: 800
+				font-weight: 800;
+				margin-bottom: 24rpx;
 			}
 
 			.form-address {
 				@include flex-between;
 				border-bottom: 1px solid $uni-border-color;
-				height: 70rpx;
+				// height: 70rpx;
+				padding: 8rpx 0 24rpx;
 				// todo 模拟校验出错
 				font-size: $uni-font-size-lg;
 				line-height: $uni-line-height-lg;
@@ -209,9 +212,10 @@
 
 			:deep(.uni-forms-item__label) {
 				color: $uni-text-color-grey;
-				padding: 24rpx 0 8rpx 0;
+				padding: 0rpx 0 0rpx 0; //12,4
 				font-size: $uni-font-size-base;
 				line-height: $uni-line-height-base;
+				height: auto;
 			}
 
 			:deep(.uni-easyinput__content) {
@@ -239,8 +243,8 @@
 
 			.address-new-default {
 				// border-top: 1px solid $uni-border-color;
-				margin-top: 24rpx;
-				padding-top: 16rpx;
+				// margin-top: 24rpx;
+				// padding-top: 16rpx;
 				@include flex-between;
 				font-size: $uni-font-size-sm;
 				line-height: $uni-line-height-sm;

+ 45 - 66
pages/address/index.vue

@@ -2,7 +2,7 @@
 	<view class="address-page">
 		<view class="address-section">
 			<pub-list-scroll @next="onScrollTolower" :loaded="loaded" :text="loadText" :status="status">
-				<view class="no-data" v-if="!list || list.length == 0">
+				<view class="no-data" v-if="(!list || list.length == 0)&&!loaded">
 					<image mode="heightFix" src="/static/image/no-data.png" />
 					暂无数据
 				</view>
@@ -64,90 +64,85 @@
 	})
 	const ptwybh = ref()
 	const total = ref(0)
-	
-	
+
+
 	const confirmPopup = ref() // 弹出层
 	const delPopup = ref() // 删除弹出层
 	const deleteId = ref() // 删除的id
 	const curAddressId = ref() // 选中项
 	const selAddressId = ref() // 点击项
-	
+
 	// 拼接地址
 	const formattedAddress = (item) => {
-		const { province, city, area, shrdzxxdz } = item 
+		const { province, city, area, shrdzxxdz } = item
 		return `${province || ''}${city || ''}${area || ''}${shrdzxxdz || ''}`
 	}
-	
-	const openDeletePopup = (position, id) => { 
-		deleteId.value = id 
+
+	const openDeletePopup = (position, id) => {
+		deleteId.value = id
 		delPopup.value.open(position)
 	}
-	
+
 	const onClickItem = (id : string) => {
 		selAddressId.value = id
 		confirmPopup.value.open('center')
 	}
-	
-	const onDelCancel = async() => {
-	    // 从 list 中找到该项的位置
-	    const index = list.value.findIndex(item => item.shrxxid === deleteId.value);
-	    if (index !== -1) {
-	        const [removedItem] = list.value.splice(index, 1);
-	        console.log("已删除项:", removedItem);
-	        // 执行删除接口
-	        try {
-	            await rest.del('/default/consignee-info/delete?id=' + deleteId.value,{});
-	            console.log("删除接口调用成功");
-	        } catch (error) {
-	            list.value.splice(index, 0, removedItem);
-	        }
-	    } else {
-	        console.warn("未找到要删除的项");
-	    }
+
+	const onDelCancel = async () => {
+		// 从 list 中找到该项的位置
+		const index = list.value.findIndex(item => item.shrxxid === deleteId.value);
+		if (index !== -1) {
+			const [removedItem] = list.value.splice(index, 1);
+			// 执行删除接口
+			try {
+				await rest.del('/default/consignee-info/delete?id=' + deleteId.value, {});
+			} catch (error) {
+				list.value.splice(index, 0, removedItem);
+			}
+		} else {
+			console.warn("未找到要删除的项");
+		}
 	}
-	
+
 	const onDelApply = () => {
 		// 删除取消
-		console.log("onDelApply")
 	}
 
 	const onCancel = () => {
-		console.log("onCancel")
 	}
-	const onApply = async() => {
-		if (ptwybh.value){
+	const onApply = async () => {
+		if (ptwybh.value) {
 			curAddressId.value = selAddressId.value
 			const data = {
 				ptwybh: ptwybh.value,
 				shrxxid: curAddressId.value,
 				kd: true
 			}
-			await rest.put('/default/consignee-info/bindShrxxid',data);
+			await rest.put('/default/consignee-info/bindShrxxid', data);
 			dlg.success('操作成功')
 		}
 	}
-	
+
 	// 修改默认
-	const updateDefault = async(item)=> {
+	const updateDefault = async (item) => {
 		if (item.isDefaulted === null) {
-			item.isDefaulted = true; 
+			item.isDefaulted = true;
 			const index = list.value.findIndex(i => i.shrxxid === item.shrxxid);
 			if (index !== -1) {
-			    const [movedItem] = list.value.splice(index, 1);
-			    list.value.unshift(movedItem);
-			    if (list.value.length > 1) {
-			        list.value[1].isDefaulted = null;
-			    }
+				const [movedItem] = list.value.splice(index, 1);
+				list.value.unshift(movedItem);
+				if (list.value.length > 1) {
+					list.value[1].isDefaulted = null;
+				}
 			}
-			await rest.put('/default/consignee-info/update',item)
+			await rest.put('/default/consignee-info/update', item)
 		}
 	}
 
 	const getList = async () => {
 		try {
 			loaded.value = true;
-			let res = await rest.get('/default/consignee-info/list',queryParams.value) as BasicInfoVO
-			console.log("内容",res)
+			let res = await rest.get('/default/consignee-info/list', queryParams.value) as BasicInfoVO
 			let _list = res.list
 
 
@@ -158,7 +153,7 @@
 			}
 
 			total.value = res.total
-			if (res.total && queryParams.value.pageNo >= total.value  / queryParams.value.pageSize) {
+			if (res.total && queryParams.value.pageNo >= total.value / queryParams.value.pageSize) {
 				status.value = "noMore"
 			}
 		} catch (e) {
@@ -170,8 +165,7 @@
 
 	//下一页
 	const onScrollTolower = async () => {
-		console.log("onScrollTolower")
-		if (!list.value || queryParams.value.pageNo > (total.value  / queryParams.value.pageSize)) {
+		if (!list.value || queryParams.value.pageNo > (total.value / queryParams.value.pageSize)) {
 			return false;
 		}
 		if (queryParams.value.pageNo < total.value / queryParams.value.pageSize) {
@@ -183,17 +177,15 @@
 		queryParams.value.pageNo++;
 		getList();
 	}
-	const openDetails = (action,item = null)=> {
-		console.log("内容",action,item)
-		console.log("内容",queryParams.value.hzid)
-		if (item){
+	const openDetails = (action, item = null) => {
+		if (item) {
 			let row = JSON.stringify(item)
-			uni.setStorageSync('addressItemInfo',row)
+			uni.setStorageSync('addressItemInfo', row)
 		}
 		link.addAddress(queryParams.value.hzid)
 	}
-	
-	
+
+
 	onLoad((data) => {
 		queryParams.value.hzid = data.hzid
 		ptwybh.value = data.ptwybh
@@ -214,19 +206,6 @@
 			overflow-y: auto;
 			margin-top: 16rpx;
 
-			.no-data {
-				margin-top: 160rpx;
-				@include flex-center;
-				flex-direction: column;
-
-				image {
-					width: 320rpx;
-					height: 320rpx;
-					margin-bottom: 48rpx;
-					color: $uni-text-color-light;
-				}
-			}
-
 			.address-list {
 
 				.address-item {

+ 12 - 23
pages/cfList/index.vue

@@ -19,7 +19,8 @@
 						<view class="row">
 							<text class="label">处方状态</text>
 							<!-- 已签收/已快递/已发药 绿色,	其他全部橙色 -->
-							<text :class="['cf-status', { 'is-green': ['09', '10', '11'].includes(item.cfzt) }]">{{ DictLabelCFZT(item.cfzt) }}</text>
+							<text
+								:class="['cf-status', { 'is-green': ['09', '10', '11'].includes(item.cfzt) }]">{{ DictLabelCFZT(item.cfzt) }}</text>
 						</view>
 						<view class="row">
 							<text class="label">医疗机构</text>{{item.orgFullName}}
@@ -35,9 +36,9 @@
 	import { ref, onMounted } from 'vue'
 	import dlg from '@/lib/dlg'
 	import rest from '@/stores/rest'
-	
+
 	import TopCard from '../index/TopCard.vue'
-	
+
 	import { BasicInfoVO } from '../../lib/type'
 	import { DictLabelCFZT } from '@/lib/util'
 	import * as link from '@/lib/link'
@@ -57,7 +58,7 @@
 	const getList = async () => {
 		try {
 			loaded.value = true;
-			let res = await rest.get('/app-api/bmfw/findList',queryParams.value) as BasicInfoVO
+			let res = await rest.get('/app-api/bmfw/findList', queryParams.value) as BasicInfoVO
 			console.log("基础信息", res)
 			let _list = res.list
 
@@ -93,21 +94,20 @@
 		queryParams.value.pageNo++;
 		getList();
 	}
-	
+
 	const cardClick = (item) => {
 		link.goCFDetails(item.ptwybm)
 	}
 	const isShowTag = (item) => {
-		if (['3','5'].includes(item.fyfslx) && ['00','001','01','02','05','06','07','08'].includes(item.cfzt)){
+		if (['3', '5'].includes(item.fyfslx) && ['00', '001', '01', '02', '05', '06', '07', '08'].includes(item.cfzt)) {
 			return true
 		}
 		return false
 	}
-	
-	const skipAddressList = (event, item)=> {
+
+	const skipAddressList = (event, item) => {
 		event.stopPropagation();
-		console.log("内容",item)
-		link.goAddressList(queryParams.value.zjhm,item.ptwybm)
+		link.goAddressList(queryParams.value.zjhm, item.ptwybm)
 	}
 	onMounted(() => {
 		const res = uni.getStorageSync("userInfo")
@@ -128,19 +128,6 @@
 			margin-top: 32rpx;
 			padding: 0 32rpx;
 
-			.no-data {
-				margin-top: 160rpx;
-				@include flex-center;
-				flex-direction: column;
-
-				image {
-					width: 320rpx;
-					height: 320rpx;
-					margin-bottom: 48rpx;
-					color: $uni-text-color-light;
-				}
-			}
-
 			.cf-list {
 
 				.cf-item {
@@ -184,6 +171,8 @@
 							@include flex-center;
 							color: $uni-color-orange;
 							border-radius: 8rpx;
+							font-size: $uni-font-size-sm;
+							line-height: $uni-line-height-sm;
 							background: linear-gradient(0deg, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.9)), $uni-color-orange;
 
 							&.is-green {

+ 9 - 8
pages/index/CfStatus.vue

@@ -18,21 +18,21 @@
 </template>
 <script lang="ts" setup>
 	import { ref, PropType, onMounted } from 'vue'
-	
+
 	import { cfStatusVO } from '../../lib/type';
-	
-	
+
+
 	const props = defineProps({
 		ptwybh: {
 			type: String,
 			default: ""
 		},
-		 dataList: {
-		    type: Array as PropType<cfStatusVO[]>,
-		    default: () => []
-		  },
+		dataList: {
+			type: Array as PropType<cfStatusVO[]>,
+			default: () => []
+		},
 	})
-	
+
 	const loaded = ref(false)
 
 	onMounted(() => {
@@ -71,6 +71,7 @@
 						text-fill-color: transparent;
 						-webkit-background-clip: text;
 						-webkit-text-fill-color: transparent;
+						font-size: 40rpx;
 					}
 				}
 

+ 66 - 57
pages/index/TopCard.vue

@@ -1,23 +1,26 @@
 <template>
-	<view class="top-card" v-if="info">
-		<view class="card-top">
-			<image mode="heightFix" src="/static/image/head.png" />
-			<view class="card-top-right">
-				<view class="card-top-right-name">{{info.name}}<text class="iconfont" @click="onClick">{{ showIcon ? '&#xe901;' : '&#xe8bf;' }}</text></view>
-				<view>{{info.addr}}<text class="iconfont" @click="jumpAddress">&#xe6ae;</text></view>
-				<view class="card-top-right-sex">{{info.sex}} | {{info.text}}</view>
+	<view class="top-card">
+		<pub-loading-view :loaded="loaded" height="100%">
+			<view class="card-top" v-if="info">
+				<image mode="heightFix" src="/static/image/head.png" />
+				<view class="card-top-right">
+					<view class="card-top-right-name">{{info.name}}<text class="iconfont"
+							@click="onClick">{{ showIcon ? '&#xe8bf;' : '&#xe901;' }}</text></view>
+					<view>{{info.addr}}<text class="iconfont" @click="jumpAddress">&#xe6ae;</text></view>
+					<view class="card-top-right-sex">{{info.sex}} | {{info.text}}</view>
+				</view>
 			</view>
-		</view>
-		<view class="card-bottom">
-			<view>
-				<view class="label">证件号码</view>
-				<view>{{info.idCard}}</view>
+			<view class="card-bottom" v-if="info">
+				<view>
+					<view class="label">证件号码</view>
+					<view>{{info.idCard}}</view>
+				</view>
+				<view class="second">
+					<view class="label">最近就诊</view>
+					<view>{{info.date}}</view>
+				</view>
 			</view>
-			<view class="second">
-				<view class="label">最近就诊</view>
-				<view>{{info.date}}</view>
-			</view>
-		</view>
+		</pub-loading-view>
 	</view>
 </template>
 <script lang="ts" setup>
@@ -29,80 +32,83 @@
 		getSexByCardNo,
 		maskCardNo,
 		maskName,
-		} from '@/lib/util'
+	} from '@/lib/util'
 	import { BasicInfoVO } from '../../lib/type';
-	
-	
+
+
 	const showIcon = ref(false)
 	const originalInfo = ref({
 		name: '',
 		address: '',
-		addressDetails:'',
+		addressDetails: '',
 		addr: '',
 		sex: '',
 		text: '近三个月就诊记录',
 		idCard: '',
 		date: ''
 	})
-	const info = ref({ ...originalInfo.value})
+	const info = ref({ ...originalInfo.value })
 	const dataList = ref({
 		hzsfzh: '510224196901293189',
 		hzxm: '刘秀碧',
 	})
-	
-	const onClick = ()=> {
+	const loaded = ref(false)
+
+	const onClick = () => {
 		showIcon.value = !showIcon.value
 		onUpdate(showIcon.value)
 	}
-	
-	
+
+
 	// 地址信息拼接
-	const addressInfSplice = (basic:string, details:string, isShow) => {
-	    if (isShow) {
-	        return basic + details;
-	    } else {
-	        return basic + '*'.repeat(details.length);
-	    }
+	const addressInfSplice = (basic : string, details : string, isShow) => {
+		if (isShow) {
+			return basic + details;
+		} else {
+			return basic + '*'.repeat(details.length);
+		}
 	}
-	
+
 	const getInfo = async () => {
-		let basicInfo = await rest.get('/app-api/bmfw/findList',{zjhm: dataList.value.hzsfzh}) as BasicInfoVO
-		let addressInfo = await rest.get('/default/consignee-info/list',{hzid:dataList.value.hzsfzh}) as BasicInfoVO
+		loaded.value = true
+		let basicInfo = await rest.get('/app-api/bmfw/findList', { zjhm: dataList.value.hzsfzh }) as BasicInfoVO
+		let addressInfo = await rest.get('/default/consignee-info/list', { hzid: dataList.value.hzsfzh }) as BasicInfoVO
+		loaded.value = false
 		if (Array.isArray(basicInfo.list) && basicInfo.list.length > 0) {
 			const firstBasicInfo = basicInfo.list[0]
 			originalInfo.value.name = dataList.value.hzxm
 			originalInfo.value.sex = getSexByCardNo(dataList.value.hzsfzh)
 			originalInfo.value.idCard = dataList.value.hzsfzh
-			originalInfo.value.date = formatDate(firstBasicInfo.kfrq,'{y}-{m}-{d}')
+			originalInfo.value.date = formatDate(firstBasicInfo.kfrq, '{y}-{m}-{d}')
 		}
-	
-	
+
+
 		if (Array.isArray(addressInfo.list) && addressInfo.list.length > 0) {
-		    const firstAddressInfo = addressInfo.list[0]
-		    originalInfo.value.address = `${firstAddressInfo.province || ''}${firstAddressInfo.city || ''}${firstAddressInfo.area || ''}`
+			const firstAddressInfo = addressInfo.list[0]
+			originalInfo.value.address = `${firstAddressInfo.province || ''}${firstAddressInfo.city || ''}${firstAddressInfo.area || ''}`
 			originalInfo.value.addressDetails = firstAddressInfo.shrdzxxdz
 		}
 		onUpdate(false)
 	}
-	
-	const onUpdate = (isMasked: boolean) => {
-	    Object.assign(info.value, {
-	        name: isMasked ? maskName(originalInfo.value.name) : originalInfo.value.name,
-	        addr: addressInfSplice(originalInfo.value.address, originalInfo.value.addressDetails, !isMasked),
-	        idCard: isMasked ? maskCardNo(originalInfo.value.idCard) : originalInfo.value.idCard,
-	        sex: getSexByCardNo(originalInfo.value.idCard),
-	        date: originalInfo.value.date
-	    })
+
+	const onUpdate = (isMasked : boolean) => {
+		Object.assign(info.value, {
+			name: isMasked ? maskName(originalInfo.value.name) : originalInfo.value.name,
+			addr: addressInfSplice(originalInfo.value.address, originalInfo.value.addressDetails, !isMasked),
+			idCard: isMasked ? maskCardNo(originalInfo.value.idCard) : originalInfo.value.idCard,
+			sex: getSexByCardNo(originalInfo.value.idCard),
+			date: originalInfo.value.date
+		})
 	}
-	
-	const jumpAddress = ()=> {
-		console.log("内容",originalInfo.value.idCard)
+
+	const jumpAddress = () => {
+		console.log("内容", originalInfo.value.idCard)
 		link.goAddressList(originalInfo.value.idCard)
 	}
-	
+
 	onMounted(() => {
 		dataList.value = uni.getStorageSync("userInfo")
-		console.log("Top",dataList.value)
+		console.log("Top", dataList.value)
 		getInfo()
 	})
 </script>
@@ -113,6 +119,7 @@
 		background: $uni-color-primary;
 		padding: $uni-spacing-col-s2 $page-row-spacing $uni-spacing-col-s4;
 		border: 1px solid $uni-border-color;
+		min-height: 340rpx;
 
 		.card-top {
 			@include flex;
@@ -135,10 +142,11 @@
 				}
 
 				.card-top-right-name {
-					font-size: $uni-font-size-xxxl;
-					line-height: $uni-line-height-xxxl;
+					font-size: $uni-font-size-xxl;
+					line-height: $uni-line-height-xxl;
 					display: flex;
 					align-items: center;
+
 					.iconfont {
 						line-height: $uni-line-height-xxxl;
 						font-size: 32rpx;
@@ -173,6 +181,7 @@
 
 			.second {
 				position: relative;
+				flex: 0.8;
 
 				&::before {
 					content: '';
@@ -180,7 +189,7 @@
 					left: 0;
 					background: $uni-border-color;
 					width: 1px;
-					height: 80rpx;
+					height: 100rpx;
 					-webkit-transform: scaleX(0.5);
 					transform: scaleX(0.5);
 					-webkit-transform-origin: 0 0;

+ 21 - 7
static/style/base.scss

@@ -9,10 +9,10 @@
 /* 在线链接服务仅供平台体验和调试使用,平台不承诺服务的稳定性,企业客户需下载字体包自行发布使用并做好备份。 */
 @font-face {
   font-family: 'iconfont';  /* Project id 4578928 */
-  src: url('https://at.alicdn.com/t/c/font_4578928_be33xvc312o.woff2?t=1732012135978') format('woff2'),
-       url('https://at.alicdn.com/t/c/font_4578928_be33xvc312o.woff?t=1732012135978') format('woff'),
-       url('https://at.alicdn.com/t/c/font_4578928_be33xvc312o.ttf?t=1732012135978') format('truetype'),
-       url('https://at.alicdn.com/t/c/font_4578928_be33xvc312o.svg?t=1732012135978#iconfont') format('svg');
+  src: url('https://at.alicdn.com/t/c/font_4578928_be33xvc312o.woff2?t=1732155615339') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_4578928_be33xvc312o.woff?t=1732155615339') format('woff'),
+       url('https://at.alicdn.com/t/c/font_4578928_be33xvc312o.ttf?t=1732155615339') format('truetype'),
+       url('https://at.alicdn.com/t/c/font_4578928_be33xvc312o.svg?t=1732155615339#iconfont') format('svg');
 }
 
 .iconfont{
@@ -206,8 +206,8 @@ page {
 } 
 
 .uni-forms-item{
-	margin-bottom: 40rpx!important;
-}
+	margin-bottom: 32rpx!important;
+}	
 // toast提示框
 uni-toast{
 	display: flex;
@@ -250,8 +250,9 @@ uni-toast{
 	}	
 }
 
+
 .no-data {
-	margin-top: 100rpx;
+	margin-top: 160rpx;
 	@include flex-center;
 	flex-direction: column;
 
@@ -261,4 +262,17 @@ uni-toast{
 		margin-bottom: 48rpx;
 		color: $uni-text-color-light;
 	}
+}
+
+//加载更多
+.uni-load-more{
+	height: auto!important;
+	.uni-load-more__text{
+		font-size: $uni-font-size-base;
+		line-height: $uni-line-height-base;
+		padding: 32rpx 0;
+		margin-left: 0;
+
+		color: $uni-text-color-light;
+	}
 }

+ 1 - 1
uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue

@@ -6,7 +6,7 @@
 			class="uni-load-more__img uni-load-more__img--nvue"></loading-indicator>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
-		<svg width="24" height="24" viewBox="25 25 50 50"
+		<svg width="16" height="16" viewBox="25 25 50 50"
 			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
 			:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--android-H5">
 			<circle cx="50" cy="50" r="20" fill="none" :style="{color:color}" :stroke-width="3"></circle>