10.8上午

api/my/index.js

@@ -14,7 +14,20 @@ export const getAboutReq = (params, config = {}) => http.get('/api/getAbout', pa
 
 
 // 获取我的收藏
-export const getMyCollectDataReq = (params, config = {}) => http.get('/api/users/getMyCollectData', params, config)
+// export const getMyCollectDataReq = (params, config = {}) => http.get('/api/users/getMyCollectData', params, config)
+export const getMyCollectDataReq = (params, config = {}) => {
+
+	let apiUrl = '/api/users/getMyCollectData'
+	Object.keys(params).forEach((item, index) => {
+		if (index == 0) {
+			apiUrl += `?${item}=${params[item]}`
+		} else {
+			apiUrl += `&${item}=${params[item]}`
+		}
+	})
+	console.log('处理后的apiUrl', apiUrl);
+	return http.get(apiUrl, params, config)
+}
 
 // 获取我的收藏
 export const getMyCollectDetailReq = (params, config = {}) => {

pages.json

@@ -291,7 +291,8 @@
 					"path": "inviteDetail/index",
 					"style": {
 						"navigationBarTitleText": "",
-						"enablePullDownRefresh": false
+						"enablePullDownRefresh": false,
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
@@ -342,6 +343,13 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path": "test/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		}

pages/index.scss

@@ -118,8 +118,6 @@
 	}
 }
 .bg{
-	// background:url('https://oaigc.oss-cn-chengdu.aliyuncs.com/lamp/2023-09/2023090615382538343.png') no-repeat;
-	// background-image: url('@/static/index/bg.png');
 	background-size: 100% 100%;
 	.controlPart{
 		padding: 0 32rpx;
@@ -204,20 +202,27 @@
 			.item{
 				width: 336rpx;
 				// height: 368rpx;
-				background: #FFFFFF;
+				// background: #FFFFFF;
 				border-radius: 24rpx;
 				border: 2rpx solid #F1F1F1;
 				margin-right: 16rpx;
+				// box-sizing: content-box;
+				display: flex;
+				flex-direction: column;
+				// background: red;
 				image{
 					width: 336rpx;
 					height: 292rpx;
-					border-radius: 30rpx 30rpx 0 0;
+					// border-radius: 30rpx 30rpx 0 0;
+					border-radius: 24rpx 24rpx 0 0;
 				}
 				.bottom{
 					display: flex;
 					justify-content: center;
 					align-items: center;
 					height: 76rpx;
+					background: #FFFFFF;
+					border-radius: 0 0 24rpx 24rpx;
 				}
 			}	
 		}

pages/index/addrList/index.scss

@@ -1,17 +1,17 @@
 .page{
-	background: #fff;
-	min-height: 100vh;
 	padding-bottom: 32rpx;
+	background: #F1F1F1;
+	min-height: calc(100vh - 56rpx);
+	
 }
 .content{
 	padding: 32rpx;
-	// padding-top: 32rpx;
 	box-sizing: border-box;
 	.cartDef{
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		background:#fdf2e9;
+		background:#FDFBFA;
 		margin-bottom: 32rpx;
 		border-radius: 24rpx;
 		box-sizing: border-box;

pages/index/customMian_step1/index.vue

@@ -23,7 +23,8 @@
 				</view>
 			</view>
 
-			<view class="label" @click="handleOpenOrClose(1)">
+			<view class="label" @click="handleOpenOrClose(1)" style="padding-top: 64rpx;"
+				:style="{'padding-bottom':addOrLessIcon1=='/static/index/add.png'?'64rpx':'32rpx'}">
 				<view class="txt">
 					户型
 				</view>
@@ -39,7 +40,8 @@
 				</view>
 			</view>
 
-			<view class="label" @click="handleOpenOrClose(2)">
+			<view class="label" @click="handleOpenOrClose(2)" style="padding-top: 64rpx;"
+				:style="{'padding-bottom':addOrLessIcon1=='/static/index/add.png'?'64rpx':'32rpx'}">
 				<view class="txt">
 					系列
 				</view>

pages/index/mainList/index.scss

@@ -3,6 +3,8 @@
  }
 .page{
 	padding-bottom: 54rpx;
+	background: #F1F1F1;
+	min-height: calc(100vh - 56rpx);
 }
 .con{
 			width:100%;
@@ -18,12 +20,17 @@
 				margin-right: 16rpx;
 				margin-bottom: 24rpx;
 				
+				display: flex;
+				flex-direction: column;
 				.topBox{
 					position: relative;
+					// background: red;
+					height: 292rpx;
+					border-radius: 24rpx 24rpx 0 0;
 					image{
 						width: 100%;
-						height: 292rpx;
-						border-radius: 30rpx 30rpx 0 0;
+						height: 100%;
+						border-radius: 24rpx 24rpx 0 0;
 					}
 						
 				}

pages/index/productLead/index.scss

@@ -4,6 +4,8 @@
  }
 .page{
 	padding-bottom: 54rpx;
+	background: #F1F1F1;
+	min-height: calc(100vh - 56rpx);
 }
 .con{
 			width:100%;
@@ -13,21 +15,26 @@
 			padding-left: 28rpx;
 			.item{
 				width: 336rpx;
-				background: #FFFFFF;
+				// background: #FFFFFF;
 				border-radius: 24rpx;
 				border: 2rpx solid #F1F1F1;
 				margin-right: 16rpx;
 				margin-bottom: 24rpx;
+				display: flex;
+				flex-direction: column;
+				// background: red;
 				image{
 					width: 100%;
 					height: 292rpx;
-					border-radius: 30rpx 30rpx 0 0;
+					border-radius: 24rpx 24rpx 0 0;
 				}
 				.bottom{
 					display: flex;
 					justify-content: center;
 					align-items: center;
 					height: 76rpx;
+					background: #FFFFFF;
+					border-radius: 0 0 24rpx 24rpx;
 					
 					.txt{
 						width: 85%;

pages/index/productLead/index.vue

@@ -16,7 +16,9 @@
 			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
 			</u-empty>
 		</view>
-		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+		<!-- 	<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 />
 	</view>
 </template>
 
@@ -32,13 +34,42 @@
 			return {
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
-				list: []
+				list: [],
+
+				// 分页
+				page: 1,
+				pagesize: 15,
+				totalElements: 0,
+				loadstatus: "noMore",
+				// status: 'loadmore',
+			}
+		},
+		async onReachBottom() {
+			console.log('onReachBottom---------------------------------');
+			// this.status = "loading"
+			return
+			let allTotal = this.page * this.pagesize
+			if (allTotal < this.totalElements) {
+				this.page++;
+				this.status = "loading"
+				let parms = {
+					page: this.page,
+					per_page: this.pagesize,
+				}
+
+				console.log('每次传递的分页参数', parms);
+				this.changePageMthd(parms)
+			} else {
+				this.status = "nomore"
 			}
 		},
 		async onLoad(o) {
 			let res = await getGuideDataReq()
 			if (res.code == 0) {
 				this.list = res.data
+				console.log('首页指南列表返回值', res);
+
+				// this.totalElements = res.data.total
 			} else {
 				uni.showToast({
 					title: res.message,
@@ -54,6 +85,18 @@
 				uni.navigateTo({
 					url: '/pages/index/productLeadDetail/index'
 				})
+			},
+
+			async changePageMthd(parms) {
+				let res = await getGuideDataReq(parms)
+				if (res.code == 0) {
+					console.log('首页指南列表返回值--分页', res);
+					this.list = [...this.list, ...res.data.data]
+					this.status = "nomore"
+				} else {
+					this.$toast(res.message)
+					this.status = "nomore"
+				}
 			}
 		}
 	}

pages/mall.scss

@@ -52,6 +52,54 @@
 			background: #F2F2F2;
 		}
 	}
+	.rightDes2{
+		width: 100%;
+		background:#F2F2F2;
+		padding: 48rpx 0rpx 52rpx 30rpx;
+		overflow-y: scroll;
+		box-sizing: border-box;
+		height: calc(100vh - 380rpx);
+		.con{
+					width:100%;
+					display: flex;
+					flex-wrap: wrap;
+					.item{
+						width: 336rpx;
+						background: #FFFFFF;
+						border-radius: 24rpx;
+						border: 2rpx solid #F1F1F1;
+						margin-right: 16rpx;
+						margin-bottom: 24rpx;
+						
+						.topBox{
+							position: relative;
+							// background: red;
+							height: 292rpx;
+							border-radius: 24rpx 24rpx 0 0;
+							image{
+								width: 100%;
+								height: 292rpx;
+								border-radius: 24rpx 24rpx 0 0;
+							}
+								
+						}
+						.bottom{
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							height: 76rpx;
+							
+							.txt{
+								width: 85%;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+							}
+						}
+					}	
+				}
+	}
+	
 	.rightDes{
 		width: 100%;
 		background:#F2F2F2;
@@ -93,4 +141,7 @@
 }
 ::v-deep .uni-searchbar{
 	padding: 0;
-}
+}
+
+
+

pages/mall.vue

@@ -4,9 +4,6 @@
 
 		<view class="searchAndTab">
 			<view class="searchBox">
-				<!-- <u-search shape="round" :showAction="false" v-model="searchKey"></u-search> -->
-				<!-- <input class="uni-input" placeholder="请输入关键词" :value="searchKey" />
-				 -->
 				<uni-search-bar @confirm="search" @input="input" v-model="searchKey" placeholder="请输入关键词" radius="50"
 					cancelButton="none" bgColor="#F3F4F6"></uni-search-bar>
 			</view>
@@ -18,18 +15,31 @@
 
 
 		<view class="content" v-if="searchKey" style="margin-top: 140rpx;">
-			<view class="rightDes" style="height: calc(100vh - 330rpx);padding-left: 60rpx;">
-				<view class="item" v-if="resList.length!=0">
-					<view class="bottom">
-						<image @click="goDetail(item1)" :src="picBase+item1.cover" mode="" style="" class="img"
-							v-for="(item1,index) in resList">
-						</image>
+			<view class="rightDes2" style="height: calc(100vh - 330rpx);">
+				<u-loading-icon v-if="showLoading1&&resList.length==0" text="加载中" :vertical="true"></u-loading-icon>
+				<view class="con" v-else>
+					<view class="item" v-if="resList.length!=0" v-for="(item1,index) in resList"
+						@click="goDetail(item1)">
+						<view class="topBox">
+							<image :src="picBase+item1.cover" mode=""></image>
+						</view>
+						<view class="bottom">
+							<view class="txt" v-if="item1.name">
+								{{item1.name}}
+							</view>
+						</view>
+					</view>
+
+
+					<view class="" v-else style="">
+						<u-empty mode="data" text="暂无数据" width="100" height="100"
+							:icon="picUrl+'/static/other/empty.png'">
+						</u-empty>
 					</view>
 				</view>
-				<view class="" v-else style="">
-					<u-empty mode="data" text="暂无数据" width="100" height="100" :icon="picUrl+'/static/other/empty.png'">
-					</u-empty>
-				</view>
+
+				<u-loadmore v-if="resList.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC"
+					line />
 			</view>
 		</view>
 
@@ -44,9 +54,10 @@
 				</view>
 			</view>
 			<view class="rightDes">
+				<u-loading-icon v-if="showLoading&&allTypes.length==0" text="加载中" :vertical="true"></u-loading-icon>
 
 
-				<view class="item" v-for="(item,index) in allTypes" :style="{marginTop:index>0?'22rpx':''}">
+				<view class="item" v-else v-for="(item,index) in allTypes" :style="{marginTop:index>0?'22rpx':''}">
 					<view class="top" @click="toList(item,allTypesValues[index])">
 						<view class="name">
 							{{allTypesValues[index]}}
@@ -70,8 +81,6 @@
 						</u-empty>
 					</view>
 				</view>
-
-
 			</view>
 		</view>
 	</view>
@@ -88,6 +97,8 @@
 		data() {
 			return {
 				searchKey: '',
+				showLoading: false,
+				showLoading1: false,
 
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
@@ -172,11 +183,14 @@
 
 
 			async getMall(id) {
+				this.showLoading = true
+
 				this.pid = id
 				let res = await getMallReq({
 					pid: id
 				})
 				if (res.code == 0) {
+					this.showLoading = false
 					console.log('获取商城数据返回值: ', res);
 
 					this.allTypes = Object.keys(res.data.typeName)
@@ -191,11 +205,13 @@
 				}
 			},
 			async getMall2(search) {
+				this.showLoading1 = true
 				let res = await getMallReq({
 					// page: 1,
 					search,
 				})
 				if (res.code == 0) {
+					this.showLoading1 = false
 					console.log('获取商城数据返回值2: ', res.data);
 					this.resList = res.data
 					// this.resList = []
@@ -215,7 +231,7 @@
 
 			toList(id, name) {
 				uni.navigateTo({
-					url: '/pages/mall/goodsList/index?typeNameId=' + id + '&pid=' + this.pid
+					url: '/pages/mall/goodsList/index?typeNameId=' + id + '&pid=' + this.pid + '&name=' + name
 				})
 			},
 			goDetail(item) {

pages/mall/detail/index.vue

@@ -26,7 +26,7 @@
 				<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
 				<image class="love" :src="lovePic" mode="" @click="handleCol"></image>
 				<view class="txtBox">
-					<view class="left">
+					<view class="left" v-if="content.name">
 						{{content.name}}
 					</view>
 					<view class="right">
@@ -146,7 +146,11 @@
 				if (res.code == 0) {
 					console.log('回显商城详情返回值: ', res);
 
-					this.skuParams = res.data.sku_params
+					// this.skuParams = res.data.sku_params
+					this.skuParams = res.data.sku_params || {
+						"attrs": {},
+						"sku": []
+					}
 					// 动态生成判断条件对象数组
 					let c = []
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {
@@ -186,7 +190,11 @@
 				})
 				if (res.code == 0) {
 					console.log('进入详情返回值', res);
-					this.skuParams = res.data.sku_params
+					// this.skuParams = res.data.sku_params
+					this.skuParams = res.data.sku_params || {
+						"attrs": {},
+						"sku": []
+					}
 					// 动态生成判断条件对象数组
 					let c = []
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {

pages/mall/goodsList/index.scss

@@ -3,6 +3,8 @@
  }
 .page{
 	padding-bottom: 54rpx;
+	background: #F1F1F1;
+	min-height: calc(100vh - 56rpx);
 }
 .con{
 			width:100%;
@@ -20,10 +22,13 @@
 				
 				.topBox{
 					position: relative;
+					// background: red;
+					height: 292rpx;
+					border-radius: 24rpx 24rpx 0 0;
 					image{
 						width: 100%;
 						height: 292rpx;
-						border-radius: 30rpx 30rpx 0 0;
+						border-radius: 24rpx 24rpx 0 0;
 					}
 						
 				}

pages/my.vue

@@ -14,12 +14,12 @@
 							</image>
 						</view>
 						<text class="btn" v-if="!token" @click="login">请点击登录</text>
-						<text class="btn"
-							v-if="token&&role=='cydg'">{{userInfo.nickname?userInfo.nickname:'默认用户(产业电工)'}}</text>
-						<text class="btn"
-							v-if="token&&role=='hy'">{{userInfo.nickname?userInfo.nickname:'默认用户(会员)'}}</text>
+						<text class="btn" v-if="token&&role=='cydg'"
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(产业电工)'}}</text>
+						<text class="btn" v-if="token&&role=='hy'"
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(会员)'}}</text>
 
-						<view class="lMember" v-if="token&&role=='lhy'" style="">
+						<view class="lMember" v-if="token&&role=='lhy'" style="" @click="toPage('info')">
 							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(L会员)'}}</text>
 							<view class="botDes" style="width: 420rpx;">
 								查看商品会员价，{{hours}}小时后自动恢复为售价。会员价格还剩
@@ -29,42 +29,42 @@
 								</view>
 							</view>
 						</view>
-						<view class="lMember" v-if="token&&role=='hdhy'">
+						<view class="lMember" v-if="token&&role=='hdhy'" @click="toPage('info')">
 							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(活动会员)'}}</text>
 							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
 							</view>
 						</view>
 
-						<view class="lMember" v-if="token&&role=='svip'">
+						<view class="lMember" v-if="token&&role=='svip'" @click="toPage('info')">
 							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(S-VIP)'}}</text>
 							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
 							</view>
 						</view>
 
-						<view class="lMember" v-if="token&&role=='gvip'">
+						<view class="lMember" v-if="token&&role=='gvip'" @click="toPage('info')">
 							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(G-VIP)'}}</text>
 							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
 							</view>
 						</view>
-						<view class="lMember" v-if="token&&role=='yk'">
+						<view class="lMember" v-if="token&&role=='yk'" @click="toPage('info')">
 							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(游客)'}}</text>
 							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
 							</view>
 						</view>
 
-						<text class="btn"
-							v-if="token&&role=='sjkf'">{{userInfo.nickname?userInfo.nickname:'默认用户(设计客服)'}}</text>
-						<text class="btn"
-							v-if="token&&role=='shkf'">{{userInfo.nickname?userInfo.nickname:'默认用户(售后客服)'}}</text>
-						<text class="btn"
-							v-if="token&&role=='yw'">{{userInfo.nickname?userInfo.nickname:'默认用户(业务客服)'}}</text>
+						<text class="btn" v-if="token&&role=='sjkf'"
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(设计客服)'}}</text>
+						<text class="btn" v-if="token&&role=='shkf'"
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(售后客服)'}}</text>
+						<text class="btn" v-if="token&&role=='yw'"
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(业务客服)'}}</text>
 
-						<text class="btn"
-							v-if="token&&role=='superAdmin'">{{userInfo.nickname?userInfo.nickname:'默认用户(超级管理员)'}}</text>
+						<text class="btn" v-if="token&&role=='superAdmin'"
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(超级管理员)'}}</text>
 
 
 					</view>
@@ -222,7 +222,7 @@
 					}
 
 
-					// this.role = 'yk'
+					// this.role = 'lhy'
 					// this.checkRole()
 					// return
 					if (res.data.status) {
@@ -350,6 +350,9 @@
 			},
 			login() {
 				let _this = this
+				uni.showLoading({
+					title: '登录中...'
+				})
 				uni.login({
 					provider: 'weixin',
 					success: async (res) => {
@@ -369,6 +372,7 @@
 
 							let res1 = await wxAuthLoginReq(parmas)
 							if (res1.code == 0) {
+								uni.hideLoading()
 								uni.setStorageSync('token', res1.data.token)
 								_this.$toast('登录成功')
 								uni.removeStorageSync('inviteId')

pages/my/actGoods/index.scss

@@ -3,6 +3,8 @@
  }
 .page{
 	padding-bottom: 54rpx;
+	background: #F1F1F1;
+	min-height: calc(100vh - 56rpx);
 }
 .con{
 			width:100%;
@@ -19,6 +21,8 @@
 				margin-right: 16rpx;
 				margin-bottom: 24rpx;
 				padding-bottom: 40rpx;
+				display: flex;
+				flex-direction: column;
 				.topBox{
 					position: relative;
 					padding: 0 32rpx;

pages/my/actGoods/index.vue

@@ -62,6 +62,7 @@
 			let res = await getActivityDataReq()
 			if (res.code == 0) {
 				this.list = res.data
+				// this.list = [1, 1, 1, 1]
 				console.log('活动商品列表返回值:', res.data);
 			} else {
 				uni.showToast({

pages/my/actGoodsDetail/index.scss

@@ -3,6 +3,7 @@
 }
 .page{
 	padding-bottom: 208rpx;
+	
 }
 .topImg{
 	width: 100%;

pages/my/actGoodsDetail/index.vue

@@ -25,7 +25,7 @@
 			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
 			<image class="love" :src="lovePic" mode="" @click="handleCol"></image>
 			<view class="txtBox">
-				<view class="left">
+				<view class="left" v-if="content.name">
 					{{content.name}}
 				</view>
 				<view class="right">
@@ -183,7 +183,11 @@
 				})
 				if (res.code == 0) {
 					console.log('换新商品或活动商品详情返回值: ', res);
-					this.skuParams = res.data.sku_params
+					// this.skuParams = res.data.sku_params
+					this.skuParams = res.data.sku_params || {
+						"attrs": {},
+						"sku": []
+					}
 					// 动态生成判断条件对象数组
 					let c = []
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {
@@ -230,7 +234,12 @@
 			} else {
 				this.content = getApp().mallItem
 
-				this.skuParams = getApp().mallItem.sku_params
+				// this.skuParams = getApp().mallItem.sku_params
+
+				this.skuParams = getApp().mallItem.sku_params || {
+					"attrs": {},
+					"sku": []
+				}
 				// 动态生成判断条件对象数组
 				let c = []
 				Object.keys(this.skuParams.attrs).forEach((item, index) => {

pages/my/changeNewGoods/index.scss

@@ -3,6 +3,8 @@
  }
 .page{
 	padding-bottom: 54rpx;
+	background: #F1F1F1;
+	min-height: calc(100vh - 56rpx);
 }
 .con{
 			width:100%;
@@ -18,12 +20,18 @@
 				margin-right: 16rpx;
 				margin-bottom: 24rpx;
 				
+				display: flex;
+				flex-direction: column;
 				.topBox{
 					position: relative;
+					// background: red;
+					height: 292rpx;
+					border-radius: 24rpx 24rpx 0 0;
 					image{
 						width: 100%;
-						height: 292rpx;
-						border-radius: 30rpx 30rpx 0 0;
+						height: 100%;
+						// border-radius: 30rpx 30rpx 0 0;
+						border-radius: 24rpx 24rpx 0 0;
 					}
 						
 				}

pages/my/collect/index.scss

@@ -3,31 +3,37 @@
  }
 .page{
 	padding-bottom: 54rpx;
+	background: #F1F1F1;
+	min-height: calc(100vh - 56rpx);
 }
 .con{
 			width:100%;
 			display: flex;
 			flex-wrap: wrap;
+			align-items: flex-start;
 			padding: 24rpx 32rpx;
 			padding-left: 28rpx;
 			.item{
 				width: 336rpx;
-				background: #FFFFFF;
 				border-radius: 24rpx;
 				border: 2rpx solid #F1F1F1;
 				margin-right: 16rpx;
 				margin-bottom: 24rpx;
+				border-bottom: 0;
+				display: flex;
+				flex-direction: column;
 				image{
 					width: 100%;
 					height: 292rpx;
-					border-radius: 30rpx 30rpx 0 0;
+					border-radius: 24rpx 24rpx 0 0;
 				}
 				.bottom{
 					display: flex;
 					justify-content: center;
 					align-items: center;
 					height: 76rpx;
-					
+					background: #fff;
+					border-radius:  0 0 24rpx 24rpx;
 					.txt{
 						width: 85%;
 						overflow: hidden;

pages/my/collect/index.vue

@@ -40,10 +40,15 @@
 
 		},
 		async onShow() {
-			let res = await getMyCollectDataReq()
+			let res = await getMyCollectDataReq({
+				page: 1,
+				per_page: 1,
+			})
 			if (res.code == 0) {
 				this.list = res.data.data
-				console.log('我的收藏列表', this.list);
+				console.log('我的收藏列表返回值',
+					res);
+				// console.log('我的收藏列表', this.list);
 			} else {
 				uni.showToast({
 					title: res.message,

pages/my/collectDetail/index.scss

@@ -3,6 +3,7 @@
 }
 .page{
 	padding-bottom: 208rpx;
+	
 }
 .topImg{
 	width: 100%;

pages/my/collectDetail/index.vue

@@ -26,7 +26,7 @@
 				<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
 				<image class="love" :src="lovePic" mode="" @click="handleCol"></image>
 				<view class="txtBox">
-					<view class="left">
+					<view class="left" v-if="content.name">
 						{{content.name}}
 					</view>
 					<view class="right">
@@ -34,19 +34,6 @@
 					</view>
 				</view>
 			</view>
-			<!-- <view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle" :key="index">
-				<view class="con">
-					<view class="title">
-						{{item.title}}
-					</view>
-					<view class="list">
-						<view class="item" v-for="(item1,index1) in item.list" :class="[index1==ids[index]?'act':'']"
-							@click="">
-							{{item1.data}}
-						</view>
-					</view>
-				</view>
-			</view> -->
 			<view class="parmasBox" v-for="(item,index) in Object.keys(skuParams.attrs)">
 				<view class="con">
 					<view class="title">
@@ -153,8 +140,10 @@
 				})
 				if (res.code == 0) {
 					console.log('我的收藏详情', res);
-
-					this.skuParams = res.data.sku_params
+					this.skuParams = res.data.sku_params || {
+						"attrs": {},
+						"sku": []
+					}
 					// 动态生成判断条件对象数组
 					let c = []
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {
@@ -198,7 +187,12 @@
 				})
 				if (res.code == 0) {
 					console.log('我的收藏详情', res);
-					this.skuParams = res.data.sku_params
+					// this.skuParams = res.data.sku_params
+
+					this.skuParams = res.data.sku_params || {
+						"attrs": {},
+						"sku": []
+					}
 					// 动态生成判断条件对象数组
 					let c = []
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {

pages/my/duijiang/index.scss

@@ -1,6 +1,10 @@
-.content{
+.page{
+	height:100vh;
 	background: #F1F1F1;
-	min-height: 100vh;
+}
+.content{
+	// background: #F1F1F1;
+	// min-height: calc(100vh - 200rpx);
 	padding: 0 32rpx;
 	padding-top: 24rpx;
 	padding-bottom: 24rpx;

pages/my/feedBack/index.scss

@@ -10,14 +10,18 @@
 	bottom:16rpx!important;
 	padding: 0!important;
 }
+.page{
+	padding-bottom: 124rpx;
+}
 .content{
 	padding: 64rpx 32rpx;
+	height: 70vh;
+	overflow-y: scroll;
 	.title{
 		font-size: 32rpx;
 		font-family: PingFang-SC-Bold, PingFang-SC;
 		font-weight: bold;
 		color: #080F18;
-		// margin-bottom: 36rpx;
 		margin-bottom: 18px;
 	}
 	.picTop{
@@ -37,7 +41,9 @@
 		padding-bottom: 26rpx;
 	}
 	
-	.btn{
+	
+}
+.btn_bottom{
 		height: 96rpx;
 		background: #333333;
 		border-radius: 4rpx;
@@ -52,8 +58,11 @@
 		width: calc(100% - 64rpx);
 		position: fixed;
 		bottom: 72rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		
+		z-index: 99999999999999;
 	}
-}
 
 
 // 图片上传区域
@@ -85,7 +94,7 @@
 				font-size: 48rpx;
 				position: absolute;
 				top: 0rpx;
-				right: 30rpx;
+				right: 34rpx;
 				width: 44rpx;
 				height: 44rpx;
 				line-height: 44rpx;
@@ -114,7 +123,7 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			background: #F7F8FA;
+			background: #F4F4F4;
 			image{
 				width: 40rpx;
 				height: 40rpx;

pages/my/feedBack/index.vue

@@ -5,8 +5,8 @@
 			<view class="title">
 				意见反馈
 			</view>
-			<u--textarea maxlength="100" :focus="true" v-model="content" :disabled="false" placeholder="请描述您遇到的问题" count
-				border="none" height="256rpx"></u--textarea>
+			<u--textarea maxlength="100" :focus="false" v-model="content" :disabled="false" placeholder="请描述您遇到的问题"
+				count border="none" height="256rpx"></u--textarea>
 
 
 			<view class="picTop">
@@ -28,7 +28,7 @@
 					</image>
 					<view @click="delectImg(index)" class="del_btn">×</view>
 				</view>
-				<view class="addpic" @click="addquesPic" v-show="pic_url.length<9">
+				<view class="addpic" @click="addquesPic" v-if="pic_url.length<9">
 					<view class="addPicBox">
 						<image :src="picUrl+'/static/my/add.png'"></image>
 					</view>
@@ -40,12 +40,10 @@
 			<view class="title" style="margin-top: 0rpx;">
 				联系方式
 			</view>
-			<input type="number" class="phone" placeholder="电话" v-model="phone">
-
-
-			<view class="btn" @click="post()">
-				确定
-			</view>
+			<input type="number" class="phone" placeholder="电话" v-model="phone" style="">
+		</view>
+		<view class="btn_bottom" @click="post()">
+			确定
 		</view>
 	</view>
 </template>

pages/my/otherInfo/index.scss

@@ -1,6 +1,8 @@
-.content{
+.page{
+	height:100vh;
 	background: #F1F1F1;
-	min-height: 100vh;
+}
+.content{
 	padding: 0 32rpx;
 	padding-top: 24rpx;
 	padding-bottom: 24rpx;

pages/my/sellAfter/index.scss

@@ -1,18 +1,17 @@
-.content{
-	background: #F1F1F1;
+.page{
 	min-height: 100vh;
+	background: #F1F1F1;
+}
+.content{
 	padding: 0 32rpx;
 	padding-top: 24rpx;
 	padding-bottom: 24rpx;
 	.item{
-		// height: 432rpx;
 		background: #FFFFFF;
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
-		// margin-top: 24rpx;
 		padding: 0 24rpx;
 		display: flex;
 		flex-direction: column;
-		// justify-content: space-around;
 		margin-bottom: 24rpx;
 		.line:last-child{
 			border-bottom: none;
@@ -26,13 +25,11 @@
 			.left{
 				font-size: 32rpx;
 				font-family: PingFang-SC-Bold, PingFang-SC;
-				// font-weight: bold;
 				color: #333333;
 			}
 			.right{
 				font-size: 32rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
-				// font-weight: 500;
 				color: #333333;
 				display: flex;
 				align-items: center;

pages/my/sellAfterCon/index.scss

@@ -1,7 +1,8 @@
-.content{
-	height:calc(100vh - 170rpx );
+.page{
+	height:100vh;
 	background: #F1F1F1;
-	
+}
+.content{
 	.box{
 		display: flex;
 	flex-direction: column;

pages/my/sellAfterDefer/index.scss

@@ -1,5 +1,8 @@
 
-
+.page{
+	background: #F1F1F1;
+	min-height: 100vh;
+}
 .content{
 	background: #F1F1F1;
 	min-height: 100vh;
@@ -7,10 +10,8 @@
 	padding-top: 24rpx;
 	padding-bottom: 24rpx;
 	.item{
-		// height: 432rpx;
 		background: #FFFFFF;
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
-		// margin-top: 24rpx;
 		padding: 8rpx 24rpx;
 		
 		padding-top: 10px;

pages/my/set/index.scss

@@ -2,21 +2,21 @@
 	opacity: 1!important;
 }
 
-.content{
-	background: #F1F1F1;
+.page{
 	min-height: 100vh;
+	background: #F1F1F1;
+}
+
+.content{
 	padding: 0 32rpx;
 	padding-top: 24rpx;
 	padding-bottom: 24rpx;
 	.item{
-		// height: 432rpx;
 		background: #FFFFFF;
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
-		// margin-top: 24rpx;
 		padding: 0 24rpx;
 		display: flex;
 		flex-direction: column;
-		// justify-content: space-around;
 		margin-bottom: 24rpx;
 		.line:last-child{
 			border-bottom: none;
@@ -30,7 +30,6 @@
 			.left{
 				font-size: 32rpx;
 				font-family: PingFang-SC-Bold, PingFang-SC;
-				// font-weight: bold;
 				color: #333333;
 			}
 			.right{
@@ -56,6 +55,4 @@
 }
 
 switch{
-	// width: 83rpx;
-	// height: 40rpx;
 }

pages/my/set/index.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
 		<navBar title="设置" :back="true" color="black" background="white" />
-		<!-- <u-switch v-model="value1" activeColor="#5ac725" loading></u-switch> -->
 		<view class="content">
 			<view class="item" style="border-radius: 0rpx 0rpx 0rpx 24rpx;;">
 				<view class="line">

pages/my/test/index.vue

@@ -0,0 +1,28 @@
+<template>
+	<view class="page">
+		<navBar title="测试" :back="true" color="black" background="white" />
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/my/userInfo/index.vue

@@ -154,14 +154,25 @@
 				});
 			},
 			async update() {
-				let res = await updateUserInfoReq({
+
+
+				let p = {
 					nickname: this.userInfo.nickname,
 					head: this.userInfo.head,
 					phone: this.userInfo.phone,
 					sex: this.userInfo.sex,
 					name: this.userInfo.name,
 					birthday: this.userInfo.birthday
-				})
+				}
+				// p = {
+				// 	nickname: '涛涛',
+				// 	head: this.userInfo.head,
+				// 	phone: this.userInfo.phone,
+				// 	sex: this.userInfo.sex,
+				// 	name: this.userInfo.name,
+				// 	birthday: this.userInfo.birthday
+				// }
+				let res = await updateUserInfoReq(p)
 				if (res.code == 0) {
 					uni.showToast({
 						title: '修改成功',

pages/service.scss

@@ -2,7 +2,6 @@
 	padding: 0rpx 32rpx 24rpx 32rpx;
 	display: flex;
 	flex-direction: column;
-	// background: ;
 	.item{
 		.topTitle{
 			font-size: 40rpx;
@@ -30,20 +29,18 @@
 		.con{
 			height: 300rpx;
 			border-radius: 8rpx 24rpx 8rpx 24rpx;
-			// background: url('https://oaigc.oss-cn-chengdu.aliyuncs.com/lamp/2023-09/2023090710392974226.png') no-repeat;
-			// background-size: 100% 100%;
 			background-repeat: no-repeat!important;
 			background-size:cover!important;
 			display: flex;
 			flex-direction: column;
-			padding-left: 36rpx;
-			padding-right: 36rpx;
 			margin-bottom: 16rpx;
 			.label{
 				display: flex;
 				align-items: center;
 				margin-top: 48rpx;
 				position: relative;
+				padding-left: 36rpx;
+				padding-right: 36rpx;
 				.img{
 					width: 56rpx;
 					height: 28rpx;
@@ -71,12 +68,13 @@
 					border-radius: 2rpx;
 					display: flex;
 					justify-content: center;
-					// align-items: center;
 				}
 			}
 			.cen{
 				display: flex;
 				margin-top: 24rpx;
+				padding-left: 36rpx;
+				padding-right: 36rpx;
 				.item3{
 					min-width: 104rpx;
 					padding: 8rpx;
@@ -99,6 +97,7 @@
 				display: flex;
 				justify-content: flex-end;
 				margin-top: 70rpx;
+				padding-right: 36rpx;
 				.img2{
 					width: 48rpx;
 					height: 48rpx;
@@ -107,4 +106,10 @@
 		}
 	}
 	
+}
+
+.grayTrans{
+	background:rgba(0, 0, 0, .4);
+	height: 100%;
+	border-radius: 8rpx 24rpx 8rpx 24rpx;
 }

pages/service.vue

@@ -13,25 +13,27 @@
 
 				<view class="con" @click="goDetail(item1.content,item1.title,item1)" v-for="(item1,index1) in item.list"
 					:style="{background:`url(${picBase+item1.image}) ` }">
-					<view class="label">
-						<image src="/static/index/part1_icon.png" mode="" class="img"></image>
-						<view class="item2">
-							{{item1.title}}
+					<view class="grayTrans">
+						<view class="label">
+							<image src="/static/index/part1_icon.png" mode="" class="img"></image>
+							<view class="item2">
+								{{item1.title}}
+							</view>
+							<view class="des">
+								详情
+							</view>
 						</view>
-						<view class="des">
-							详情
+						<view class="cen">
+							<view class="item3" v-for="(item2,index2) in item1.label">
+								{{item2.title}}
+							</view>
 						</view>
-					</view>
-					<view class="cen">
-						<view class="item3" v-for="(item2,index2) in item1.label">
-							{{item2.title}}
-						</view>
-					</view>
 
-					<view class="bot">
-						<image class="img2" :src="picUrl+'/static/service/look.png'" mode=""
-							style="width: 48rpx;height: 48rpx;">
-						</image>
+						<view class="bot">
+							<image class="img2" :src="picUrl+'/static/service/look.png'" mode=""
+								style="width: 48rpx;height: 48rpx;">
+							</image>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -52,6 +54,8 @@
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 				list: [],
+
+				showOverFlow: true
 			}
 		},
 		async onLoad(options) {

uni_modules/uview-ui/components/u-loadmore/u-loadmore.vue

@@ -1,7 +1,5 @@
 <template>
-	<view
-	    class="u-loadmore"
-	    :style="[
+	<view class="u-loadmore" :style="[
 			$u.addStyle(customStyle),
 			{
 				backgroundColor: bgColor,
@@ -9,45 +7,19 @@
 				marginTop: $u.addUnit(marginTop),
 				height: $u.addUnit(height),
 			},
-		]"
-	>
-		<u-line
-		    length="140rpx"
-		    :color="lineColor"
-		    :hairline="false"
-			:dashed="dashed"
-			v-if="line"
-		></u-line>
+		]">
+		<u-line length="140rpx" :color="lineColor" :hairline="false" :dashed="dashed" v-if="line"></u-line>
 		<!-- 加载中和没有更多的状态才显示两边的横线 -->
-		<view
-		    :class="status == 'loadmore' || status == 'nomore' ? 'u-more' : ''"
-		    class="u-loadmore__content"
-		>
-			<view
-			    class="u-loadmore__content__icon-wrap"
-			    v-if="status === 'loading' && icon"
-			>
-				<u-loading-icon
-				    :color="iconColor"
-				    :size="iconSize"
-				    :mode="loadingIcon"
-				></u-loading-icon>
+		<view :class="status == 'loadmore' || status == 'nomore' ? 'u-more' : ''" class="u-loadmore__content">
+			<view class="u-loadmore__content__icon-wrap" v-if="status === 'loading' && icon">
+				<u-loading-icon :color="iconColor" :size="iconSize" :mode="loadingIcon"></u-loading-icon>
 			</view>
 			<!-- 如果没有更多的状态下，显示内容为dot（粗点），加载特定样式 -->
-			<text
-			    class="u-line-1"
-			    :style="[loadTextStyle]"
-			    :class="[(status == 'nomore' && isDot == true) ? 'u-loadmore__content__dot-text' : 'u-loadmore__content__text']"
-			    @tap="loadMore"
-			>{{ showText }}</text>
+			<text class="u-line-1" :style="[loadTextStyle]"
+				:class="[(status == 'nomore' && isDot == true) ? 'u-loadmore__content__dot-text' : 'u-loadmore__content__text']"
+				@tap="loadMore">{{ showText }}</text>
 		</view>
-		<u-line
-		    length="140rpx"
-		    :color="lineColor"
-			:hairline="false"
-			:dashed="dashed"
-			v-if="line"
-		></u-line>
+		<u-line length="140rpx" :color="lineColor" :hairline="false" :dashed="dashed" v-if="line"></u-line>
 	</view>
 </template>
 
@@ -81,7 +53,7 @@
 	 */
 	export default {
 		name: "u-loadmore",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
 		data() {
 			return {
 				// 粗点
@@ -147,4 +119,4 @@
 			}
 		}
 	}
-</style>
+</style>

unpackage/dist/build/mp-weixin/app.json

@@ -66,7 +66,8 @@
         "aboutMe/index",
         "protocol/index",
         "duijiang/index",
-        "actDetail2/index"
+        "actDetail2/index",
+        "test/index"
       ]
     }
   ],

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

@@ -1 +1 @@
-.page.data-v-6a70bc40{background:#fff;min-height:100vh;padding-bottom:32rpx}.content.data-v-6a70bc40{padding:32rpx;box-sizing:border-box}.content .cartDef.data-v-6a70bc40{display:flex;flex-direction:column;align-items:center;background:#fdf2e9;margin-bottom:32rpx;border-radius:24rpx;box-sizing:border-box;padding-bottom:64rpx}.content .cartDef .companyName.data-v-6a70bc40{box-sizing:border-box;font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-top:22rpx}.content .cartDef .connect.data-v-6a70bc40{box-sizing:border-box;display:flex;align-items:center;flex-direction:row;margin-top:32rpx}.content .cartDef .connect .txt.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666;display:inline-block;margin-left:8rpx}.content .cartDef .connectDes.data-v-6a70bc40{box-sizing:border-box;display:flex;align-items:center;flex-direction:row;margin-top:12rpx}.content .cartDef .connectDes .num.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;margin-right:24rpx}.content .cartDef .connectDes .callBtn.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#e77817}.content .cartDef .addr.data-v-6a70bc40{display:flex;align-items:center;flex-direction:row;margin-top:32rpx}.content .cartDef .addr .txt.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666;margin-left:8rpx}.content .cartDef .addrInfo.data-v-6a70bc40{display:flex;align-items:center;flex-direction:row;justify-content:center;padding-top:12rpx}.content .cartDef .addrInfo .txt.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;margin-right:16rpx;max-width:500rpx}
+.page.data-v-6a70bc40{padding-bottom:32rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.content.data-v-6a70bc40{padding:32rpx;box-sizing:border-box}.content .cartDef.data-v-6a70bc40{display:flex;flex-direction:column;align-items:center;background:#fdfbfa;margin-bottom:32rpx;border-radius:24rpx;box-sizing:border-box;padding-bottom:64rpx}.content .cartDef .companyName.data-v-6a70bc40{box-sizing:border-box;font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-top:22rpx}.content .cartDef .connect.data-v-6a70bc40{box-sizing:border-box;display:flex;align-items:center;flex-direction:row;margin-top:32rpx}.content .cartDef .connect .txt.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666;display:inline-block;margin-left:8rpx}.content .cartDef .connectDes.data-v-6a70bc40{box-sizing:border-box;display:flex;align-items:center;flex-direction:row;margin-top:12rpx}.content .cartDef .connectDes .num.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;margin-right:24rpx}.content .cartDef .connectDes .callBtn.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#e77817}.content .cartDef .addr.data-v-6a70bc40{display:flex;align-items:center;flex-direction:row;margin-top:32rpx}.content .cartDef .addr .txt.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666;margin-left:8rpx}.content .cartDef .addrInfo.data-v-6a70bc40{display:flex;align-items:center;flex-direction:row;justify-content:center;padding-top:12rpx}.content .cartDef .addrInfo .txt.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;margin-right:16rpx;max-width:500rpx}

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

@@ -1 +1 @@
-.data-v-345ac5b5 .u-line{width:56rpx!important}.page.data-v-345ac5b5{padding-bottom:54rpx}.con.data-v-345ac5b5{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-345ac5b5{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item .topBox.data-v-345ac5b5{position:relative}.con .item .topBox image.data-v-345ac5b5{width:100%;height:292rpx;border-radius:30rpx 30rpx 0 0}.con .item .bottom.data-v-345ac5b5{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-345ac5b5{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.data-v-345ac5b5 .u-line{width:56rpx!important}.page.data-v-345ac5b5{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.con.data-v-345ac5b5{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-345ac5b5{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-345ac5b5{position:relative;height:292rpx;border-radius:24rpx 24rpx 0 0}.con .item .topBox image.data-v-345ac5b5{width:100%;height:100%;border-radius:24rpx 24rpx 0 0}.con .item .bottom.data-v-345ac5b5{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-345ac5b5{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

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

@@ -1 +1 @@
-<view class="page data-v-5338f2c5"><nav-bar vue-id="5d58823e-1" title="产品指南" back="{{true}}" color="black" background="white" class="data-v-5338f2c5" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-5338f2c5"><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-5338f2c5" bindtap="__e"><image src="{{picBase+item.image}}" mode class="data-v-5338f2c5"></image><view class="bottom data-v-5338f2c5"><view class="txt data-v-5338f2c5">{{''+item.title+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-5338f2c5" 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-5338f2c5" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="5d58823e-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-5338f2c5" bind:__l="__l"></u-loadmore></block></view>
+<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>

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

@@ -1 +1 @@
-.data-v-5338f2c5 .u-line{width:56rpx!important}.page.data-v-5338f2c5{padding-bottom:54rpx}.con.data-v-5338f2c5{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-5338f2c5{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item image.data-v-5338f2c5{width:100%;height:292rpx;border-radius:30rpx 30rpx 0 0}.con .item .bottom.data-v-5338f2c5{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-5338f2c5{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.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}

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

@@ -4,6 +4,8 @@
     "uni-search-bar": "/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar",
     "u-sticky": "/uni_modules/uview-ui/components/u-sticky/u-sticky",
     "u-tabs": "/uni_modules/uview-ui/components/u-tabs/u-tabs",
-    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty"
+    "u-loading-icon": "/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon",
+    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
   }
 }

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}.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}.con .item .topBox image.data-v-2356900c{width:100%;height:292rpx;border-radius:30rpx 30rpx 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-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}

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-663f3c42"><nav-bar vue-id="1c6c9da5-1" title="活动商品" back="{{true}}" color="black" background="white" class="data-v-663f3c42" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-663f3c42"><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-663f3c42" bindtap="__e"><view class="topBox data-v-663f3c42"><image src="{{picBase+item.$orig.image}}" mode class="data-v-663f3c42"></image></view><view class="bottom data-v-663f3c42"><view class="txt data-v-663f3c42">{{''+item.$orig.title+''}}</view><view class="txt1 data-v-663f3c42"><view class="l data-v-663f3c42">{{''+item.f0+''}}</view><view class="r data-v-663f3c42">活动开始</view></view><view class="txt1 data-v-663f3c42"><view class="l data-v-663f3c42">{{''+item.f1+''}}</view><view class="r data-v-663f3c42">活动结束</view></view></view></view></block></view></block><block wx:else><view class="con data-v-663f3c42" 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-663f3c42" 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-663f3c42" bind:__l="__l"></u-loadmore></block></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}.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}.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-663f3c42 .u-line{width:56rpx!important}.page.data-v-663f3c42{padding-bottom:54rpx;background:#f1f1f1;min-height:calc(100vh - 56rpx)}.con.data-v-663f3c42{width:100%;display:flex;flex-direction:column;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-663f3c42{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-663f3c42{position:relative;padding:0 32rpx;padding-top:20rpx}.con .item .topBox image.data-v-663f3c42{width:100%;height:292rpx;border-radius:40rpx 40rpx 0 0}.con .item .topBox .cutDown.data-v-663f3c42{position:absolute;top:0;left:0;width:100%;z-index:1;display:flex;justify-content:center}.con .item .topBox .cutDown .item2.data-v-663f3c42{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-663f3c42{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-663f3c42{display:flex;flex-direction:column;padding:0 64rpx}.con .item .bottom .txt.data-v-663f3c42{width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-top:20rpx;font-weight:600}.con .item .bottom .txt1.data-v-663f3c42{margin-top:20rpx;display:flex;justify-content:space-between;font-weight:300}

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}.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}.con .item .topBox.data-v-76117b9e{position:relative}.con .item .topBox image.data-v-76117b9e{width:100%;height:292rpx;border-radius:30rpx 30rpx 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-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}

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

@@ -1 +1 @@
-<view class="page data-v-6e85291b"><nav-bar vue-id="7ebb5d63-1" title="收藏" back="{{true}}" color="black" background="white" class="data-v-6e85291b" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-6e85291b"><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-6e85291b" bindtap="__e"><image src="{{picBase+item.goods.cover}}" mode class="data-v-6e85291b"></image><view class="bottom data-v-6e85291b"><view class="txt data-v-6e85291b">{{''+item.goods.name+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-6e85291b" 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-6e85291b" 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-6e85291b" bind:__l="__l"></u-loadmore></block></view>
+<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>

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

@@ -1 +1 @@
-.data-v-6e85291b .u-line{width:56rpx!important}.page.data-v-6e85291b{padding-bottom:54rpx}.con.data-v-6e85291b{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-6e85291b{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item image.data-v-6e85291b{width:100%;height:292rpx;border-radius:30rpx 30rpx 0 0}.con .item .bottom.data-v-6e85291b{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-6e85291b{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.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}

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

@@ -1 +1 @@
-.content.data-v-3865f112{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-3865f112{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-3865f112{display:flex;justify-content:space-between}.content .item .line .left.data-v-3865f112{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-3865f112{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}
+.page.data-v-3865f112{height:100vh;background:#f1f1f1}.content.data-v-3865f112{padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-3865f112{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-3865f112{display:flex;justify-content:space-between}.content .item .line .left.data-v-3865f112{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-3865f112{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}

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

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
+  "navigationBarTextStyle": "white",
   "usingComponents": {
     "uni-collapse": "/uni_modules/uni-collapse/components/uni-collapse/uni-collapse",
     "uni-collapse-item": "/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item",

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

@@ -1 +1 @@
-.content.data-v-592cd4e9{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-592cd4e9{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-592cd4e9{display:flex;justify-content:space-between;align-items:center;height:140rpx}.content .item .line .left.data-v-592cd4e9{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333}.content .item .line .right.data-v-592cd4e9{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-592cd4e9{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-592cd4e9{width:14rpx;height:24rpx}.content .item .line.data-v-592cd4e9:last-child{border-bottom:none}
+.page.data-v-592cd4e9{height:100vh;background:#f1f1f1}.content.data-v-592cd4e9{padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-592cd4e9{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-592cd4e9{display:flex;justify-content:space-between;align-items:center;height:140rpx}.content .item .line .left.data-v-592cd4e9{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333}.content .item .line .right.data-v-592cd4e9{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-592cd4e9{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-592cd4e9{width:14rpx;height:24rpx}.content .item .line.data-v-592cd4e9:last-child{border-bottom:none}

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

@@ -1 +1 @@
-.content.data-v-b5d0b420{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-b5d0b420{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-b5d0b420:last-child{border-bottom:none}.content .item .line.data-v-b5d0b420{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-b5d0b420{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333}.content .item .line .right.data-v-b5d0b420{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;color:#333;display:flex;align-items:center}.content .item .line .right .avatar.data-v-b5d0b420{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-b5d0b420{width:14rpx;height:24rpx}
+.page.data-v-b5d0b420{min-height:100vh;background:#f1f1f1}.content.data-v-b5d0b420{padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-b5d0b420{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-b5d0b420:last-child{border-bottom:none}.content .item .line.data-v-b5d0b420{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-b5d0b420{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333}.content .item .line .right.data-v-b5d0b420{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;color:#333;display:flex;align-items:center}.content .item .line .right .avatar.data-v-b5d0b420{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-b5d0b420{width:14rpx;height:24rpx}

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

@@ -1 +1 @@
-.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}
+.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}

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

@@ -1 +1 @@
-<view class="page data-v-99449084"><nav-bar vue-id="2a133faa-1" title="设置" back="{{true}}" color="black" background="white" class="data-v-99449084" bind:__l="__l"></nav-bar><view class="content data-v-99449084"><view class="item data-v-99449084" style="border-radius:0rpx 0rpx 0rpx 24rpx;"><view class="line data-v-99449084"><view class="left data-v-99449084">显示售价</view><view class="right data-v-99449084"><u-switch vue-id="2a133faa-2" disabled="{{disAbled1}}" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value1}}" data-event-opts="{{[['^change',[['asyncChange1']]],['^input',[['__set_model',['','value1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-99449084" bind:__l="__l"></u-switch></view></view><block wx:if="{{role!='svip'&&role!='gvip'}}"><view class="line data-v-99449084"><view class="left data-v-99449084">显示会员价</view><view class="right data-v-99449084"><u-switch vue-id="2a133faa-3" disabled="{{disAbled2}}" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value2}}" data-event-opts="{{[['^change',[['asyncChange2']]],['^input',[['__set_model',['','value2','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-99449084" bind:__l="__l"></u-switch></view></view></block><block wx:if="{{role!='cydg'}}"><view class="line data-v-99449084"><view class="left data-v-99449084">显示VIP价</view><view class="right data-v-99449084"><u-switch vue-id="2a133faa-4" disabled="{{disAbled3}}" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value3}}" data-event-opts="{{[['^change',[['asyncChange3']]],['^input',[['__set_model',['','value3','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-99449084" bind:__l="__l"></u-switch></view></view></block></view></view></view>
+<view class="page data-v-a23b0e2a"><nav-bar vue-id="2a133faa-1" title="设置" back="{{true}}" color="black" background="white" class="data-v-a23b0e2a" bind:__l="__l"></nav-bar><view class="content data-v-a23b0e2a"><view class="item data-v-a23b0e2a" style="border-radius:0rpx 0rpx 0rpx 24rpx;"><view class="line data-v-a23b0e2a"><view class="left data-v-a23b0e2a">显示售价</view><view class="right data-v-a23b0e2a"><u-switch vue-id="2a133faa-2" disabled="{{disAbled1}}" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value1}}" data-event-opts="{{[['^change',[['asyncChange1']]],['^input',[['__set_model',['','value1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-a23b0e2a" bind:__l="__l"></u-switch></view></view><block wx:if="{{role!='svip'&&role!='gvip'}}"><view class="line data-v-a23b0e2a"><view class="left data-v-a23b0e2a">显示会员价</view><view class="right data-v-a23b0e2a"><u-switch vue-id="2a133faa-3" disabled="{{disAbled2}}" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value2}}" data-event-opts="{{[['^change',[['asyncChange2']]],['^input',[['__set_model',['','value2','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-a23b0e2a" bind:__l="__l"></u-switch></view></view></block><block wx:if="{{role!='cydg'}}"><view class="line data-v-a23b0e2a"><view class="left data-v-a23b0e2a">显示VIP价</view><view class="right data-v-a23b0e2a"><u-switch vue-id="2a133faa-4" disabled="{{disAbled3}}" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value3}}" data-event-opts="{{[['^change',[['asyncChange3']]],['^input',[['__set_model',['','value3','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-a23b0e2a" bind:__l="__l"></u-switch></view></view></block></view></view></view>

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

@@ -1 +1 @@
-.u-switch--disabled.data-v-99449084{opacity:1!important}.u-switch--disabled.data-v-99449084{opacity:1!important}.content.data-v-99449084{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-99449084{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-99449084:last-child{border-bottom:none}.content .item .line.data-v-99449084{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-99449084{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333}.content .item .line .right.data-v-99449084{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-99449084{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-99449084{width:14rpx;height:24rpx}
+.u-switch--disabled.data-v-a23b0e2a{opacity:1!important}.u-switch--disabled.data-v-a23b0e2a{opacity:1!important}.page.data-v-a23b0e2a{min-height:100vh;background:#f1f1f1}.content.data-v-a23b0e2a{padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-a23b0e2a{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-a23b0e2a:last-child{border-bottom:none}.content .item .line.data-v-a23b0e2a{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-a23b0e2a{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333}.content .item .line .right.data-v-a23b0e2a{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-a23b0e2a{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-a23b0e2a{width:14rpx;height:24rpx}

unpackage/dist/build/mp-weixin/pages/my/test/index.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/test/index"],{"27fa":function(n,t,e){"use strict";(function(n,t){var a=e("4ea4");e("d716");a(e("66fd"));var u=a(e("79b2"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},3058:function(n,t,e){"use strict";var a=e("e65b"),u=e.n(a);u.a},6595:function(n,t,e){"use strict";e.r(t);var a=e("881b"),u=e.n(a);for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);t["default"]=u.a},"79b2":function(n,t,e){"use strict";e.r(t);var a=e("870a"),u=e("6595");for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e("3058");var o=e("f0c5"),r=Object(o["a"])(u["default"],a["b"],a["c"],!1,null,"427aa69b",null,!1,a["a"],void 0);t["default"]=r.exports},"870a":function(n,t,e){"use strict";e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){}));var a=function(){var n=this.$createElement;this._self._c},u=[]},"881b":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={components:{},data:function(){return{}},onLoad:function(n){},methods:{}}},e65b:function(n,t,e){}},[["27fa","common/runtime","common/vendor"]]]);

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

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

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

@@ -0,0 +1 @@
+<view class="page data-v-427aa69b"><nav-bar vue-id="60c64937-1" title="测试" back="{{true}}" color="black" background="white" class="data-v-427aa69b" bind:__l="__l"></nav-bar></view>

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

@@ -1 +1 @@
-.content.data-v-52f49200{background:#f1f1f1;min-height:calc(100vh - 200rpx);padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-52f49200{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-52f49200:last-child{border-bottom:none}.content .item .line.data-v-52f49200{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-52f49200{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.content .item .line .right.data-v-52f49200{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-52f49200{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-52f49200{width:14rpx;height:24rpx}
+.content.data-v-106b4874{background:#f1f1f1;min-height:calc(100vh - 200rpx);padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-106b4874{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-106b4874:last-child{border-bottom:none}.content .item .line.data-v-106b4874{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-106b4874{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.content .item .line .right.data-v-106b4874{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-106b4874{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-106b4874{width:14rpx;height:24rpx}

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/service"],{"17cb":function(e,t,n){"use strict";n.r(t);var a=n("ccc1"),c=n("e24d");for(var r in c)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return c[e]}))}(r);n("f5e4");var i=n("f0c5"),u=Object(i["a"])(c["default"],a["b"],a["c"],!1,null,"94c41ad2",null,!1,a["a"],void 0);t["default"]=u.exports},"3a72":function(e,t,n){"use strict";(function(e){var a=n("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var c=a(n("2eee")),r=a(n("c973")),i=n("9ca2"),u={data:function(){return{picUrl:this.$picUrl,picBase:this.$picBase,list:[]}},onLoad:function(e){var t=this;return(0,r.default)(c.default.mark((function e(){var n;return c.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,(0,i.getServerDataReq)({});case 2:n=e.sent,0==n.code&&(t.list=n.data,console.log("服务列表: ",n,t.list));case 4:case"end":return e.stop()}}),e)})))()},methods:{goDetail:function(t,n,a){getApp().serCon=t,getApp().sTitle=n,getApp().Sdetail=a,e.navigateTo({url:"/pages/service/detail/index"})}}};t.default=u}).call(this,n("543d")["default"])},"4c54":function(e,t,n){},"4f56":function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("d716");a(n("66fd"));var c=a(n("17cb"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(c.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},ccc1:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},c=[]},e24d:function(e,t,n){"use strict";n.r(t);var a=n("3a72"),c=n.n(a);for(var r in a)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(r);t["default"]=c.a},f5e4:function(e,t,n){"use strict";var a=n("4c54"),c=n.n(a);c.a}},[["4f56","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/service"],{"17cb":function(e,t,n){"use strict";n.r(t);var a=n("5137"),c=n("e24d");for(var r in c)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return c[e]}))}(r);n("9c4c");var i=n("f0c5"),u=Object(i["a"])(c["default"],a["b"],a["c"],!1,null,"4d598b30",null,!1,a["a"],void 0);t["default"]=u.exports},"3a72":function(e,t,n){"use strict";(function(e){var a=n("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var c=a(n("2eee")),r=a(n("c973")),i=n("9ca2"),u={data:function(){return{picUrl:this.$picUrl,picBase:this.$picBase,list:[],showOverFlow:!0}},onLoad:function(e){var t=this;return(0,r.default)(c.default.mark((function e(){var n;return c.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,(0,i.getServerDataReq)({});case 2:n=e.sent,0==n.code&&(t.list=n.data,console.log("服务列表: ",n,t.list));case 4:case"end":return e.stop()}}),e)})))()},methods:{goDetail:function(t,n,a){getApp().serCon=t,getApp().sTitle=n,getApp().Sdetail=a,e.navigateTo({url:"/pages/service/detail/index"})}}};t.default=u}).call(this,n("543d")["default"])},"4f56":function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("d716");a(n("66fd"));var c=a(n("17cb"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(c.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},5137:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},c=[]},"9c4c":function(e,t,n){"use strict";var a=n("a8c6"),c=n.n(a);c.a},a8c6:function(e,t,n){},e24d:function(e,t,n){"use strict";n.r(t);var a=n("3a72"),c=n.n(a);for(var r in a)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(r);t["default"]=c.a}},[["4f56","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-<view class="container data-v-94c41ad2"><nav-bar vue-id="c84c028c-1" title="服务" back="{{false}}" color="black" flex="cen" background="#fff" class="data-v-94c41ad2" bind:__l="__l"></nav-bar><view class="list data-v-94c41ad2"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view class="item data-v-94c41ad2"><view class="topTitle data-v-94c41ad2"><view class="water data-v-94c41ad2">GIGESI</view><text class="data-v-94c41ad2">{{item.title}}</text></view><block wx:for="{{item.list}}" wx:for-item="item1" wx:for-index="index1"><view data-event-opts="{{[['tap',[['goDetail',['$0','$1','$2'],[[['list','',index],['list','',index1,'content']],[['list','',index],['list','',index1,'title']],[['list','',index],['list','',index1]]]]]]]}}" class="con data-v-94c41ad2" style="{{'background:'+('url('+(picBase+item1.image)+') ')+';'}}" bindtap="__e"><view class="label data-v-94c41ad2"><image class="img data-v-94c41ad2" src="/static/index/part1_icon.png" mode></image><view class="item2 data-v-94c41ad2">{{''+item1.title+''}}</view><view class="des data-v-94c41ad2">详情</view></view><view class="cen data-v-94c41ad2"><block wx:for="{{item1.label}}" wx:for-item="item2" wx:for-index="index2"><view class="item3 data-v-94c41ad2">{{''+item2.title+''}}</view></block></view><view class="bot data-v-94c41ad2"><image class="img2 data-v-94c41ad2" style="width:48rpx;height:48rpx;" src="{{picUrl+'/static/service/look.png'}}" mode></image></view></view></block></view></block></view></view>
+<view class="container data-v-4d598b30"><nav-bar vue-id="c84c028c-1" title="服务" back="{{false}}" color="black" flex="cen" background="#fff" class="data-v-4d598b30" bind:__l="__l"></nav-bar><view class="list data-v-4d598b30"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view class="item data-v-4d598b30"><view class="topTitle data-v-4d598b30"><view class="water data-v-4d598b30">GIGESI</view><text class="data-v-4d598b30">{{item.title}}</text></view><block wx:for="{{item.list}}" wx:for-item="item1" wx:for-index="index1"><view data-event-opts="{{[['tap',[['goDetail',['$0','$1','$2'],[[['list','',index],['list','',index1,'content']],[['list','',index],['list','',index1,'title']],[['list','',index],['list','',index1]]]]]]]}}" class="con data-v-4d598b30" style="{{'background:'+('url('+(picBase+item1.image)+') ')+';'}}" bindtap="__e"><view class="grayTrans data-v-4d598b30"><view class="label data-v-4d598b30"><image class="img data-v-4d598b30" src="/static/index/part1_icon.png" mode></image><view class="item2 data-v-4d598b30">{{''+item1.title+''}}</view><view class="des data-v-4d598b30">详情</view></view><view class="cen data-v-4d598b30"><block wx:for="{{item1.label}}" wx:for-item="item2" wx:for-index="index2"><view class="item3 data-v-4d598b30">{{''+item2.title+''}}</view></block></view><view class="bot data-v-4d598b30"><image class="img2 data-v-4d598b30" style="width:48rpx;height:48rpx;" src="{{picUrl+'/static/service/look.png'}}" mode></image></view></view></view></block></view></block></view></view>

unpackage/dist/build/mp-weixin/uni_modules/uview-ui/components/u-loadmore/u-loadmore.wxml

@@ -1 +1 @@
-<view class="u-loadmore data-v-0f91d4e1" style="{{$root.s0}}"><block wx:if="{{line}}"><u-line vue-id="b3889ac6-1" length="140rpx" color="{{lineColor}}" hairline="{{false}}" dashed="{{dashed}}" class="data-v-0f91d4e1" bind:__l="__l"></u-line></block><view class="{{['u-loadmore__content','data-v-0f91d4e1',status=='loadmore'||status=='nomore'?'u-more':'']}}"><block wx:if="{{status==='loading'&&icon}}"><view class="u-loadmore__content__icon-wrap data-v-0f91d4e1"><u-loading-icon vue-id="b3889ac6-2" color="{{iconColor}}" size="{{iconSize}}" mode="{{loadingIcon}}" class="data-v-0f91d4e1" bind:__l="__l"></u-loading-icon></view></block><text data-event-opts="{{[['tap',[['loadMore',['$event']]]]]}}" class="{{['u-line-1','data-v-0f91d4e1',status=='nomore'&&isDot==true?'u-loadmore__content__dot-text':'u-loadmore__content__text']}}" style="{{$root.s1}}" bindtap="__e">{{showText}}</text></view><block wx:if="{{line}}"><u-line vue-id="b3889ac6-3" length="140rpx" color="{{lineColor}}" hairline="{{false}}" dashed="{{dashed}}" class="data-v-0f91d4e1" bind:__l="__l"></u-line></block></view>
+<view class="u-loadmore data-v-c26b31ba" style="{{$root.s0}}"><block wx:if="{{line}}"><u-line vue-id="b3889ac6-1" length="140rpx" color="{{lineColor}}" hairline="{{false}}" dashed="{{dashed}}" class="data-v-c26b31ba" bind:__l="__l"></u-line></block><view class="{{['u-loadmore__content','data-v-c26b31ba',status=='loadmore'||status=='nomore'?'u-more':'']}}"><block wx:if="{{status==='loading'&&icon}}"><view class="u-loadmore__content__icon-wrap data-v-c26b31ba"><u-loading-icon vue-id="b3889ac6-2" color="{{iconColor}}" size="{{iconSize}}" mode="{{loadingIcon}}" class="data-v-c26b31ba" bind:__l="__l"></u-loading-icon></view></block><text data-event-opts="{{[['tap',[['loadMore',['$event']]]]]}}" class="{{['u-line-1','data-v-c26b31ba',status=='nomore'&&isDot==true?'u-loadmore__content__dot-text':'u-loadmore__content__text']}}" style="{{$root.s1}}" bindtap="__e">{{showText}}</text></view><block wx:if="{{line}}"><u-line vue-id="b3889ac6-3" length="140rpx" color="{{lineColor}}" hairline="{{false}}" dashed="{{dashed}}" class="data-v-c26b31ba" bind:__l="__l"></u-line></block></view>

unpackage/dist/build/mp-weixin/uni_modules/uview-ui/components/u-loadmore/u-loadmore.wxss

@@ -1 +1 @@
-view.data-v-0f91d4e1, scroll-view.data-v-0f91d4e1, swiper-item.data-v-0f91d4e1{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-loadmore.data-v-0f91d4e1{display:flex;flex-direction:row;align-items:center;justify-content:center;flex:1}.u-loadmore__content.data-v-0f91d4e1{margin:0 15px;display:flex;flex-direction:row;align-items:center;justify-content:center}.u-loadmore__content__icon-wrap.data-v-0f91d4e1{margin-right:8px}.u-loadmore__content__text.data-v-0f91d4e1{font-size:14px;color:#606266}.u-loadmore__content__dot-text.data-v-0f91d4e1{font-size:15px;color:#909193}
+view.data-v-c26b31ba, scroll-view.data-v-c26b31ba, swiper-item.data-v-c26b31ba{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-loadmore.data-v-c26b31ba{display:flex;flex-direction:row;align-items:center;justify-content:center;flex:1}.u-loadmore__content.data-v-c26b31ba{margin:0 15px;display:flex;flex-direction:row;align-items:center;justify-content:center}.u-loadmore__content__icon-wrap.data-v-c26b31ba{margin-right:8px}.u-loadmore__content__text.data-v-c26b31ba{font-size:14px;color:#606266}.u-loadmore__content__dot-text.data-v-c26b31ba{font-size:15px;color:#909193}