页面加载动画优化

pages/index.scss

@@ -8,6 +8,16 @@
 	 width: 56rpx!important;
  }
  
+ ::v-deep .u-loading-page{
+	 position: relative!important;
+	 z-index: 99999999999999999999999!important;
+	 // background: red;
+ }
+ ::v-deep .u-loading-page__warpper__loading-icon__img{
+	 width: 150rpx!important;
+	 height: 150rpx!important;
+ }
+ 
  .container{
 	 padding-bottom: 62rpx;
 	 

pages/index.vue

@@ -137,9 +137,9 @@
 				</view>
 			</view>
 
-
 			<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
 		</view>
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 
@@ -180,6 +180,7 @@
 				navImg: require('@/static/index/logo.png'),
 				list: [],
 
+				loading: true
 			}
 		},
 		async onLoad(o) {
@@ -206,7 +207,10 @@
 
 				console.log('全局静态资源数据', this.bannerList11, this.bannerList22, this.bannerList33, this
 					.bannerList44, this.bannerList55);
+
+				this.loading = false
 			} else {
+				this.loading = false
 				this.$toast(res55.message)
 			}
 

pages/index/addrList/index.scss

@@ -1,3 +1,13 @@
+::v-deep .u-loading-page{
+	 position: relative!important;
+	 z-index: 99999999999999999999999!important;
+	 // background: red;
+ }
+ ::v-deep .u-loading-page__warpper__loading-icon__img{
+	 width: 150rpx!important;
+	 height: 150rpx!important;
+ }
+
 .page{
 	padding-bottom: 32rpx;
 	background: #F1F1F1;

pages/index/addrList/index.vue

@@ -47,6 +47,8 @@
 			</view>
 		</view>
 		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 
@@ -62,15 +64,19 @@
 			return {
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
-				bannerList1: []
+				bannerList1: [],
+
+				loading: true
 			}
 		},
 		async onLoad(options) {
 			let res1 = await getAddressDataReq()
 			if (res1.code == 0) {
 				this.bannerList1 = res1.data
+				this.loading = false
 				console.log('地址轮播图数据-列表页', this.bannerList1);
 			} else {
+				this.loading = false
 				this.$toast(res1.message)
 			}
 

pages/index/customMian/index.vue

@@ -243,7 +243,14 @@
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 				showFixInfo: false,
-				mainPreviewInfo: null,
+				mainPreviewInfo: {
+					hx: '',
+					xl: '',
+					kt: [],
+					ct: [],
+					ws: [],
+					yt: [],
+				},
 
 				name: '',
 				phone: '',
@@ -264,7 +271,6 @@
 			}
 		},
 		async onLoad(o) {
-			// o.orderId = 'a04e4cd7700187470b5dced95772c73c'
 			let res11 = await getBannerDataReq()
 			if (res11.code == 0) {
 				console.log('2-----图片配置数据', res11);
@@ -281,7 +287,8 @@
 			// 	this.dType = getApp().dType
 			// }
 			this.dType = Number(o.dType)
-
+			// this.dType = 5
+			// o.orderId = '414048c0fb21eec5f7ddf87d0961847e'
 			console.log('this.dType', this.dType);
 
 			if (o.orderId) {
@@ -293,16 +300,18 @@
 					orderId: o.orderId
 				})
 				if (res.code == 0) {
-					console.log('邀请订单详情返回值-无主灯: ', res);
+					console.log('邀请订单详情返回值-主灯123: ', res);
 					this.shareCon = res.data
-					this.mainPreviewInfo = {
-						hx: res.data.config.house_type_data,
-						xl: res.data.config.series_data,
-						kt: res.data.config.lamp.living_room.list,
-						ct: res.data.config.lamp.dining_room_light.list,
-						ws: res.data.config.lamp.bedroom_lamp.list,
-						yt: res.data.config.lamp.balcony_light.list,
-					}
+
+					this.mainPreviewInfo.hx = res.data.config.house_type_data
+					this.mainPreviewInfo.xl = res.data.config.series_data
+					this.mainPreviewInfo.kt = res.data.config.lamp.living_room.list
+					this.mainPreviewInfo.ct = res.data.config.lamp.dining_room_light.list
+					this.mainPreviewInfo.ws = res.data.config.lamp.bedroom_lamp.list
+					this.mainPreviewInfo.yt = res.data.config.lamp.balcony_light.list
+
+
+					console.log('邀请订单详情返回值-主灯---处理后: ', this.mainPreviewInfo);
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -367,7 +376,9 @@
 						name: this.name,
 						remark: this.remark,
 						config_id: this.pConfig,
-						type: this.dType ? this.dType : 2
+						type: this.dType ? this.dType : 2,
+
+						lamp_id: this.ids,
 					})
 					if (res.code == 0) {
 						console.log('提交订单返回值: ', res);

pages/index/customMian_step1/index.vue

@@ -514,6 +514,8 @@
 						house_type: this.selHx.id
 					}
 					let res = await getHomeDataNextReq(p)
+
+					console.log('确定选择的户型项-----------', this.selHx);
 					if (res.code == 0) {
 						console.log('新户型返回值', res);
 						this.serTypeList = res.data.series

pages/index/productLead/index.scss

@@ -2,6 +2,15 @@
 ::v-deep .u-line{
 	 width: 56rpx!important;
  }
+ ::v-deep .u-loading-page{
+ 	 position: relative!important;
+ 	 z-index: 99999999999999999999999!important;
+ 	 // background: red;
+ }
+ ::v-deep .u-loading-page__warpper__loading-icon__img{
+ 	 width: 150rpx!important;
+ 	 height: 150rpx!important;
+ }
 .page{
 	padding-bottom: 54rpx;
 	background: #F1F1F1;

pages/index/productLead/index.vue

@@ -19,6 +19,8 @@
 		<!-- 	<u-loadmore v-if="list.length!=0" :status="status" style="" loadmoreText="已经到底啦" color="#CCCCCC"
 			lineColor="#CCCCCC" line /> -->
 		<u-loadmore :status="status" style="" nomoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 
@@ -41,6 +43,9 @@
 				pagesize: 15,
 				totalElements: 0,
 				loadstatus: "noMore",
+
+
+				loading: true
 				// status: 'loadmore',
 			}
 		},
