2312970463@qq.com 4 years ago
parent
commit
ebd616606f
3 changed files with 24 additions and 10 deletions
  1. 6 0
      pages/columnGoods/goods_search_con/index.vue
  2. 5 0
      pages/index/index.vue
  3. 13 10
      pages/user/index.vue

+ 6 - 0
pages/columnGoods/goods_search_con/index.vue

@@ -318,7 +318,10 @@
 					this.hide_mer_status = res.data.hide_mer_status
 					if (res.data.mer_location == 1) {
 						this.mer_location = res.data.mer_location
+						// #ifndef MP-TOUTIAO
 						this.selfLocation()
+						// #endif
+						
 					}
 				}
 			});
@@ -353,6 +356,7 @@
 				});
 			},
 			//获取定位
+			// #ifndef MP-TOUTIAO
 			selfLocation() {
 				let self = this
 				uni.getLocation({
@@ -379,6 +383,8 @@
 					}
 				});
 			},
+			// #endif
+			
 			// 查找店铺
 			storeMerchantList(type) {
 				if (!this.storeScroll) return

+ 5 - 0
pages/index/index.vue

@@ -659,10 +659,12 @@
 				if (value.spid) {
 					that.currSpid = value.spid
 					app.globalData.spid = value.spid;
+					 
 				}
 			}
 			// #endif
 			shareScence(that.currSpid, that.isLogin)
+			// #ifndef MP-TOUTIAO
 			uni.getLocation({
 				type: 'wgs84',
 				success: function(res) {
@@ -674,6 +676,8 @@
 					}
 				}
 			});
+			// #endif
+			
 
 			// #ifdef MP
 			// 获取小程序头部高度
@@ -1236,6 +1240,7 @@
 						href = href.indexOf("?") === -1 ? href + "?spid=" + this.uid : href + "&spid=" + this.uid;
 					} else {
 						href = href
+						
 					}
 					let configAppMessage = {
 						desc: datas.share_info,

+ 13 - 10
pages/user/index.vue

@@ -78,6 +78,7 @@
 				</view>
 			</view>
 			<!-- 轮播 -->
+			<!-- #ifndef MP-TOUTIAO -->
 			<view class="slider-wrapper" v-if="imgUrls.length>0">
 				<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
 				 indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
@@ -90,6 +91,7 @@
 					</block>
 				</swiper>
 			</view>
+			<!-- #endif -->
 			<!-- 会员菜单 -->
 			<view class="user-menus" style="margin-top: 20rpx;">
 				<view class="title">我的服务</view>
@@ -98,16 +100,17 @@
 						<image src="/static/images/user-menu-001.png"></image>
 						<text>我的余额</text>
 					</navigator>
-					
-					<navigator url="/pages/users/user_spread_user/index" class="item" hover-class="none" v-if="is_promoter == 1 && extension_status == 1">
-						<image src="/static/images/user_menu11.png"></image>
-						<text>分销推广</text>
-					</navigator>
-					<navigator url="/pages/users/distributor/index" class="item" hover-class="none" v-if="is_promoter == 0 && extension_status == 1">
-
-						<image src="/static/images/user_menu11.png"></image>
-						<text>分销推广</text>
-					</navigator>
+					 <!-- #ifndef MP-TOUTIAO -->
+					 <navigator url="/pages/users/user_spread_user/index" class="item" hover-class="none" v-if="is_promoter == 1 && extension_status == 1">
+					 	<image src="/static/images/user_menu11.png"></image>
+					 	<text>分销推广</text>
+					 </navigator>
+					 <navigator url="/pages/users/distributor/index" class="item" hover-class="none" v-if="is_promoter == 0 && extension_status == 1">
+					 
+					 	<image src="/static/images/user_menu11.png"></image>
+					 	<text>分销推广</text>
+					 </navigator>
+					 <!-- #endif -->
 					<view class="item" @click="goUrl(item.url)"
 					 v-for="(item,index) in MyMenus" :key="index">
 						<image :src="item.pic"></image>