Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

pages/index/index.vue

@@ -21,7 +21,7 @@
 					<scroll-view style="width:100%;height:100%" scroll-y="true">
 						<view class="box">
 							<!-- <indexad style="width:690rpx"></indexad> -->
-							<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code"></u-swiper>
+							<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
 							<view class="list">
 								<view>
 									<videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item"
@@ -223,6 +223,7 @@
 			this.tabLiveList();
 		},
 		onPullDownRefresh() {
+            this.getArticlelist();
 			// this.getManicureList({ load: 'reload' });
 		},
 		methods: {
@@ -269,6 +270,7 @@
 					page: this.page,
 					is_video_img: 0, // 查询视频1 图文2 都查0
 				}).then(res => {
+                    uni.stopPullDownRefresh();
 					console.log('37647744ghj', res)
 					if (res.errCode == 0) {
 						this.articleList = res.data.list;
@@ -309,6 +311,7 @@
 				type,
 				id
 			}) {
+                console.log(type,id);
 				if (type == 0) return false;
 				// type 1 商品详情页, 2 店铺详情页
 				const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';

pages/information/information.vue

@@ -9,7 +9,7 @@
 		<view class="content">
 			<!-- 正文内容 -->
 		</view>
-		<view class="sousuo"></view>
+		<!-- <view class="sousuo"></view> -->
 		<view class="backes">
 			<titles :information="information_dles"></titles>
 		</view>
@@ -42,7 +42,7 @@
 					},
 					{
 						id: 0,
-						url: '../../static/pageD/info(6).png',
+						url: '../../static/pageD/info(13).png',
 						text: '活动消息'
 					},
 					{

pages/mine/index.vue

@@ -19,14 +19,14 @@
 				<view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view>
 			</view>
 			<view class="bottom">
-				<view @click="toOtherPage('/mine/GoodsCollection')">
+				<!-- <view @click="toOtherPage('/mine/GoodsCollection')">
 					<view>{{ userInfo.member_fav_goods_num || 0 }}</view>
 					<view>商品收藏</view>
 				</view>
 				<view @click="toOtherPage('/mine/StoreCollection')">
 					<view>{{ userInfo.member_fav_store_num || 0 }}</view>
 					<view>店铺收藏</view>
-				</view>
+				</view> -->
 				<view @click="toOtherPage('/mine/ImageTextCollection')">
 					<view>{{ userInfo.member_fav_article_num || 0 }}</view>
 					<view>图文收藏</view>
@@ -68,10 +68,14 @@
 						<view>试穿试送</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=5')">
+						<image src="/static/image/mine/37.png"></image>
+						<view>拼团中</view>
+					</view>
+					<view @click="toOtherPage('/order/Index?current=6')">
 						<image src="/static/image/mine/9.png"></image>
 						<view>售后</view>
 					</view>
-					<view @click="toOtherPage('/order/Index?current=6')">
+					<view @click="toOtherPage('/order/Index?current=7')">
 						<image src="/static/image/mine/3.png"></image>
 						<view>待评价</view>
 					</view>
@@ -244,8 +248,10 @@ export default {
 			box-sizing: border-box;
 			padding: 0 30rpx;
 			display: flex;
-			justify-content: space-between;
+			justify-content: space-around;
+			// justify-content: flex-start;
 			> view {
+				margin-right: 80rpx;
 				text-align: center;
 				font-size: 24rpx;
 				color:rgba(51,51,51,1);

pages/shop/index.vue

@@ -9,7 +9,7 @@
 					<image src="/static/image/shop/2.png"></image>
 				</view>
 				<view @click="sousuo">
-					<u-search placeholder="" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999" :disabled="true"></u-search>
+					<u-search placeholder="输入您喜欢的宝贝" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999" :disabled="true"></u-search>
 				</view>
 				<image src="/static/image/shop/3.png" class="mnue" @click="toClassifyPage"></image>
 			</view>
@@ -35,7 +35,7 @@
 				</view>
 			</view>
 			<view class="fenlei">
-				<shopitem v-for="item in goodsClassify" :key="item.gc_id" :info="item" class="item"></shopitem>
+				<shopitem v-for="item in goodsClassify" :key="item.gc_id" :info="item"></shopitem>
 			</view>
 			<!-- 秒杀 -->
 			<recommend v-if="JSON.stringify(recommendedSpike) != '{}'" :recommendData="recommendedSpike" type="spike"></recommend>
@@ -234,6 +234,7 @@
 			height: 88rpx;
 			display: flex;
 			align-items: center;
+			justify-content: space-between;
 
 			.local {
 				width: 31rpx;
@@ -299,19 +300,11 @@
 		}
 
 		.fenlei {
-			padding: 30rpx;
-			background-color: #ffffff;
 			display: flex;
 			flex-wrap: wrap;
+      padding: 30rpx;
 			margin-bottom: 20rpx;
-
-			>view {
-				margin-bottom: 30rpx;
-
-				&:not(:nth-child(5n)) {
-					margin-right: 70rpx;
-				}
-			}
+			background-color: #ffffff;
 		}
 
 		.activity-view {