@@ -67,10 +72,12 @@
 			let res = await getGuideDataReq()
 			if (res.code == 0) {
 				this.list = res.data
+				this.loading = false
 				console.log('首页指南列表返回值', res);
 
 				// this.totalElements = res.data.total
 			} else {
+				this.loading = false
 				uni.showToast({
 					title: res.message,
 					icon: 'none'

pages/index/productLeadDetail/index.scss

@@ -1,6 +1,16 @@
 ::v-deep button::after{
 	border: none!important;
 }
+
+::v-deep .u-loading-page{
+	 position: relative!important;
+	 z-index: 99999999999999999999999!important;
+	 // background: red;
+ }
+ ::v-deep .u-loading-page__warpper__loading-icon__img{
+	 width: 150rpx!important;
+	 height: 150rpx!important;
+ }
 .page{
 	padding-bottom: 160rpx;
 }

pages/index/productLeadDetail/index.vue

@@ -19,7 +19,7 @@
 				分享
 			</button>
 		</view>
-		<u-loading-page :loading="loading" loading-text="页面加载中..."></u-loading-page>
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 

pages/mall/goodsList/index.scss

@@ -1,6 +1,15 @@
 ::v-deep .u-line{
 	 width: 56rpx!important;
  }
+ ::v-deep .u-loading-page{
+ 		 position: relative!important;
+ 		 z-index: 999999999!important;
+ 		 // background: red;
+ 	}
+ 	::v-deep .u-loading-page__warpper__loading-icon__img{
+ 		 width: 150rpx!important;
+ 		 height: 150rpx!important;
+ 	}
 .page{
 	padding-bottom: 54rpx;
 	background: #F1F1F1;

pages/mall/goodsList/index.vue

@@ -21,6 +21,8 @@
 
 
 		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 
@@ -42,7 +44,9 @@
 				brand: 0,
 				type: 0,
 				typeNameId: 0,
-				pid: -1
+				pid: -1,
+
+				loading: true
 			}
 		},
 		async onLoad(o) {
@@ -62,7 +66,14 @@
 			})
 			if (res.code == 0) {
 				this.list = res.data
+				this.loading = false
 				console.log('获取商城列表数据返回值-子分类: ', res);
+			} else {
+				this.loading = false
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
 			}
 		},
 		methods: {

pages/my.scss

@@ -1,3 +1,12 @@
+	// ::v-deep .u-loading-page{
+	// 	 position: relative!important;
+	// 	 z-index: 999999999!important;
+	// 	 // background: red;
+	// }
+	// ::v-deep .u-loading-page__warpper__loading-icon__img{
+	// 	 width: 150rpx!important;
+	// 	 height: 150rpx!important;
+	// }
 	view {
 		box-sizing: border-box;
 	}
@@ -8,6 +17,7 @@
 	::v-deep button::after{
 		border: none!important;
 	}
+	
 	.content{
 		background:#F4F4F4 ;
 		.top{

pages/my.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="container">
+
+	<view class="container" v-if="!loading" style="position: relative;z-index: 0;">
 		<navBar title="GIGESI 吉格斯" :back="false" color="black"
 			background="linear-gradient(to bottom,#FDEDD2,#FEF9ED)" />
 		<view class="content">
@@ -66,7 +67,8 @@
 						<text class="btn" v-if="token&&role=='superAdmin'"
 							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(超级管理员)'}}</text>
 
-
+						<text class="btn" v-if="token&&role=='nomal'"
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(普通员工)'}}</text>
 					</view>
 					<image :src="picUrl+'/static/my/set2.png'" mode="" @click="toPage('info')"
 						style="width: 37rpx;height: 41rpx;margin-right: 22rpx;">
@@ -111,6 +113,7 @@
 		<u-action-sheet :actions="list" :title="title" :show="show" cancelText="取消" @close="show=false"
 			@select="handleSel"></u-action-sheet>
 	</view>
+	<u-loading-page v-else :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 </template>
 
 <script>
@@ -195,7 +198,8 @@
 					minutes: 0,
 					seconds: 0,
 					milliseconds: 0
-				}
+				},
+				loading: true
 			}
 		},
 		async onShow() {
@@ -254,6 +258,9 @@
 						console.log('当前用户角色', this.role);
 					} else {
 						switch (res.data.type) {
+							case 0:
+								this.role = 'nomal'
+								break
 							case 1:
 								this.role = 'superAdmin'
 								break
@@ -270,6 +277,8 @@
 					}
 					console.log('当前员工角色', this.role);
 					this.checkRole()
+
+					this.loading = false
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -832,8 +841,9 @@
 							name: '邀约活动用户'
 						}
 					]
-				} else {
-
+				} else if (this.role == 'nomal') {
+					return
+					this.serList = []
 				}
 			}
 		}
@@ -842,4 +852,15 @@
 
 <style lang="scss" scoped>
 	@import "./my.scss";
+
+	::v-deep .u-loading-page {
+		position: relative !important;
+		z-index: 999999999 !important;
+		// background: red;
+	}
+
+	::v-deep .u-loading-page__warpper__loading-icon__img {
+		width: 150rpx !important;
+		height: 150rpx !important;
+	}
 </style>

pages/my/actGoods/index.scss

@@ -1,6 +1,16 @@
 ::v-deep .u-line{
 	 width: 56rpx!important;
  }
