详情页优化以及我的页面优化

pages/goods/list.vue

@@ -187,6 +187,7 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad(options) {
+			console.log(options)
 			// 记录options
 			this.options = options
 			this.searchText = options.search
@@ -545,9 +546,8 @@
 
 	.shipping {
 		width: 44rpx;
-		height: 24rpx;
 		background: #FFFFFF;
-		border-radius: 4rpx 4rpx 4rpx 4rpx;
+		border-radius: 4rpx;
 		opacity: 1;
 		border: 1rpx solid #F21A1C;
 		font-size: 16rpx;

pages/index/index.vue

@@ -20,7 +20,7 @@
 			<template v-if="current == 0">
 				<view class="chat" v-if="isLogin == false" @click="toChat()">
 					<u-icon name="chat" color="#000000" size="70"></u-icon>
-					<view class="badge"></view>
+					<!-- <view class="badge"></view> -->
 				</view>
 				<view class="chat" v-else>
 					<u-icon name="chat" color="#000000" size="70"></u-icon>
@@ -902,6 +902,15 @@
 		}
 		.chat{
 			position: relative;
+			button{
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				left: 0;
+				top: 0;
+				z-index: 2;
+				opacity: 0;
+			}
 			.badge{
 				position: absolute;
 				width:40rpx;

pages/login/components/mp-weixin-mobile.vue

@@ -18,8 +18,12 @@
 	} from '@/utils/util'
 	import * as UserApi from '@/api/user'
 	export default {
-
-
+		props: {
+		  // 分享人id
+		  share_user_id: {
+		    type: String
+		  },
+		},
 		data() {
 			return {
 				// 微信小程序登录凭证 (code)
@@ -61,6 +65,7 @@
 							code: app.code,
 							encryptedData: detail.encryptedData,
 							iv: detail.iv,
+							share_user_id: this.share_user_id,
 							isParty: app.isParty,
 							partyData: app.userInfo,
 							refereeId: store.getters.refereeId

pages/login/index.vue

@@ -20,7 +20,7 @@
 		</view>
 		<view class="login-fd login-fd-on" @click="login">登录</view>
 		<view class="">
-			<mpWeiXinMobile></mpWeiXinMobile>
+			<mpWeiXinMobile :share_user_id="share_user_id"></mpWeiXinMobile>
 		</view>
 	</view>
 </template>
@@ -50,10 +50,11 @@
 				countdown: 60,
 				countDownFun: null,
 				code: '',
+				share_user_id: ""
 			}
 		},
-		onShow() {
-
+		onLoad(o) {
+			this.share_user_id = o.share_user_id
 		},
 		methods: {
 
@@ -117,6 +118,7 @@
 				store.dispatch('Login', {
 					smsCode: that.semCode,
 					mobile: that.phoneNum,
+					share_user_id: this.share_user_id,
 					isParty: false,
 					partyData: {},
 					refereeId: false

pages/search/index.vue

@@ -118,7 +118,7 @@
 				// this.searchList = Array.from(new Set(this.searchList));
 				// uni.setStorageSync('searchList', this.searchList)
 				uni.navigateTo({
-					url: '/pages/goods/list?search=' + item
+					url: '/pages/goods/list?search=' + item.word
 				})
 			},
 			getSearchInfo() {

pages/user/index.vue

@@ -127,12 +127,12 @@
 			</view>
 			<view class="coupon" v-if="isLogin == false || userInfo.user_type != 40">
 				<view class="walletList">
-					<view class="listItem" @click="goPage('pages/cart/index')">
+					<view class="listItem" @click="goJump('pages/news/park/recordHistory')">
 						<view class="num">
-							{{actionCountsInfo.cart_number?actionCountsInfo.cart_number:0}}
+							{{actionCountsInfo.reservation_number?actionCountsInfo.reservation_number:0}}
 						</view>
 						<view class="info">
-							购物车
+							预约记录
 						</view>
 					</view>
 					<view class="listItem" @click="goJump('pages/news/park/browsingHistory')">
@@ -143,12 +143,12 @@
 							浏览记录
 						</view>
 					</view>
-					<view class="listItem" @click="goJump('pages/news/park/recordHistory')">
+					<view class="listItem" @click="goJump('/pages/news3/setOutRecords')">
 						<view class="num">
-							{{actionCountsInfo.reservation_number?actionCountsInfo.reservation_number:0}}
+							{{actionCountsInfo.take_goods_number?actionCountsInfo.take_goods_number:0}}
 						</view>
 						<view class="info">
-							预约记录
+							{{isLogin==false || userInfo.user_type <= 20?'发货记录':'提货记录'}}
 						</view>
 					</view>
 					<view class="listItem" @click="goJump('pages/news/coupon/list')">
@@ -235,7 +235,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="goodsManage" v-if="isLogin == false || userInfo.user_type == 30">
+			<view class="goodsManage" v-if="userInfo.user_type == 30">
 				<view class="manageTitle">
 					<text lines="1" class="text_5 titleLeft">分销订单</text>
 					<text lines="1" class="text_6 titleRight" @click="goJump('/pages/news3/fenxiao')">查看全部</text>
@@ -441,10 +441,10 @@
 				</view>
 			</view>
 			<!-- 商品推荐 -->
-			<view class="goodsRecommend-title">
-				<image :src="$picUrl+'/static/user/left.png'"></image>为您推荐<image :src="$picUrl+'/static/user/right.png'"></image>
+			<view class="goodsRecommend-title" v-if="isLogin == false || userInfo.user_type != 40">
+				<image :src="$picUrl+'/static/user/left.png'"></image>专属推荐<image :src="$picUrl+'/static/user/right.png'"></image>
 			</view>
-			<view class="goodsRecommend">
+			<view class="goodsRecommend" v-if="isLogin == false || userInfo.user_type != 40">
 				<view class="goodsItem" v-for="(item,index) in suggestGoodsList" @click="goodsDetail(item)" :key="index">
 					<view class="pic">
 						<image :src="item.goods_image" mode=""></image>
@@ -726,6 +726,7 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: flex-end;
+		padding-bottom: 30rpx;
 		.toTop{
 			position: fixed;
 			bottom:30rpx;