12-31-1

pages/goods_details/index.vue

@@ -12,12 +12,22 @@
 					<productConSwiper :imgUrls="storeInfo.slider_image" :videoCoverImg="videoCoverImg" :videoline="storeInfo.video_link"></productConSwiper>
 					<view class="wrapper">
 						<view class="share acea-row row-between row-bottom">
+							<!-- #ifndef MP-TOUTIAO -->
 							<view class="money font-color">
 								￥
 								<text class="num">{{ storeInfo.price }}</text>
 								<text class="vip-money" v-if="storeInfo.vip_price && storeInfo.vip_price > 0">￥{{ storeInfo.vip_price }}</text>
 								<image v-if="storeInfo.vip_price && storeInfo.vip_price > 0" src="/static/images/vip.png"></image>
 							</view>
+							<!-- #endif -->
+							<!-- #ifdef MP-TOUTIAO -->
+							<view class="money font-color" v-if="power">
+								￥
+								<text class="num">{{ storeInfo.price }}</text>
+								<text class="vip-money" v-if="storeInfo.vip_price && storeInfo.vip_price > 0">￥{{ storeInfo.vip_price }}</text>
+								<image v-if="storeInfo.vip_price && storeInfo.vip_price > 0" src="/static/images/vip.png"></image>
+							</view>
+							<!-- #endif -->
 							<view class="iconfont icon-fenxiang" @click="listenerActionSheet"></view>
 						</view>
 						<view class="introduce">
@@ -25,7 +35,12 @@
 							{{ storeInfo.store_name ? storeInfo.store_name : '' }}
 						</view>
 						<view class="label acea-row row-between-wrapper" :style="{ 'padding-bottom': coupon.list.length ? 0 : 10 + 'px' }">
+							<!-- #ifndef MP-TOUTIAO -->
 							<view>原价:￥{{ storeInfo.ot_price ? storeInfo.ot_price : '' }}</view>
+							<!-- #endif -->
+							<!-- #ifdef MP-TOUTIAO -->
+							<view v-if="power">原价:￥{{ storeInfo.ot_price ? storeInfo.ot_price : '' }}</view>
+							<!-- #endif -->
 							<view>库存:{{ storeInfo.stock ? storeInfo.stock : 0 }}{{ storeInfo.unit_name ? storeInfo.unit_name : '' }}</view>
 							<view>销量:{{ storeInfo.sales ? storeInfo.sales : 0 }}{{ storeInfo.unit_name ? storeInfo.unit_name : '' }}</view>
 						</view>
@@ -71,6 +86,7 @@
 							</view>
 						</view>
 					</view>
+					<!-- #ifndef MP-TOUTIAO -->
 					<view class="attribute acea-row row-between-wrapper" @click="selecAttr">
 						<view class="acea-row row-between-wrapper">
 							{{ attrTxt }}：
@@ -78,7 +94,32 @@
 						</view>
 						<view class="iconfont icon-jiantou"></view>
 					</view>
+					<!-- #endif -->
+					<!-- #ifdef MP-TOUTIAO -->
+					<view class="attribute acea-row row-between-wrapper" @click="selecAttr" v-if="power">
+						<view class="acea-row row-between-wrapper">
+							{{ attrTxt }}：
+							<text class="atterTxt">{{ attrValue }}</text>
+						</view>
+						<view class="iconfont icon-jiantou"></view>
+					</view>
+					<!-- #endif -->
+					
+				</view>
+				<!-- #ifdef MP-TOUTIAO -->
+				<view class="userEvaluation" id="past1" v-if="replyCount > 0 && power">
+					<view class="title acea-row row-between-wrapper">
+						<view>用户评价({{ replyCount }})</view>
+						<navigator class="praise" hover-class="none" :url="'/pages/users/goods_comment_list/index?product_id=' + id">
+							<text class="font-color">{{ replyChance }}</text>
+							好评率
+							<text class="iconfont icon-jiantou"></text>
+						</navigator>
+					</view>
+					<block v-if="replyCount > 0"><userEvaluation :reply="reply"></userEvaluation></block>
 				</view>
+				<!-- #endif -->
+				<!-- #ifndef MP-TOUTIAO -->
 				<view class="userEvaluation" id="past1" v-if="replyCount > 0">
 					<view class="title acea-row row-between-wrapper">
 						<view>用户评价({{ replyCount }})</view>
@@ -90,7 +131,9 @@
 					</view>
 					<block v-if="replyCount > 0"><userEvaluation :reply="reply"></userEvaluation></block>
 				</view>
+				<!-- #endif -->
 				<!-- 商铺信息 -->
+				<!-- #ifndef MP-TOUTIAO -->
 				<view class="store-wrapper" v-if="storeInfo.merchant && hide_mer_status != 1">
 					<view class="store-hd">
 						<view class="store-info">
@@ -135,6 +178,53 @@
 						</view>
 					</view>
 				</view>
