bug修复

10 months ago · da06719c6c
parent 00012f2e07
commit da06719c6c
8 changed files with 85 additions and 43 deletions
--- a/pages/activity/presale.vue
+++ b/pages/activity/presale.vue
@ -32,9 +32,11 @@
 				</view>
 			</view>
 		</view>
-		<u-empty text="暂无信息" v-if="menuList.length == 0 || goodList.length==0" mode="list" style="margin-top: 160rpx;">
+		<view style="margin-top: 250rpx;" v-if="goodList.length==0">
+			<u-empty text="暂无信息"  mode="list">
 			</u-empty>
 		</view>
+	</view>
 </template>

 <script>
@ -71,7 +73,7 @@
 			getListgoodData(categoryId) {
 				let app = this;
 				let pamars = {
-					category_id: categoryId,
+					category_id: categoryId?categoryId:"",
 				}
 				Api.presaleGoodsList(pamars)
 					.then(result => {
@ -107,7 +109,12 @@
 						app.timestamp = this.beginTime(result.data.info.p_time);
 						app.info = result.data.info
 						app.menuList = result.data.category;
+						if(result.data.category && result.data.category.length > 0) {
 							app.getListgoodData(result.data.category[0].category_id)
+						}else{
+							app.getListgoodData()
+						}
+						
 					})
 					.finally(() => app.isLoading = false)
 			},
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@ -177,8 +177,10 @@
 						</template>
 					</u-waterfall>
 				</view>
+				<view style="margin-top: 250rpx;">
 					<u-empty text="暂无数据显示哦～" v-if="list.data.length==0 && total == 0" mode="list"></u-empty>
 				</view>	
+			</view>
 		</mescroll-body>
 	</view>
 </template>
@ -226,7 +228,10 @@
 						size: pageSize
 					},
 					// 数量要大于4条才显示无更多数据
-					noMoreSize: 4,
+					// noMoreSize: 4,
+					empty: {
+						 use : false ,
+					}
 				},
 				tabbar: []
 			}
@ -236,7 +241,7 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad(options) {
-			console.log(options)
+			console.log("options",options)
 			// 记录options
 			this.options = options
 			this.searchText = options.search
@ -278,6 +283,7 @@
 						this.keyName1 = item.name
 					}
 				}
+				
 				if (type == 2) {
 					if (item.category_id == this.isActive) {
 						this.isActive = '';
@ -304,6 +310,7 @@
 						const curPageLen = list.data.length
 						const totalSize = list.data.total
 						app.mescroll.endBySize(curPageLen, totalSize)
+						console.log("upCallback",app.upOption)
 					})
 					.catch(() => app.mescroll.endErr())
 			},
@ -396,6 +403,12 @@
 			 * 商品搜索
 			 */
 			handleSearch() {
+				this.isBanrdActive = '';
+				this.keyName1 = '';
+				this.isActive = '';
+				this.keyName2 = '';
+				this.banrdType =  [];
+				this.goodsType = [];
 				const searchPageUrl = 'pages/search/index?category_id=' + this.options.categoryId
 				// 判断来源页面
 				let pages = getCurrentPages()
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -294,7 +294,7 @@
 		<view v-show="current==1">
 			<view class="secondSection">
 				<image class="shopImage" :src="cityInfo.imageList?cityInfo.imageList[0]:''"></image>
-				<view class="content">
+				<view class="content" v-if="cityInfo.shop_name">
 					<view class="topcontent">
 						<view class="shopTitle">
 							<text class="title">{{cityInfo.shop_name}}</text>
--- a/pages/invite/index.vue
+++ b/pages/invite/index.vue
@ -69,11 +69,11 @@
 		</view>
 		<!--  -->
 		<view class="invite-popup" v-if="isPopup">
-			<view class="popup" @click="download()">
-				<image class="bg" :src="qrcode"></image>
-				<view class="tips">保存海报图</view>
-				<view class="close">
-
+			<view class="popup">
+				<image class="bg" show-menu-by-longpress :src="qrcode"></image>
+				<view class="tips">
+					<view class="cancle" @click="download(1)">取消</view>
+					<view class="sure"  @click="download(2)">保存到相册</view>
 				</view>
 			</view>
 		</view>
@ -159,12 +159,16 @@
 				} = await newFunApi.InviteUserPoster({});
 				if (status == 200) {
 					console.log(data)
+					this.isPopup = true;
 					this.qrcode = data.imageUrl
 				}
 			},