+ 
+ ::v-deep .u-loading-page{
+ 		 position: relative!important;
+ 		 z-index: 999999999!important;
+ 		 // background: red;
+ 	}
+ 	::v-deep .u-loading-page__warpper__loading-icon__img{
+ 		 width: 150rpx!important;
+ 		 height: 150rpx!important;
+ 	}
 .page{
 	padding-bottom: 54rpx;
 	background: #F1F1F1;

pages/my/actGoods/index.vue

@@ -36,6 +36,8 @@
 			</u-empty>
 		</view>
 		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 
@@ -52,7 +54,8 @@
 			return {
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
-				list: []
+				list: [],
+				loading: true
 			}
 		},
 		async onLoad(o) {
@@ -62,8 +65,10 @@
 			let res = await getActivityDataReq()
 			if (res.code == 0) {
 				this.list = res.data
+				this.loading = false
 				console.log('活动商品列表返回值:', res.data);
 			} else {
+				this.loading = false
 				uni.showToast({
 					title: res.message,
 					icon: 'none'

pages/my/changeNewGoods/index.scss

@@ -1,6 +1,16 @@
 ::v-deep .u-line{
 	 width: 56rpx!important;
  }
+ 
+ ::v-deep .u-loading-page{
+ 		 position: relative!important;
+ 		 z-index: 999999999!important;
+ 		 // background: red;
+ 	}
+ 	::v-deep .u-loading-page__warpper__loading-icon__img{
+ 		 width: 150rpx!important;
+ 		 height: 150rpx!important;
+ 	}
 .page{
 	padding-bottom: 54rpx;
 	background: #F1F1F1;

pages/my/changeNewGoods/index.vue

@@ -19,6 +19,8 @@
 			</u-empty>
 		</view>
 		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 
@@ -35,7 +37,9 @@
 			return {
 				picUrl: this.$picUrl,
 				list: [],
-				picBase: this.$picBase
+				picBase: this.$picBase,
+
+				loading: true
 			}
 		},
 		async onLoad(options) {
@@ -48,7 +52,9 @@
 			if (res.code == 0) {
 				console.log('售后商品列表返回值:', res);
 				this.list = res.data
+				this.loading = false
 			} else {
+				this.loading = false
 				uni.showToast({
 					title: res.message,
 					icon: 'none'

pages/my/collect/index.scss

@@ -1,6 +1,16 @@
 ::v-deep .u-line{
 	 width: 56rpx!important;
  }
+ 
+ ::v-deep .u-loading-page{
+ 		 position: relative!important;
+ 		 z-index: 999999999!important;
+ 		 // background: red;
+ 	}
+ 	::v-deep .u-loading-page__warpper__loading-icon__img{
+ 		 width: 150rpx!important;
+ 		 height: 150rpx!important;
+ 	}
 .page{
 	padding-bottom: 54rpx;
 	background: #F1F1F1;

pages/my/collect/index.vue

@@ -17,6 +17,8 @@
 			</u-empty>
 		</view>
 		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 
@@ -33,7 +35,9 @@
 			return {
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
-				list: []
+				list: [],
+
+				loading: true
 			}
 		},
 		async onLoad(o) {
@@ -46,10 +50,12 @@
 			})
 			if (res.code == 0) {
 				this.list = res.data.data
+				this.loading = false
 				console.log('我的收藏列表返回值',
 					res);
 				// console.log('我的收藏列表', this.list);
 			} else {
+				this.loading = false
 				uni.showToast({
 					title: res.message,
 					icon: 'none'

pages/my/duijiang/index.scss

@@ -1,3 +1,13 @@
+::v-deep .u-loading-page{
+		 position: relative!important;
+		 z-index: 999999999!important;
+		 // background: red;
+	}
+	::v-deep .u-loading-page__warpper__loading-icon__img{
+		 width: 150rpx!important;
+		 height: 150rpx!important;
+	}
+
 .page{
 	min-height:100vh;
 	background: #F1F1F1;

pages/my/duijiang/index.vue

@@ -59,6 +59,8 @@
 			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
 			</u-empty>
 		</view>
+
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 
@@ -74,7 +76,8 @@
 			return {
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
-				list: []
+				list: [],
+				loading: true
 			}
 		},
 		async onLoad(options) {
@@ -82,7 +85,10 @@
 			if (res.code == 0) {
 				console.log('获取我的兑奖信息返回值: ', res);
 				this.list = res.data
+
+				this.loading = false
 			} else {
+				this.loading = false
 				uni.showToast({
 					title: res.message,
 					icon: 'none'

pages/my/sellAfterDefer/index.scss

@@ -1,4 +1,12 @@
-
+::v-deep .u-loading-page{
+		 position: relative!important;
+		 z-index: 999999999!important;
+		 // background: red;
+	}
+	::v-deep .u-loading-page__warpper__loading-icon__img{
+		 width: 150rpx!important;
+		 height: 150rpx!important;
+	}
 .page{
 	background: #F1F1F1;
 	min-height: 100vh;

pages/my/sellAfterDefer/index.vue

@@ -54,6 +54,8 @@
 			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
 			</u-empty>
 		</view>
+
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 
@@ -69,6 +71,8 @@
 			return {
 				list: [],
 				picUrl: this.$picUrl,
+
+				loading: true
 			}
 		},
 		async onLoad(options) {
@@ -76,7 +80,9 @@
 			if (res.code == 0) {
 				console.log('获取我的售后保障返回值: ', res);
 				this.list = res.data.data
+				this.loading = false
 			} else {
+				this.loading = false
 				uni.showToast({
 					title: res.message,
 					icon: 'none'

pages/my/useLead/index.scss

@@ -1,7 +1,15 @@
 ::v-deep button::after{
 	border: none!important;
 }
-
+::v-deep .u-loading-page{
+	 position: relative!important;
+	 z-index: 99999999999999999999999!important;
+	 // background: red;
+ }
+ ::v-deep .u-loading-page__warpper__loading-icon__img{
+	 width: 150rpx!important;
+	 height: 150rpx!important;
+ }
 .page{
 	padding-bottom: 160rpx;
 }

pages/my/useLead/index.vue

@@ -21,7 +21,7 @@
 				一键分享
 			</button>
 		</view>
-		<u-loading-page :loading="loading" loading-text="页面加载中..."></u-loading-page>
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 

pages/my/userInfo/index.scss

@@ -1,3 +1,14 @@
+::v-deep .u-loading-page{
+		 position: relative!important;
+		 z-index: 999999999!important;
+		 // background: red;
+	}
+	::v-deep .u-loading-page__warpper__loading-icon__img{
+		 width: 150rpx!important;
+		 height: 150rpx!important;
+	}
+	
+
 .content{
 	background: #F1F1F1;
 	min-height:calc(100vh - 200rpx)  ;

pages/my/userInfo/index.vue

@@ -85,7 +85,7 @@
 			:show="showDate" :minDate="new Date('1960-1-1').getTime()" :maxDate="Date.now()" v-model="value1"
 			mode="date" confirmColor="#E77817"></u-datetime-picker>
 
-		<!-- <u-loading-page :loading="loading" loading-text="页面加载中..."></u-loading-page> -->
+		<!-- <u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page> -->
 	</view>
 </template>
 
@@ -128,8 +128,10 @@
 			let res = await getUserInfoReq()
 			if (res.code == 0) {
 				this.userInfo = res.data
+				// this.userInfo = null
 				this.loading = false
 			} else {
+				this.loading = false
 				uni.showToast({
 					title: res.message,
 					icon: 'none'

pages/service.scss

@@ -1,3 +1,13 @@
+::v-deep .u-loading-page{
+ 		 position: relative!important;
+ 		 z-index: 999999999!important;
+ 		 // background: red;
+ 	}
+ 	::v-deep .u-loading-page__warpper__loading-icon__img{
+ 		 width: 150rpx!important;
+ 		 height: 150rpx!important;
+ 	}
+
 .list{
 	padding: 0rpx 32rpx 24rpx 32rpx;
 	display: flex;

pages/service.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<navBar title="服务" :back="false" color="black" flex="cen" background="#fff" />
 
-		<view class="list">
+		<view class="list" v-if="list.length!=0">
 			<view class="item" v-for="(item,index) in list">
 				<view class="topTitle">
 					<view class="water">
@@ -38,6 +38,13 @@
 				</view>
 			</view>
 		</view>
+
+		<view class="con" v-else style="justify-content: center;">
+			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
+			</u-empty>
+		</view>
+
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 
@@ -55,14 +62,23 @@
 				picBase: this.$picBase,
 				list: [],
 
-				showOverFlow: true
+				showOverFlow: true,
+
+				loading: true
 			}
 		},
 		async onLoad(options) {
 			let res = await getServerDataReq({})
 			if (res.code == 0) {
 				this.list = res.data
+				this.loading = false
 				console.log('服务列表: ', res, this.list);
+			} else {
+				this.loading = false
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
 			}
 		},
 		methods: {

pages/service/detail/index.scss

@@ -1,6 +1,15 @@
 ::v-deep button::after{
 	border: none!important;
 }
+::v-deep .u-loading-page{
+	 position: relative!important;
+	 z-index: 99999999999999999999999!important;
+	 // background: red;
+ }
+ ::v-deep .u-loading-page__warpper__loading-icon__img{
+	 width: 150rpx!important;
+	 height: 150rpx!important;
+ }
 .content{
 	padding: 48rpx 32rpx  0 32rpx;
 	.title{

pages/service/detail/index.vue

@@ -15,7 +15,7 @@
 				一键分享
 			</button>
 		</view>
-		<u-loading-page :loading="loading" loading-text="页面加载中..."></u-loading-page>
+		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
 	</view>
 </template>
 

uni_modules/uview-ui/components/u-loading-page/u-loading-page.vue

@@ -1,7 +1,5 @@
 <template>
-    <u-transition
-        :show="loading"
-        :custom-style="{
+	<u-transition :show="loading" :custom-style="{
             position: 'fixed',
             top: 0,
             left: 0,
@@ -9,107 +7,101 @@
             bottom: 0,
             backgroundColor: bgColor,
             display: 'flex',
-        }"
-    >
-        <view class="u-loading-page">
-            <view class="u-loading-page__warpper">
-                <view class="u-loading-page__warpper__loading-icon">
-                    <image
-                        v-if="image"
-                        :src="image"
-                        class="u-loading-page__warpper__loading-icon__img"
-                        mode="widthFit"
+        }">
+		<view class="u-loading-page">
+			<view class="u-loading-page__warpper">
+				<view class="u-loading-page__warpper__loading-icon">
+					<image v-if="image" :src="image" class="u-loading-page__warpper__loading-icon__img" mode="heightFix"
+						style="height: 150rpx;width: 150rpx;"></image>
+
+					<!-- <image
+					    v-if="image"
+					    :src="image"
+					    class="u-loading-page__warpper__loading-icon__img"
+					    mode="widthFit"
 						:style="{
 							width: $u.addUnit(iconSize),
 						    height: $u.addUnit(iconSize)
 						}"
-                    ></image>
-                    <u-loading-icon
-                        v-else
-                        :mode="loadingMode"
-                        :size="$u.addUnit(iconSize)"
-                        :color="loadingColor"
-                    ></u-loading-icon>
-                </view>
-                <slot>
-                    <text
-                        class="u-loading-page__warpper__text"
-                        :style="{
+					></image> -->
+					<u-loading-icon v-else :mode="loadingMode" :size="$u.addUnit(iconSize)"
+						:color="loadingColor"></u-loading-icon>
+				</view>
+				<slot>
+					<text class="u-loading-page__warpper__text" :style="{
                             fontSize: $u.addUnit(fontSize),
                             color: color,
-                        }"
-                        >{{ loadingText }}</text
-                    >
-                </slot>
-            </view>
-        </view>
-    </u-transition>
+                        }">{{ loadingText }}</text>
+				</slot>
+			</view>
+		</view>
+	</u-transition>
 </template>
 
 <script>
-import props from "./props.js";
-/**
- * loadingPage 加载动画
- * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
- * @tutorial https://www.uviewui.com/components/loading.html
- * @property {String | Number}	loadingText		提示内容  (默认 '正在加载' )
- * @property {String}			image			文字上方用于替换loading动画的图片
- * @property {String}			loadingMode		加载动画的模式，circle-圆形，spinner-花朵形，semicircle-半圆形 （默认 'circle' ）
- * @property {Boolean}			loading			是否加载中 （默认 false ）
- * @property {String}			bgColor			背景色 （默认 '#ffffff' ）
- * @property {String}			color			文字颜色 （默认 '#C8C8C8' ）
- * @property {String | Number}	fontSize		文字大小 （默认 19 ）
- * @property {String | Number}	iconSize		图标大小 （默认 28 ）
- * @property {String}			loadingColor	加载中图标的颜色，只能rgb或者十六进制颜色值 （默认 '#C8C8C8' ）
- * @property {Object}			customStyle		自定义样式
- * @example <u-loading mode="circle"></u-loading>
- */
-export default {
-    name: "u-loading-page",
-    mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
-    data() {
-        return {};
-    },
-    methods: {},
-};
+	import props from "./props.js";
+	/**
+	 * loadingPage 加载动画
+	 * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
+	 * @tutorial https://www.uviewui.com/components/loading.html
+	 * @property {String | Number}	loadingText		提示内容  (默认 '正在加载' )
+	 * @property {String}			image			文字上方用于替换loading动画的图片
+	 * @property {String}			loadingMode		加载动画的模式，circle-圆形，spinner-花朵形，semicircle-半圆形 （默认 'circle' ）
+	 * @property {Boolean}			loading			是否加载中 （默认 false ）
+	 * @property {String}			bgColor			背景色 （默认 '#ffffff' ）
+	 * @property {String}			color			文字颜色 （默认 '#C8C8C8' ）
+	 * @property {String | Number}	fontSize		文字大小 （默认 19 ）
+	 * @property {String | Number}	iconSize		图标大小 （默认 28 ）
+	 * @property {String}			loadingColor	加载中图标的颜色，只能rgb或者十六进制颜色值 （默认 '#C8C8C8' ）
+	 * @property {Object}			customStyle		自定义样式
+	 * @example <u-loading mode="circle"></u-loading>
+	 */
+	export default {
+		name: "u-loading-page",
+		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+		data() {
+			return {};
+		},
+		methods: {},
+	};
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
+	@import "../../libs/css/components.scss";
 
-$text-color: rgb(200, 200, 200) !default;
-$text-size: 19px !default;
-$u-loading-icon-margin-bottom: 10px !default;
+	$text-color: rgb(200, 200, 200) !default;
+	$text-size: 19px !default;
+	$u-loading-icon-margin-bottom: 10px !default;
 
-.u-loading-page {
-    @include flex(column);
-    flex: 1;
-    align-items: center;
-    justify-content: center;
+	.u-loading-page {
+		@include flex(column);
+		flex: 1;
+		align-items: center;
+		justify-content: center;
 
-    &__warpper {
-        margin-top: -150px;
-        justify-content: center;
-        align-items: center;
-        /* #ifndef APP-NVUE */
-        color: $text-color;
-        font-size: $text-size;
-        /* #endif */
-        @include flex(column);
+		&__warpper {
+			margin-top: -150px;
+			justify-content: center;
+			align-items: center;
+			/* #ifndef APP-NVUE */
+			color: $text-color;
+			font-size: $text-size;
+			/* #endif */
+			@include flex(column);
 
-        &__loading-icon {
-            margin-bottom: $u-loading-icon-margin-bottom;
+			&__loading-icon {
+				margin-bottom: $u-loading-icon-margin-bottom;
 
-            &__img {
-                width: 40px;
-                height: 40px;
-            }
-        }
+				&__img {
+					width: 40px;
+					height: 40px;
+				}
+			}
 
-        &__text {
-            font-size: $text-size;
-            color: $text-color;
-        }
-    }
-}
-</style>
+			&__text {
+				font-size: $text-size;
+				color: $text-color;
+			}
+		}
+	}
+</style>

unpackage/dist/build/mp-weixin/pages/index.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "首页",
   "usingComponents": {
     "u-swiper": "/uni_modules/uview-ui/components/u-swiper/u-swiper",
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
   }
 }

unpackage/dist/build/mp-weixin/pages/index/addrList/index.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
   }
 }

unpackage/dist/build/mp-weixin/pages/index/addrList/index.wxml

@@ -1 +1 @@
-<view class="page data-v-6a70bc40"><nav-bar vue-id="c9f7c884-1" title="城市展厅" back="{{true}}" color="black" background="white" class="data-v-6a70bc40" bind:__l="__l"></nav-bar><view class="content data-v-6a70bc40"><block wx:for="{{bannerList1}}" wx:for-item="item" wx:for-index="index"><view class="cartDef data-v-6a70bc40"><image style="width:104rpx;height:104rpx;margin-top:64rpx;border-radius:50%;" src="{{picBase+item.logo}}" mode class="data-v-6a70bc40"></image><view class="companyName data-v-6a70bc40">吉格斯</view><view class="connect data-v-6a70bc40"><image style="width:30rpx;height:30rpx;display:inline-block;" src="/static/index/dianhua.png" mode class="data-v-6a70bc40"></image><view class="txt data-v-6a70bc40">联系电话</view></view><view class="connectDes data-v-6a70bc40"><view class="num data-v-6a70bc40">{{''+item.phone+''}}</view><view data-event-opts="{{[['tap',[['call',['$0'],[[['bannerList1','',index,'phone']]]]]]]}}" class="callBtn data-v-6a70bc40" bindtap="__e">拨号</view></view><view class="addr data-v-6a70bc40"><image style="width:24rpx;height:32rpx;display:inline-block;" src="/static/index/weizhi.png" mode class="data-v-6a70bc40"></image><view class="txt data-v-6a70bc40">{{''+item.company+''}}</view></view><view class="addrInfo data-v-6a70bc40"><view class="txt data-v-6a70bc40">{{''+item.address+''}}</view><image style="width:36rpx;height:36rpx;display:inline-block;" src="/static/index/daohang.png" mode data-event-opts="{{[['tap',[['daohang',['$0'],[[['bannerList1','',index]]]]]]]}}" bindtap="__e" class="data-v-6a70bc40"></image></view></view></block></view><u-loadmore vue-id="c9f7c884-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-6a70bc40" bind:__l="__l"></u-loadmore></view>
+<view class="page data-v-183797bf"><nav-bar vue-id="c9f7c884-1" title="城市展厅" back="{{true}}" color="black" background="white" class="data-v-183797bf" bind:__l="__l"></nav-bar><view class="content data-v-183797bf"><block wx:for="{{bannerList1}}" wx:for-item="item" wx:for-index="index"><view class="cartDef data-v-183797bf"><image style="width:104rpx;height:104rpx;margin-top:64rpx;border-radius:50%;" src="{{picBase+item.logo}}" mode class="data-v-183797bf"></image><view class="companyName data-v-183797bf">吉格斯</view><view class="connect data-v-183797bf"><image style="width:30rpx;height:30rpx;display:inline-block;" src="/static/index/dianhua.png" mode class="data-v-183797bf"></image><view class="txt data-v-183797bf">联系电话</view></view><view class="connectDes data-v-183797bf"><view class="num data-v-183797bf">{{''+item.phone+''}}</view><view data-event-opts="{{[['tap',[['call',['$0'],[[['bannerList1','',index,'phone']]]]]]]}}" class="callBtn data-v-183797bf" bindtap="__e">拨号</view></view><view class="addr data-v-183797bf"><image style="width:24rpx;height:32rpx;display:inline-block;" src="/static/index/weizhi.png" mode class="data-v-183797bf"></image><view class="txt data-v-183797bf">{{''+item.company+''}}</view></view><view class="addrInfo data-v-183797bf"><view class="txt data-v-183797bf">{{''+item.address+''}}</view><image style="width:36rpx;height:36rpx;display:inline-block;" src="/static/index/daohang.png" mode data-event-opts="{{[['tap',[['daohang',['$0'],[[['bannerList1','',index]]]]]]]}}" bindtap="__e" class="data-v-183797bf"></image></view></view></block></view><u-loadmore vue-id="c9f7c884-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-183797bf" bind:__l="__l"></u-loadmore><u-loading-page vue-id="c9f7c884-3" loading="{{loading}}" image="/static/index/logo.png" loading-text="页面加载中..." class="data-v-183797bf" bind:__l="__l"></u-loading-page></view>

unpackage/dist/build/mp-weixin/pages/index/productLead/index.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
   }
 }

unpackage/dist/build/mp-weixin/pages/index/productLead/index.wxml

@@ -1 +1 @@
-<view class="page data-v-a5d38758"><nav-bar vue-id="5d58823e-1" title="产品指南" back="{{true}}" color="black" background="white" class="data-v-a5d38758" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-a5d38758"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-a5d38758" bindtap="__e"><image src="{{picBase+item.image}}" mode class="data-v-a5d38758"></image><view class="bottom data-v-a5d38758"><view class="txt data-v-a5d38758">{{''+item.title+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-a5d38758" style="justify-content:center;"><u-empty vue-id="5d58823e-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-a5d38758" bind:__l="__l"></u-empty></view></block><u-loadmore vue-id="5d58823e-3" status="{{status}}" nomoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-a5d38758" bind:__l="__l"></u-loadmore></view>
+<view class="page data-v-201b7b77"><nav-bar vue-id="5d58823e-1" title="产品指南" back="{{true}}" color="black" background="white" class="data-v-201b7b77" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-201b7b77"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-201b7b77" bindtap="__e"><image src="{{picBase+item.image}}" mode class="data-v-201b7b77"></image><view class="bottom data-v-201b7b77"><view class="txt data-v-201b7b77">{{''+item.title+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-201b7b77" style="justify-content:center;"><u-empty vue-id="5d58823e-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-201b7b77" bind:__l="__l"></u-empty></view></block><u-loadmore vue-id="5d58823e-3" status="{{status}}" nomoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-201b7b77" bind:__l="__l"></u-loadmore><u-loading-page vue-id="5d58823e-4" loading="{{loading}}" image="/static/index/logo.png" loading-text="页面加载中..." class="data-v-201b7b77" bind:__l="__l"></u-loading-page></view>

unpackage/dist/build/mp-weixin/pages/index/productLead/index.wxss

@@ -1 +1 @@
-.data-v-a5d38758 .u-line{width:56rpx!important}.page.data-v-a5d38758{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.con.data-v-a5d38758{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-a5d38758{width:336rpx;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx;display:flex;flex-direction:column}.con .item image.data-v-a5d38758{width:100%;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .bottom.data-v-a5d38758{display:flex;justify-content:center;align-items:center;height:76rpx;background:#fff;border-radius:0 0 24rpx 24rpx}.con .item .bottom .txt.data-v-a5d38758{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.data-v-201b7b77 .u-line{width:56rpx!important}.data-v-201b7b77 .u-loading-page{position:relative!important;z-index:1e+23!important}.data-v-201b7b77 .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-201b7b77{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.con.data-v-201b7b77{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-201b7b77{width:336rpx;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx;display:flex;flex-direction:column}.con .item image.data-v-201b7b77{width:100%;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .bottom.data-v-201b7b77{display:flex;justify-content:center;align-items:center;height:76rpx;background:#fff;border-radius:0 0 24rpx 24rpx}.con .item .bottom .txt.data-v-201b7b77{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.wxml

@@ -1 +1 @@
-<view class="page data-v-50fb62c5"><nav-bar vue-id="76bf8a26-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'产品指南'}}" back="{{true}}" color="black" background="white" class="data-v-50fb62c5" bind:__l="__l"></nav-bar><view class="content data-v-50fb62c5"><view class="title data-v-50fb62c5">{{''+content.title+''}}</view><view class="p data-v-50fb62c5"><u-parse vue-id="76bf8a26-2" content="{{content.content}}" class="data-v-50fb62c5" bind:__l="__l"></u-parse></view><image style="margin-bottom:64rpx;" src="{{picBase+content.image}}" mode class="data-v-50fb62c5"></image></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-50fb62c5"><button class="rBtn data-v-50fb62c5" open-type="share">分享</button></view></block><u-loading-page vue-id="76bf8a26-3" loading="{{loading}}" loading-text="页面加载中..." class="data-v-50fb62c5" bind:__l="__l"></u-loading-page></view>
+<view class="page data-v-2c100a7c"><nav-bar vue-id="76bf8a26-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'产品指南'}}" back="{{true}}" color="black" background="white" class="data-v-2c100a7c" bind:__l="__l"></nav-bar><view class="content data-v-2c100a7c"><view class="title data-v-2c100a7c">{{''+content.title+''}}</view><view class="p data-v-2c100a7c"><u-parse vue-id="76bf8a26-2" content="{{content.content}}" class="data-v-2c100a7c" bind:__l="__l"></u-parse></view><image style="margin-bottom:64rpx;" src="{{picBase+content.image}}" mode class="data-v-2c100a7c"></image></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-2c100a7c"><button class="rBtn data-v-2c100a7c" open-type="share">分享</button></view></block><u-loading-page vue-id="76bf8a26-3" loading="{{loading}}" image="/static/index/logo.png" loading-text="页面加载中..." class="data-v-2c100a7c" bind:__l="__l"></u-loading-page></view>

unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.wxss

@@ -1 +1 @@
-.data-v-50fb62c5 button::after{border:none!important}.page.data-v-50fb62c5{padding-bottom:160rpx}.content.data-v-50fb62c5{padding:48rpx 32rpx 0 32rpx}.content .title.data-v-50fb62c5{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:50rpx}.content .p.data-v-50fb62c5{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333;line-height:50rpx;margin-bottom:50rpx}.content image.data-v-50fb62c5{width:686rpx;height:686rpx;border-radius:0 40rpx 0 40rpx}.btnBox.data-v-50fb62c5{height:160rpx;background:#fff;box-shadow:0rpx 0rpx 8rpx 0rpx rgba(0,0,0,.16);position:fixed;bottom:0;width:calc(100% - 64rpx);display:flex;align-items:center;justify-content:space-between;padding:0 32rpx}.btnBox .rBtn.data-v-50fb62c5{width:100%;height:96rpx;background:#333;border-radius:4rpx;border:2rpx solid #333;display:flex;justify-content:center;align-items:center;font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff}
+.data-v-2c100a7c button::after{border:none!important}.data-v-2c100a7c .u-loading-page{position:relative!important;z-index:1e+23!important}.data-v-2c100a7c .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-2c100a7c{padding-bottom:160rpx}.content.data-v-2c100a7c{padding:48rpx 32rpx 0 32rpx}.content .title.data-v-2c100a7c{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:50rpx}.content .p.data-v-2c100a7c{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333;line-height:50rpx;margin-bottom:50rpx}.content image.data-v-2c100a7c{width:686rpx;height:686rpx;border-radius:0 40rpx 0 40rpx}.btnBox.data-v-2c100a7c{height:160rpx;background:#fff;box-shadow:0rpx 0rpx 8rpx 0rpx rgba(0,0,0,.16);position:fixed;bottom:0;width:calc(100% - 64rpx);display:flex;align-items:center;justify-content:space-between;padding:0 32rpx}.btnBox .rBtn.data-v-2c100a7c{width:100%;height:96rpx;background:#333;border-radius:4rpx;border:2rpx solid #333;display:flex;justify-content:center;align-items:center;font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff}

unpackage/dist/build/mp-weixin/pages/mall/goodsList/index.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
   }
 }

unpackage/dist/build/mp-weixin/pages/mall/goodsList/index.wxml

@@ -1 +1 @@
-<view class="page data-v-2356900c"><nav-bar vue-id="f45278de-1" title="{{name}}" back="{{true}}" color="black" background="white" class="data-v-2356900c" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-2356900c"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-2356900c" bindtap="__e"><view class="topBox data-v-2356900c"><image src="{{picBase+item.cover}}" mode class="data-v-2356900c"></image></view><view class="bottom data-v-2356900c"><view class="txt data-v-2356900c">{{''+item.name+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-2356900c" style="justify-content:center;"><u-empty vue-id="f45278de-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-2356900c" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="f45278de-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-2356900c" bind:__l="__l"></u-loadmore></block></view>
+<view class="page data-v-4ff1af72"><nav-bar vue-id="f45278de-1" title="{{name}}" back="{{true}}" color="black" background="white" class="data-v-4ff1af72" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-4ff1af72"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-4ff1af72" bindtap="__e"><view class="topBox data-v-4ff1af72"><image src="{{picBase+item.cover}}" mode class="data-v-4ff1af72"></image></view><view class="bottom data-v-4ff1af72"><view class="txt data-v-4ff1af72">{{''+item.name+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-4ff1af72" style="justify-content:center;"><u-empty vue-id="f45278de-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-4ff1af72" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="f45278de-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-4ff1af72" bind:__l="__l"></u-loadmore></block><u-loading-page vue-id="f45278de-4" loading="{{loading}}" image="/static/index/logo.png" loading-text="页面加载中..." class="data-v-4ff1af72" bind:__l="__l"></u-loading-page></view>

unpackage/dist/build/mp-weixin/pages/mall/goodsList/index.wxss

@@ -1 +1 @@
-.data-v-2356900c .u-line{width:56rpx!important}.page.data-v-2356900c{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.con.data-v-2356900c{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-2356900c{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item .topBox.data-v-2356900c{position:relative;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .topBox image.data-v-2356900c{width:100%;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .bottom.data-v-2356900c{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-2356900c{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.data-v-4ff1af72 .u-line{width:56rpx!important}.data-v-4ff1af72 .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-4ff1af72 .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-4ff1af72{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.con.data-v-4ff1af72{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-4ff1af72{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item .topBox.data-v-4ff1af72{position:relative;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .topBox image.data-v-4ff1af72{width:100%;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .bottom.data-v-4ff1af72{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-4ff1af72{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

unpackage/dist/build/mp-weixin/pages/my.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "我的",
   "usingComponents": {
     "u-count-down": "/uni_modules/uview-ui/components/u-count-down/u-count-down",
-    "u-action-sheet": "/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet"
+    "u-action-sheet": "/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
   }
 }

unpackage/dist/build/mp-weixin/pages/my/actGoods/index.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
   }
 }

unpackage/dist/build/mp-weixin/pages/my/actGoods/index.wxml

@@ -1 +1 @@
-<view class="page data-v-3b32385e"><nav-bar vue-id="1c6c9da5-1" title="活动商品" back="{{true}}" color="black" background="white" class="data-v-3b32385e" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-3b32385e"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-3b32385e" bindtap="__e"><view class="topBox data-v-3b32385e"><image src="{{picBase+item.$orig.image}}" mode class="data-v-3b32385e"></image></view><view class="bottom data-v-3b32385e"><view class="txt data-v-3b32385e">{{''+item.$orig.title+''}}</view><view class="txt1 data-v-3b32385e"><view class="l data-v-3b32385e">{{''+item.f0+''}}</view><view class="r data-v-3b32385e">活动开始</view></view><view class="txt1 data-v-3b32385e"><view class="l data-v-3b32385e">{{''+item.f1+''}}</view><view class="r data-v-3b32385e">活动结束</view></view></view></view></block></view></block><block wx:else><view class="con data-v-3b32385e" style="justify-content:center;"><u-empty vue-id="1c6c9da5-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-3b32385e" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="1c6c9da5-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-3b32385e" bind:__l="__l"></u-loadmore></block></view>
+<view class="page data-v-3fd4bec3"><nav-bar vue-id="1c6c9da5-1" title="活动商品" back="{{true}}" color="black" background="white" class="data-v-3fd4bec3" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-3fd4bec3"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-3fd4bec3" bindtap="__e"><view class="topBox data-v-3fd4bec3"><image src="{{picBase+item.$orig.image}}" mode class="data-v-3fd4bec3"></image></view><view class="bottom data-v-3fd4bec3"><view class="txt data-v-3fd4bec3">{{''+item.$orig.title+''}}</view><view class="txt1 data-v-3fd4bec3"><view class="l data-v-3fd4bec3">{{''+item.f0+''}}</view><view class="r data-v-3fd4bec3">活动开始</view></view><view class="txt1 data-v-3fd4bec3"><view class="l data-v-3fd4bec3">{{''+item.f1+''}}</view><view class="r data-v-3fd4bec3">活动结束</view></view></view></view></block></view></block><block wx:else><view class="con data-v-3fd4bec3" style="justify-content:center;"><u-empty vue-id="1c6c9da5-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-3fd4bec3" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="1c6c9da5-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-3fd4bec3" bind:__l="__l"></u-loadmore></block><u-loading-page vue-id="1c6c9da5-4" loading="{{loading}}" image="/static/index/logo.png" loading-text="页面加载中..." class="data-v-3fd4bec3" bind:__l="__l"></u-loading-page></view>

unpackage/dist/build/mp-weixin/pages/my/actGoods/index.wxss

@@ -1 +1 @@
-.data-v-3b32385e .u-line{width:56rpx!important}.page.data-v-3b32385e{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx);overflow-x:hidden}.con.data-v-3b32385e{width:100%;display:flex;flex-direction:column;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-3b32385e{width:calc(100% - 64rpx);background:#fff;border-radius:48rpx;border:4rpx solid #333;margin-right:16rpx;margin-bottom:24rpx;padding-bottom:40rpx;display:flex;flex-direction:column}.con .item .topBox.data-v-3b32385e{position:relative;padding:0 32rpx;padding-top:20rpx}.con .item .topBox image.data-v-3b32385e{width:100%;height:292rpx;border-radius:40rpx 40rpx 0 0}.con .item .topBox .cutDown.data-v-3b32385e{position:absolute;top:0;left:0;width:100%;z-index:1;display:flex;justify-content:center}.con .item .topBox .cutDown .item2.data-v-3b32385e{width:48rpx;height:48rpx;background:rgba(0,0,0,.69);border-radius:4rpx;margin-top:24rpx;font-size:24rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#fff;display:flex;justify-content:center;align-items:center}.con .item .topBox .cutDown .item_d.data-v-3b32385e{width:12rpx;height:40rpx;font-size:28rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#000;margin:0 10rpx;background:none}.con .item .bottom.data-v-3b32385e{display:flex;flex-direction:column;padding:0 64rpx}.con .item .bottom .txt.data-v-3b32385e{width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-top:20rpx;font-weight:600}.con .item .bottom .txt1.data-v-3b32385e{margin-top:20rpx;display:flex;justify-content:space-between;font-weight:300}
+.data-v-3fd4bec3 .u-line{width:56rpx!important}.data-v-3fd4bec3 .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-3fd4bec3 .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-3fd4bec3{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx);overflow-x:hidden}.con.data-v-3fd4bec3{width:100%;display:flex;flex-direction:column;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-3fd4bec3{width:calc(100% - 64rpx);background:#fff;border-radius:48rpx;border:4rpx solid #333;margin-right:16rpx;margin-bottom:24rpx;padding-bottom:40rpx;display:flex;flex-direction:column}.con .item .topBox.data-v-3fd4bec3{position:relative;padding:0 32rpx;padding-top:20rpx}.con .item .topBox image.data-v-3fd4bec3{width:100%;height:292rpx;border-radius:40rpx 40rpx 0 0}.con .item .topBox .cutDown.data-v-3fd4bec3{position:absolute;top:0;left:0;width:100%;z-index:1;display:flex;justify-content:center}.con .item .topBox .cutDown .item2.data-v-3fd4bec3{width:48rpx;height:48rpx;background:rgba(0,0,0,.69);border-radius:4rpx;margin-top:24rpx;font-size:24rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#fff;display:flex;justify-content:center;align-items:center}.con .item .topBox .cutDown .item_d.data-v-3fd4bec3{width:12rpx;height:40rpx;font-size:28rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#000;margin:0 10rpx;background:none}.con .item .bottom.data-v-3fd4bec3{display:flex;flex-direction:column;padding:0 64rpx}.con .item .bottom .txt.data-v-3fd4bec3{width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-top:20rpx;font-weight:600}.con .item .bottom .txt1.data-v-3fd4bec3{margin-top:20rpx;display:flex;justify-content:space-between;font-weight:300}

unpackage/dist/build/mp-weixin/pages/my/changeNewGoods/index.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
   }
 }

unpackage/dist/build/mp-weixin/pages/my/changeNewGoods/index.wxml

@@ -1 +1 @@
-<view class="page data-v-76117b9e"><nav-bar vue-id="51da2263-1" title="换新商城" back="{{true}}" color="black" background="white" class="data-v-76117b9e" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-76117b9e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-76117b9e" bindtap="__e"><view class="topBox data-v-76117b9e"><image src="{{picBase+item.cover}}" mode class="data-v-76117b9e"></image></view><view class="bottom data-v-76117b9e"><view class="txt data-v-76117b9e">{{''+item.name+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-76117b9e" style="justify-content:center;"><u-empty vue-id="51da2263-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-76117b9e" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="51da2263-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-76117b9e" bind:__l="__l"></u-loadmore></block></view>
+<view class="page data-v-bf167184"><nav-bar vue-id="51da2263-1" title="换新商城" back="{{true}}" color="black" background="white" class="data-v-bf167184" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-bf167184"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-bf167184" bindtap="__e"><view class="topBox data-v-bf167184"><image src="{{picBase+item.cover}}" mode class="data-v-bf167184"></image></view><view class="bottom data-v-bf167184"><view class="txt data-v-bf167184">{{''+item.name+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-bf167184" style="justify-content:center;"><u-empty vue-id="51da2263-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-bf167184" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="51da2263-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-bf167184" bind:__l="__l"></u-loadmore></block><u-loading-page vue-id="51da2263-4" loading="{{loading}}" image="/static/index/logo.png" loading-text="页面加载中..." class="data-v-bf167184" bind:__l="__l"></u-loading-page></view>

unpackage/dist/build/mp-weixin/pages/my/changeNewGoods/index.wxss

@@ -1 +1 @@
-.data-v-76117b9e .u-line{width:56rpx!important}.page.data-v-76117b9e{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.con.data-v-76117b9e{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-76117b9e{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx;display:flex;flex-direction:column}.con .item .topBox.data-v-76117b9e{position:relative;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .topBox image.data-v-76117b9e{width:100%;height:100%;border-radius:24rpx 24rpx 0 0}.con .item .bottom.data-v-76117b9e{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-76117b9e{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.data-v-bf167184 .u-line{width:56rpx!important}.data-v-bf167184 .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-bf167184 .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-bf167184{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.con.data-v-bf167184{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-bf167184{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx;display:flex;flex-direction:column}.con .item .topBox.data-v-bf167184{position:relative;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .topBox image.data-v-bf167184{width:100%;height:100%;border-radius:24rpx 24rpx 0 0}.con .item .bottom.data-v-bf167184{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-bf167184{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

unpackage/dist/build/mp-weixin/pages/my/collect/index.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
   }
 }

unpackage/dist/build/mp-weixin/pages/my/collect/index.wxml

@@ -1 +1 @@
-<view class="page data-v-eeb9975e"><nav-bar vue-id="7ebb5d63-1" title="收藏" back="{{true}}" color="black" background="white" class="data-v-eeb9975e" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-eeb9975e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-eeb9975e" bindtap="__e"><image src="{{picBase+item.goods.cover}}" mode class="data-v-eeb9975e"></image><view class="bottom data-v-eeb9975e"><view class="txt data-v-eeb9975e">{{''+item.goods.name+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-eeb9975e" style="justify-content:center;"><u-empty vue-id="7ebb5d63-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-eeb9975e" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="7ebb5d63-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-eeb9975e" bind:__l="__l"></u-loadmore></block></view>
+<view class="page data-v-0d7afade"><nav-bar vue-id="7ebb5d63-1" title="收藏" back="{{true}}" color="black" background="white" class="data-v-0d7afade" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-0d7afade"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-0d7afade" bindtap="__e"><image src="{{picBase+item.goods.cover}}" mode class="data-v-0d7afade"></image><view class="bottom data-v-0d7afade"><view class="txt data-v-0d7afade">{{''+item.goods.name+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-0d7afade" style="justify-content:center;"><u-empty vue-id="7ebb5d63-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-0d7afade" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="7ebb5d63-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-0d7afade" bind:__l="__l"></u-loadmore></block><u-loading-page vue-id="7ebb5d63-4" loading="{{loading}}" image="/static/index/logo.png" loading-text="页面加载中..." class="data-v-0d7afade" bind:__l="__l"></u-loading-page></view>

unpackage/dist/build/mp-weixin/pages/my/collect/index.wxss

@@ -1 +1 @@
-.data-v-eeb9975e .u-line{width:56rpx!important}.page.data-v-eeb9975e{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.con.data-v-eeb9975e{width:100%;display:flex;flex-wrap:wrap;align-items:flex-start;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-eeb9975e{width:336rpx;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx;border-bottom:0;display:flex;flex-direction:column}.con .item image.data-v-eeb9975e{width:100%;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .bottom.data-v-eeb9975e{display:flex;justify-content:center;align-items:center;height:76rpx;background:#fff;border-radius:0 0 24rpx 24rpx}.con .item .bottom .txt.data-v-eeb9975e{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.data-v-0d7afade .u-line{width:56rpx!important}.data-v-0d7afade .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-0d7afade .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-0d7afade{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.con.data-v-0d7afade{width:100%;display:flex;flex-wrap:wrap;align-items:flex-start;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-0d7afade{width:336rpx;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx;border-bottom:0;display:flex;flex-direction:column}.con .item image.data-v-0d7afade{width:100%;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .bottom.data-v-0d7afade{display:flex;justify-content:center;align-items:center;height:76rpx;background:#fff;border-radius:0 0 24rpx 24rpx}.con .item .bottom .txt.data-v-0d7afade{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

unpackage/dist/build/mp-weixin/pages/my/duijiang/index.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore",
-    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty"
+    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
   }
 }

unpackage/dist/build/mp-weixin/pages/my/duijiang/index.wxss

@@ -1 +1 @@
-.page.data-v-29a72af3{min-height:100vh;background:#f1f1f1}.content.data-v-29a72af3{padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-29a72af3{height:432rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .line.data-v-29a72af3{display:flex;justify-content:space-between}.content .item .line .left.data-v-29a72af3{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-29a72af3{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}
+.data-v-dc7a58d4 .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-dc7a58d4 .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-dc7a58d4{min-height:100vh;background:#f1f1f1}.content.data-v-dc7a58d4{padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-dc7a58d4{height:432rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .line.data-v-dc7a58d4{display:flex;justify-content:space-between}.content .item .line .left.data-v-dc7a58d4{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-dc7a58d4{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}

unpackage/dist/build/mp-weixin/pages/my/sellAfterDefer/index.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore",
-    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty"
+    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
   }
 }

unpackage/dist/build/mp-weixin/pages/my/sellAfterDefer/index.wxml

@@ -1 +1 @@
-<view class="page data-v-9bae511a"><nav-bar vue-id="e0d6fabe-1" title="售后保障" back="{{true}}" color="black" background="white" class="data-v-9bae511a" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="content data-v-9bae511a"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view class="item data-v-9bae511a"><view class="line t1 data-v-9bae511a">质保到期还剩：<text class="data-v-9bae511a">{{''+item.dayCount+"天"}}</text></view><view class="line data-v-9bae511a"><view class="left data-v-9bae511a">产品名称</view><view class="right data-v-9bae511a">{{''+item.product+''}}</view></view><view class="line data-v-9bae511a"><view class="left data-v-9bae511a">产品型号</view><view class="right data-v-9bae511a">{{''+item.model_number+''}}</view></view><view class="line data-v-9bae511a"><view class="left data-v-9bae511a">业主姓名</view><view class="right data-v-9bae511a">{{''+item.name+''}}</view></view><view class="line data-v-9bae511a"><view class="left data-v-9bae511a">联系电话</view><view class="right data-v-9bae511a">{{''+item.phone+''}}</view></view><view class="line data-v-9bae511a"><view class="left data-v-9bae511a">项目地址</view><view class="right data-v-9bae511a">{{''+item.address+''}}</view></view></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="e0d6fabe-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-9bae511a" bind:__l="__l"></u-loadmore></block></view></block><block wx:else><view class="con data-v-9bae511a" style="justify-content:center;"><u-empty vue-id="e0d6fabe-3" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-9bae511a" bind:__l="__l"></u-empty></view></block></view>
+<view class="page data-v-358b7612"><nav-bar vue-id="e0d6fabe-1" title="售后保障" back="{{true}}" color="black" background="white" class="data-v-358b7612" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="content data-v-358b7612"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view class="item data-v-358b7612"><view class="line t1 data-v-358b7612">质保到期还剩：<text class="data-v-358b7612">{{''+item.dayCount+"天"}}</text></view><view class="line data-v-358b7612"><view class="left data-v-358b7612">产品名称</view><view class="right data-v-358b7612">{{''+item.product+''}}</view></view><view class="line data-v-358b7612"><view class="left data-v-358b7612">产品型号</view><view class="right data-v-358b7612">{{''+item.model_number+''}}</view></view><view class="line data-v-358b7612"><view class="left data-v-358b7612">业主姓名</view><view class="right data-v-358b7612">{{''+item.name+''}}</view></view><view class="line data-v-358b7612"><view class="left data-v-358b7612">联系电话</view><view class="right data-v-358b7612">{{''+item.phone+''}}</view></view><view class="line data-v-358b7612"><view class="left data-v-358b7612">项目地址</view><view class="right data-v-358b7612">{{''+item.address+''}}</view></view></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="e0d6fabe-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-358b7612" bind:__l="__l"></u-loadmore></block></view></block><block wx:else><view class="con data-v-358b7612" style="justify-content:center;"><u-empty vue-id="e0d6fabe-3" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-358b7612" bind:__l="__l"></u-empty></view></block><u-loading-page vue-id="e0d6fabe-4" loading="{{loading}}" image="/static/index/logo.png" loading-text="页面加载中..." class="data-v-358b7612" bind:__l="__l"></u-loading-page></view>

unpackage/dist/build/mp-weixin/pages/my/sellAfterDefer/index.wxss

@@ -1 +1 @@
-.page.data-v-9bae511a{background:#f1f1f1;min-height:100vh}.content.data-v-9bae511a{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-9bae511a{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:8rpx 24rpx;padding-top:10px;padding-bottom:15px;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .t1.data-v-9bae511a{justify-content:center!important;font-size:34rpx;font-weight:700}.content .item .t1 text.data-v-9bae511a{color:#f7790c}.content .item .line.data-v-9bae511a{display:flex;justify-content:space-between;margin-bottom:16rpx}.content .item .line .left.data-v-9bae511a{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:300;color:#666;display:flex;align-items:center}.content .item .line .right.data-v-9bae511a{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:300;color:#333}.content .item .line.data-v-9bae511a:last-child{margin-bottom:0}
+.data-v-358b7612 .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-358b7612 .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-358b7612{background:#f1f1f1;min-height:100vh}.content.data-v-358b7612{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-358b7612{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:8rpx 24rpx;padding-top:10px;padding-bottom:15px;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .t1.data-v-358b7612{justify-content:center!important;font-size:34rpx;font-weight:700}.content .item .t1 text.data-v-358b7612{color:#f7790c}.content .item .line.data-v-358b7612{display:flex;justify-content:space-between;margin-bottom:16rpx}.content .item .line .left.data-v-358b7612{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:300;color:#666;display:flex;align-items:center}.content .item .line .right.data-v-358b7612{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:300;color:#333}.content .item .line.data-v-358b7612:last-child{margin-bottom:0}

unpackage/dist/build/mp-weixin/pages/my/useLead/index.wxml

@@ -1 +1 @@
-<view class="page data-v-5ebe3462"><nav-bar vue-id="55cc012c-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'小程序使用指南'}}" back="{{true}}" color="black" background="white" class="data-v-5ebe3462" bind:__l="__l"></nav-bar><view class="content data-v-5ebe3462"><view class="title data-v-5ebe3462">{{''+content.title+''}}</view><view class="p data-v-5ebe3462"><u-parse vue-id="55cc012c-2" content="{{content.content}}" class="data-v-5ebe3462" bind:__l="__l"></u-parse></view><image src="{{picBase+content.image}}" mode class="data-v-5ebe3462"></image></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-5ebe3462"><button class="rBtn data-v-5ebe3462" open-type="share">一键分享</button></view></block><u-loading-page vue-id="55cc012c-3" loading="{{loading}}" loading-text="页面加载中..." class="data-v-5ebe3462" bind:__l="__l"></u-loading-page></view>
+<view class="page data-v-a0f2cb96"><nav-bar vue-id="55cc012c-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'小程序使用指南'}}" back="{{true}}" color="black" background="white" class="data-v-a0f2cb96" bind:__l="__l"></nav-bar><view class="content data-v-a0f2cb96"><view class="title data-v-a0f2cb96">{{''+content.title+''}}</view><view class="p data-v-a0f2cb96"><u-parse vue-id="55cc012c-2" content="{{content.content}}" class="data-v-a0f2cb96" bind:__l="__l"></u-parse></view><image src="{{picBase+content.image}}" mode class="data-v-a0f2cb96"></image></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-a0f2cb96"><button class="rBtn data-v-a0f2cb96" open-type="share">一键分享</button></view></block><u-loading-page vue-id="55cc012c-3" loading="{{loading}}" image="/static/index/logo.png" loading-text="页面加载中..." class="data-v-a0f2cb96" bind:__l="__l"></u-loading-page></view>

unpackage/dist/build/mp-weixin/pages/my/useLead/index.wxss

@@ -1 +1 @@
-.data-v-5ebe3462 button::after{border:none!important}.page.data-v-5ebe3462{padding-bottom:160rpx}.content.data-v-5ebe3462{padding:48rpx 32rpx 0 32rpx}.content .title.data-v-5ebe3462{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:50rpx}.content .p.data-v-5ebe3462{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333;line-height:50rpx;margin-bottom:50rpx}.content image.data-v-5ebe3462{width:686rpx;height:686rpx;border-radius:0 40rpx 0 40rpx}.btnBox.data-v-5ebe3462{height:160rpx;background:#fff;box-shadow:0rpx 0rpx 8rpx 0rpx rgba(0,0,0,.16);position:fixed;bottom:0;width:calc(100% - 64rpx);display:flex;align-items:center;justify-content:space-between;padding:0 32rpx}.btnBox .rBtn.data-v-5ebe3462{width:100%;height:96rpx;background:#333;border-radius:4rpx;border:2rpx solid #333;display:flex;justify-content:center;align-items:center;font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff}
+.data-v-a0f2cb96 button::after{border:none!important}.data-v-a0f2cb96 .u-loading-page{position:relative!important;z-index:1e+23!important}.data-v-a0f2cb96 .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-a0f2cb96{padding-bottom:160rpx}.content.data-v-a0f2cb96{padding:48rpx 32rpx 0 32rpx}.content .title.data-v-a0f2cb96{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:50rpx}.content .p.data-v-a0f2cb96{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333;line-height:50rpx;margin-bottom:50rpx}.content image.data-v-a0f2cb96{width:686rpx;height:686rpx;border-radius:0 40rpx 0 40rpx}.btnBox.data-v-a0f2cb96{height:160rpx;background:#fff;box-shadow:0rpx 0rpx 8rpx 0rpx rgba(0,0,0,.16);position:fixed;bottom:0;width:calc(100% - 64rpx);display:flex;align-items:center;justify-content:space-between;padding:0 32rpx}.btnBox .rBtn.data-v-a0f2cb96{width:100%;height:96rpx;background:#333;border-radius:4rpx;border:2rpx solid #333;display:flex;justify-content:center;align-items:center;font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff}

unpackage/dist/build/mp-weixin/pages/my/userInfo/index.wxss

@@ -1 +1 @@
-.content.data-v-4dbb9089{background:#f1f1f1;min-height:calc(100vh - 200rpx);padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-4dbb9089{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-4dbb9089:last-child{border-bottom:none}.content .item .line.data-v-4dbb9089{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-4dbb9089{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.content .item .line .right.data-v-4dbb9089{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;display:flex;align-items:center}.content .item .line .right .avatar.data-v-4dbb9089{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-4dbb9089{width:14rpx;height:24rpx}
+.data-v-39537691 .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-39537691 .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.content.data-v-39537691{background:#f1f1f1;min-height:calc(100vh - 200rpx);padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-39537691{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-39537691:last-child{border-bottom:none}.content .item .line.data-v-39537691{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-39537691{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.content .item .line .right.data-v-39537691{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;display:flex;align-items:center}.content .item .line .right .avatar.data-v-39537691{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-39537691{width:14rpx;height:24rpx}

unpackage/dist/build/mp-weixin/pages/service.json

@@ -1,4 +1,7 @@
 {
   "navigationBarTitleText": "售后",
-  "usingComponents": {}
+  "usingComponents": {
+    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
+  }
 }

unpackage/dist/build/mp-weixin/pages/service/detail/index.wxml

@@ -1 +1 @@
-<view class="page data-v-9d9f0c32"><nav-bar vue-id="99d34b82-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'服务'}}" back="{{true}}" color="black" background="white" class="data-v-9d9f0c32" bind:__l="__l"></nav-bar><view class="content data-v-9d9f0c32"><view class="title data-v-9d9f0c32">{{''+title+''}}</view><u-parse vue-id="99d34b82-2" content="{{content}}" class="data-v-9d9f0c32" bind:__l="__l"></u-parse></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-9d9f0c32"><button class="rBtn data-v-9d9f0c32" open-type="share">一键分享</button></view></block><u-loading-page vue-id="99d34b82-3" loading="{{loading}}" loading-text="页面加载中..." class="data-v-9d9f0c32" bind:__l="__l"></u-loading-page></view>
+<view class="page data-v-871c42b8"><nav-bar vue-id="99d34b82-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'服务'}}" back="{{true}}" color="black" background="white" class="data-v-871c42b8" bind:__l="__l"></nav-bar><view class="content data-v-871c42b8"><view class="title data-v-871c42b8">{{''+title+''}}</view><u-parse vue-id="99d34b82-2" content="{{content}}" class="data-v-871c42b8" bind:__l="__l"></u-parse></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-871c42b8"><button class="rBtn data-v-871c42b8" open-type="share">一键分享</button></view></block><u-loading-page vue-id="99d34b82-3" loading="{{loading}}" image="/static/index/logo.png" loading-text="页面加载中..." class="data-v-871c42b8" bind:__l="__l"></u-loading-page></view>