+				<!-- #endif -->
+				<!-- #ifdef MP-TOUTIAO -->
+				<view class="store-wrapper" v-if="storeInfo.merchant && hide_mer_status != 1 && power">
+					<view class="store-hd">
+						<view class="store-info">
+							<view class="logo"><image :src="storeInfo.merchant.mer_avatar" mode=""></image></view>
+							<view class="info">
+								<view class="name">
+									{{ storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : '' }}
+									<text v-if="storeInfo.merchant.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="txt">{{ storeInfo.merchant.care_count ? storeInfo.merchant.care_count : 0 }}人关注</view>
+							</view>
+							<navigator v-if="hide_mer_status != 1" :url="'/pages/store/home/index?id=' + storeInfo.merchant.mer_id" class="link" hover-class="none">进店</navigator>
+						</view>
+						<view class="score-wrapper">
+							<view class="item">
+								商品描述
+								<text>{{ storeInfo.merchant.product_score }}</text>
+							</view>
+							<view class="item">
+								卖家服务
+								<text>{{ storeInfo.merchant.service_score }}</text>
+							</view>
+							<view class="item">
+								物流服务
+								<text>{{ storeInfo.merchant.postage_score }}</text>
+							</view>
+						</view>
+					</view>
+					<view v-if="storeInfo.merchant.recommend && storeInfo.merchant.recommend.length > 0" class="con-box">
+						<view class="title">店铺推荐</view>
+						<view class="img-box">
+							<view class="img-item" v-for="(item, index) in storeInfo.merchant.recommend" :key="index" @click="goProDetail(item)">
+								<image :src="item.image" mode=""></image>
+								<view class="txt">
+									<view class="title line1">{{ item.store_name }}</view>
+									<view class="price">
+										<text>￥</text>
+										{{ item.price }}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- #endif -->
 				<view class="product-intro" id="past3">
 					<view class="title">产品介绍</view>
 					<view class="conter" v-if="description">
@@ -383,6 +473,11 @@ export default {
 	},
 	computed: mapGetters(['isLogin', 'uid']),
 	onLoad(options) {
+		getPower({
+			path: 'https://sos.liuniu946.com/index/#/pages/index/index'
+		}).then(res => {
+			console.log(res,'getPower------------')
+		})
 		let that = this;
 		// #ifdef APP-PLUS
 		// that.ppower = uni.getStorageSync('power')
@@ -717,6 +812,7 @@ export default {
 					}
 					that.$set(that, 'storeInfo', storeInfo);
 					that.$set(that, 'description', storeInfo.content);
+					console.log(storeInfo.content,'storeInfo.content+++++++++++')
 					that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
 					that.$set(that, 'replyCount', res.data.replayData.count);
 					that.$set(that, 'replyChance', res.data.replayData.rate);

pages/index/index.vue

@@ -310,6 +310,7 @@
 				<!-- #endif -->
 				
 				<!-- 品牌好店 -->
+				<!-- #ifndef MP-TOUTIAO -->
 				<view class="explosion" v-if="brandList.length && hide_mer_status !=1">
 					<view class="common-hd">
 						<view class="title">品牌好店</view>
@@ -350,6 +351,49 @@
 						</view>
 					</view>
 				</view>
+				<!-- #endif -->
+				<!-- #ifdef MP-TOUTIAO -->
+				<view class="explosion" v-if="brandList.length && hide_mer_status !=1 && power">
+					<view class="common-hd">
+						<view class="title">品牌好店</view>
+						<!-- <view class="title"></view> -->
+					</view>
+					<view class="mer-box">
+						<view class="mer-item" v-for="(item,index) in brandList" :key='index'>
+							<view class="mer-hd" @click="goStore(item.mer_id)">
+								<image :src="item.mer_banner"></image>
+								<view class="mer-name">
+									<image :src="item.mer_avatar"></image>
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+							</view>
+							<view class="pro-box">
+								<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none" class="pro-item" v-for="(itemn,indexn) in item.recommend"
+								 :key='indexn' v-if="item.recommend.length<=4">
+									<image :src="itemn.image" mode=""></image>
+									<!-- #ifdef MP-TOUTIAO -->
+									<view class="price" v-if="power">
+										<text>￥</text>{{itemn.price}}
+									</view>
+									<!-- #endif -->
+									<!-- #ifndef MP-TOUTIAO -->
+									<view class="price">
+										<text>￥</text>{{itemn.price}}
+									</view>
+									<!-- #endif -->
+								</navigator>
+							</view>
+						</view>
+						<view class="more-shop" @click="moreShop">
+							<text>
+								更多店铺
+							</text>
+							<text class="iconfont icon-xiangyou"></text>
+						</view>
+					</view>
+				</view>
+				<!-- #endif -->
 				<!-- 首页推荐 -->
 				<view class="index-product-wrapper">
 					<!-- 首发新品 -->
@@ -799,7 +843,6 @@
 						// #endif 
 						// #ifdef MP
 						this.$emit('isShowAuth', true);
-						
 						this.$emit('isAuto', true);
 						// #endif
 					}
@@ -2112,7 +2155,7 @@
 				align-items: center;
 				justify-content: center;
 				height: 170rpx;
-
+				
 				.title {
 					padding: 40rpx 120rpx;
 					font-size: 34rpx;
@@ -2123,6 +2166,7 @@
 					background-repeat: no-repeat;
 					background-size: 100% auto;
 					background-position: left center;
+					
 				}
 			}
 

pages/users/distributor/index.vue

@@ -391,6 +391,7 @@
 					that.loading = false;
 					that.loadTitle = loadend ? '已全部加载' : '加载更多';
 					that.$set(that, 'distribution', productList);
+					console.log(productList,'productList++++++++++')
 					that.$set(that.where, 'page', that.where.page + 1);
 				}).catch(err => {
 					that.loading = false;