-			download() {
+			download(type) {
 				const app = this
 				app.isPopup = false;
+				if(type == 1){
+					return ;
+				}
 				uni.showLoading({
 					title: '加载中'
 				})
@ -252,7 +256,6 @@
 						url: "/pages/news/user/withdrawal?balance=" + this.userInfo.pay_money
 					})
 				} else if (index == 3) {
-					this.isPopup = true;
 					this.InviteUserPoster();
 				} else if (index == 4) {
 					uni.navigateTo({
@ -307,19 +310,32 @@
 				}

 				.tips {
-					width: 600rpx;
+					width: 672rpx;
 					height: 80rpx;
 					position: absolute;
 					text-align: center;
 					font-size: 30rpx;
 					line-height: 80rpx;
-					border-radius: 10rpx;
 					color: #212121;
 					left: 50%;
-					margin-left: -300rpx;
+					margin-left: -336rpx;
 					bottom: -120rpx;
 					z-index: 2;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cancle{
+						flex: 1;
 						background-color: #FFFFFF;
+						margin-right: 30rpx;
+						border-radius: 10rpx;
+					}
+					.sure{
+						border-radius: 10rpx;
+						flex: 1;
+						color: #FFFFFF;
+						background-color: #FF4A49;
+					}
 				}

 				.close {
--- a/pages/news/rules/rulesList.vue
+++ b/pages/news/rules/rulesList.vue
@ -8,8 +8,7 @@
 					<view class="title" @click="goRules(item)">
 						{{item.title}}
 					</view>
-
-				<u-line />
+					<u-line v-if="item.title" />
 			</view>

 		</view>
--- a/pages/news1/help.vue
+++ b/pages/news1/help.vue
@ -50,9 +50,9 @@
 			this.getHelpList()
 		},
 		methods: {
-			goListPage(item) {
+			goListPage(index) {
 				uni.navigateTo({
-					url: '/pages/news/rules/rulesList?itemInfo=' + encodeURIComponent(JSON.stringify(item))
+					url: '/pages/news/rules/rulesList?itemInfo=' + encodeURIComponent(JSON.stringify(index))
 				})
 			},
 			getHelpList() {
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@ -1,7 +1,7 @@
 <template>
 	<view class="detail">
 		<view>
-			<u-navbar title="订单详情" back-icon-color="#fff" :border-bottom="false" title-color="#333"
+			<u-navbar title="订单详情" back-icon-color="#333" :border-bottom="false" title-color="#333"
 				:background="background"></u-navbar>
 		</view>
 		<view class="send">
@ -226,8 +226,10 @@
 				<view class="sp">

 				</view>
-				<view class="callShop" @click="callStore(order.storeInfo.phone)">
+				<!-- / @click="callStore(order.storeInfo.phone)" -->
+				<view class="callShop">
 					<image src="/static/order/share.png" mode=""></image>
+					<button open-type="contact"></button>
 					联系商家
 				</view>
 			</view>
@ -1176,6 +1178,7 @@
 			}

 			.callShop {
+				position: relative;
 				image {
 					width: 26rpx;
 					height: 26rpx;
@ -1184,11 +1187,18 @@

 				height: 34rpx;
 				font-size: 24rpx;
-				font-family: PingFang SC,
-				PingFang SC;
 				font-weight: 400;
 				color: #1E1E1E;
 				line-height: 34rpx;
+				button{
+					width: 100%;
+					height: 100%;
+					position: absolute;
+					left: 0;
+					top: 0;
+					z-index: 2;
+					opacity: 0;
+				}
 			}
 		}
 	}
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@ -8,13 +8,13 @@
 		</view>
 		<!-- tab栏 -->
 		<view class="container">
-			<view class="classify-list">
+			<scroll-view scroll-x class="classify-list">
 				<view class="list" v-for="(item,index) in tabs" :class="{'action':current==index}"
 					@click="onChangeTab(item,index)" :key="index">
 					<text>{{item.name}}</text>
 					<text class="line" v-show="current==index"></text>
 				</view>
-			</view>
+			</scroll-view>
 		</view>
 	<!-- 	<u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="current"
 			bar-width="56" bar-height="6" active-color="#3B3B3B" :show-bar='true' :duration="0.2"
@ -497,9 +497,6 @@
 		white-space: nowrap;
 		width: 100%;
 		height: 100rpx;
-		overflow-x: auto;
-		overflow-y: hidden;
-
 		.list {
 			position: relative;
 			display: inline-block;