Selaa lähdekoodia

套餐详情轮播图切换,供应商商品详情问题优化,套餐标签优化,我的消息去掉查看详情

huangzhe 3 vuotta sitten
vanhempi
commit
5c291d6b53

+ 236 - 240
src/components/page-component/goods/app-goods-banner.vue

xqd xqd
@@ -1,197 +1,187 @@
 <template>
-    <view class="app-goods-banner" v-if="picList.length > 0">
-        <!-- #ifdef H5 -->
-        <bd-h5-back></bd-h5-back>
-        <!-- #endif -->
-        <!-- #ifdef MP-WEIXIN -->
-        <view class='account-box' v-if='mallConfig.mall.setting.is_official_account == 1'>
-            <official-account></official-account>
-        </view>
-        <!-- #endif -->
-		
+	<view class="app-goods-banner" v-if="picList.length > 0">
+		<!-- #ifdef H5 -->
+		<bd-h5-back></bd-h5-back>
+		<!-- #endif -->
+		<!-- #ifdef MP-WEIXIN -->
+		<view class='account-box' v-if='mallConfig.mall.setting.is_official_account == 1'>
+			<official-account></official-account>
+		</view>
+		<!-- #endif -->
+
 		<view class="swiper_zhishi" v-if="picList.length>0">
 			<view :class="swiperKey===i?'view_active':''" v-for="(item1,i) in picList" :key="i"></view>
 		</view>
-        <swiper
-            class="swiper"
-            v-bind:autoplay="autoplay"
-            v-bind:indicator-dots="false"
-            circular
-            @change='bannerChange'
-            indicator-color="rgba(254,255,254,.4)"
-            indicator-active-color="#FFFFFF"
-        >
-            <!-- #ifndef MP-BAIDU || H5 -->
-                <swiper-item v-if="videoUrl && getVideo == 1 && sign !== 'lottery' && sign !== 'bargain' && sign !== 'community' && sign !== 'wholesale'">
-                    <view class="swiper-img" @click="routeJumpT" v-bind:style="{backgroundImage: 'url(' + rangeKey!='false'?picList[0][rangeKey]:picList[0] + ')'}">
-                        <image class="video-play" src="https://shop.9026.com/web/statics/img/mall/static/video-play.png"></image>
-                    </view>
-                </swiper-item>
-            <!-- #endif-->
+		<swiper class="swiper" v-bind:autoplay="autoplay" v-bind:indicator-dots="false" circular @change='bannerChange' :current="current"
+			indicator-color="rgba(254,255,254,.4)" indicator-active-color="#FFFFFF">
+			<!-- #ifndef MP-BAIDU || H5 -->
+			<!-- <swiper-item
+				v-if="videoUrl && getVideo == 1 && sign !== 'lottery' && sign !== 'bargain' && sign !== 'community' && sign !== 'wholesale'">
+				<view class="swiper-img" @click="routeJumpT"
+					v-bind:style="{backgroundImage: 'url(' + rangeKey!='false'?picList[0][rangeKey]:picList[0] + ')'}">
+					<image class="video-play" src="https://shop.9026.com/web/statics/img/mall/static/video-play.png">
+					</image>
+				</view>
+			</swiper-item> -->
+			<!-- #endif-->
 
-            <swiper-item v-for="(item, index) in picList" v-bind:key="index">
-                <view class="swiper-img" v-bind:style="{backgroundImage: `url(${rangeKey!='false'?item[rangeKey]:item})`}"
-                      @click="clickImage(index)">
+			<swiper-item v-for="(item, index) in picList" v-bind:key="index">
+				<view class="swiper-img"
+					v-bind:style="{backgroundImage: `url(${rangeKey!='false'?item[rangeKey]:item})`}"
+					@click="clickImage(index)">
 
-                    <!-- #ifndef MP-BAIDU || H5 -->
-                    <app-video
-                        v-if="index === 0 && videoUrl && getVideo == 0"
-                        height="750rpx"
-                        v-bind:pic-url="rangeKey!='false'?item[rangeKey]:item"
-                        v-bind:url="videoUrl"
-                        v-on:video-start="videoStart"
-                        v-on:tap.native.stop="preventD"
-                    ></app-video>
-                    <app-video
-                        v-if="index === 0 && videoUrl && getVideo == 1 && (sign === 'lottery' || sign === 'bargain' || sign === 'community' || sign === 'wholesale')"
-                        height="750rpx"
-                        v-bind:pic-url="rangeKey!='false'?item[rangeKey]:item"
-                        v-bind:url="videoUrl"
-                        v-on:video-start="videoStart"
-                        v-on:tap.native.stop="preventD"
-                    ></app-video>
-                    <!-- #endif -->
+					<!-- #ifndef MP-BAIDU || H5 -->
+					<app-video v-if="index === 0 && videoUrl && getVideo == 0" height="750rpx"
+						v-bind:pic-url="rangeKey!='false'?item[rangeKey]:item" v-bind:url="videoUrl"
+						v-on:video-start="videoStart" v-on:tap.native.stop="preventD"></app-video>
+					<app-video
+						v-if="index === 0 && videoUrl && getVideo == 1 && (sign === 'lottery' || sign === 'bargain' || sign === 'community' || sign === 'wholesale')"
+						height="750rpx" v-bind:pic-url="rangeKey!='false'?item[rangeKey]:item" v-bind:url="videoUrl"
+						v-on:video-start="videoStart" v-on:tap.native.stop="preventD"></app-video>
+					<!-- #endif -->
 
-                    <!-- #ifdef MP-BAIDU || H5 -->
-                    <app-video
-                        v-if="index === 0 && videoUrl"
-                        height="750rpx"
-                        v-bind:pic-url="rangeKey!='false'?item[rangeKey]:item"
-                        v-bind:url="videoUrl"
-                        v-on:video-start="videoStart"
-                        v-on:tap.native.stop="preventD"
-                    ></app-video>
-                    <!-- #endif -->
+					<!-- #ifdef MP-BAIDU || H5 -->
+					<app-video v-if="index === 0 && videoUrl" height="750rpx"
+						v-bind:pic-url="rangeKey!='false'?item[rangeKey]:item" v-bind:url="videoUrl"
+						v-on:video-start="videoStart" v-on:tap.native.stop="preventD"></app-video>
+					<!-- #endif -->
 
-                </view>
-            </swiper-item>
-        </swiper>
+				</view>
+			</swiper-item>
+		</swiper>
 
-        <view>
-            <app-jump-button url="/pages/cart/cart" v-if="isCart">
-                <view class="cart" :class="isScanQrCode ? 'bd-cart-0' : 'bd-cart-1'" >
-                    <image load-lazy src="https://shop.9026.com/web/statics/image/mall/static/icon/nav-icon-cart.png"></image>
-                </view>
-            </app-jump-button>
-        </view>
-        <view class="share-commission dir-left-nowrap cross-center" v-if="share > 0">
-            <image load-lazy src="https://shop.9026.com/web/statics/img/mall/share/share_commission.png"></image>
-            <view class="text">
-                <view>分销最高可赚</view>
-                <view>¥{{share}}</view>
-            </view>
-        </view>
-    </view>
+		<view>
+			<app-jump-button url="/pages/cart/cart" v-if="isCart">
+				<view class="cart" :class="isScanQrCode ? 'bd-cart-0' : 'bd-cart-1'">
+					<image load-lazy src="https://shop.9026.com/web/statics/image/mall/static/icon/nav-icon-cart.png">
+					</image>
+				</view>
+			</app-jump-button>
+		</view>
+		<view class="share-commission dir-left-nowrap cross-center" v-if="share > 0">
+			<image load-lazy src="https://shop.9026.com/web/statics/img/mall/share/share_commission.png"></image>
+			<view class="text">
+				<view>分销最高可赚</view>
+				<view>¥{{share}}</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+	import appVideo from "../../page-component/app-video/app-video.vue";
+	// #ifdef H5
+	import bdH5Back from "@/components/page-component/goods/bd-h5-back.vue";
+	// #endif
+	import {
+		mapState,
+		mapGetters
+	} from 'vuex';
 
-    import appVideo from "../../page-component/app-video/app-video.vue";
-    // #ifdef H5
-    import bdH5Back from "@/components/page-component/goods/bd-h5-back.vue";
-    // #endif
-    import { mapState, mapGetters } from 'vuex';
-
-    export default {
-        components: {
-            'app-video': appVideo,
-            // #ifdef H5
-            bdH5Back
-            // #endif
-        },
-        props: {
-            picList: {
-                type: Array,
-                default() {
-                    return []
-                }
-            },
-			rangeKey:{  //传空字符串竟然为true,所以传false字符串替代''
-				type:String,
-				default:'pic_url'
+	export default {
+		components: {
+			'app-video': appVideo,
+			// #ifdef H5
+			bdH5Back
+			// #endif
+		},
+		props: {
+			current:{
+				type:Number,
+				default:0
+			},
+			picList: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			rangeKey: { //传空字符串竟然为true,所以传false字符串替代''
+				type: String,
+				default: 'pic_url'
+			},
+			share: {
+				type: Number
 			},
-            share: {
-                type: Number
-            },
-            isCart: {
-                type: Boolean,
-                default() {
-                    return true;
-                }
-            },
-            videoUrl: {
-                type: String
-            },
-            goods_id: {
-                type: [Number, String]
-            },
-            sign: {
-                type: String
-            }
-        },
-        data() {
-            return {
-				swiperKey:0,
-                // #ifdef MP
-                autoplay: true,
-                // #endif
-                // #ifdef H5
-                autoplay: false,
-                // #endif
-            };
-        },
-        methods: {
-            bannerChange(e) {
+			isCart: {
+				type: Boolean,
+				default () {
+					return true;
+				}
+			},
+			videoUrl: {
+				type: String
+			},
+			goods_id: {
+				type: [Number, String]
+			},
+			sign: {
+				type: String
+			}
+		},
+		data() {
+			return {
+				swiperKey: 0,
+				// #ifdef MP
+				autoplay: true,
+				// #endif
+				// #ifdef H5
+				autoplay: false,
+				// #endif
+			};
+		},
+		methods: {
+			bannerChange(e) {
 				this.swiperKey = e.detail.current
-                this.$event.trigger(this.$const.EVENT_VIDEO_END);
-            },
-            videoStart(videoStatus) {
-                // #ifdef MP
-                videoStatus ? this.autoplay = false : this.autoplay = true;
-                // #endif
-            },
-            preventD() {},
-            clickImage(index) {
-                let urls = [];
-                this.picList.forEach(item => {
-                    urls.push(this.rangeKey!='false'?item[this.rangeKey]:item);
-                });
-                uni.previewImage({
-                    current: index,
-                    urls: urls
-                });
-            },
-            // #ifndef MP-BAIDU || H5
-            routeJumpT() {
-                uni.navigateTo({
-                    url: `/pages/goods/video?goods_id=${this.goods_id}&sign=${this.sign}`
-                })
-            }
-            // #endif
-        },
-        computed: {
-            ...mapState({
-                // #ifdef MP-WEIXIN
-                mallConfig: state => state.mallConfig,
-                // #endif
-                isScanQrCode: state => state.page.isScanQrCode
-            }),
-            // #ifndef MP-BAIDU
-            ...mapGetters('mallConfig',{
-                getVideo: 'getVideo'
-            }),
-            // #endif
-        },
+				this.$event.trigger(this.$const.EVENT_VIDEO_END);
+			},
+			videoStart(videoStatus) {
+				// #ifdef MP
+				videoStatus ? this.autoplay = false : this.autoplay = true;
+				// #endif
+			},
+			preventD() {},
+			clickImage(index) {
+				let urls = [];
+				this.picList.forEach(item => {
+					urls.push(this.rangeKey != 'false' ? item[this.rangeKey] : item);
+				});
+				uni.previewImage({
+					current: index,
+					urls: urls
+				});
+			},
+			// #ifndef MP-BAIDU || H5
+			routeJumpT() {
+				uni.navigateTo({
+					url: `/pages/goods/video?goods_id=${this.goods_id}&sign=${this.sign}`
+				})
+			}
+			// #endif
+		},
+		computed: {
+			...mapState({
+				// #ifdef MP-WEIXIN
+				mallConfig: state => state.mallConfig,
+				// #endif
+				isScanQrCode: state => state.page.isScanQrCode
+			}),
+			// #ifndef MP-BAIDU
+			...mapGetters('mallConfig', {
+				getVideo: 'getVideo'
+			}),
+			// #endif
+		},
 
-    }
+	}
 </script>
 
 <style scoped lang="scss">
-    .app-goods-banner {
-        position: relative;
-        width: 750upx;
-		
-		
+	.app-goods-banner {
+		position: relative;
+		width: 750upx;
+
+
 		.swiper_zhishi {
 			display: flex;
 			align-items: center;
@@ -202,82 +192,88 @@
 			transform: translateX(-50%);
 			bottom: 39rpx;
 			overflow: hidden;
-		z-index: 100;
+			z-index: 100;
+
 			view {
 				width: 81rpx;
 				height: 4rpx;
 				background: #c8c8c8;
 			}
-		
+
 			.view_active {
 				background: #f4f4f4;
 			}
 		}
-    }
+	}
+
+	.cart {
+		position: fixed;
+		right: #{24rpx};
+		background: rgba(255, 255, 255, 0.5);
+		font-size: 0;
+		padding: #{20rpx};
+		border-radius: #{999rpx};
+		box-shadow: 0 #{1rpx} #{3rpx} rgba(0, 0, 0, 0.2);
+		z-index: 100;
+
+		image {
+			width: #{42rpx};
+			height: #{42rpx};
+		}
+	}
+
+	.bd-cart-0 {
+		top: #{250rpx};
+	}
+
+	.bd-cart-1 {
+		top: #{180rpx};
+	}
+
+	.share-commission {
+		height: #{80rpx};
+		padding-right: #{10rpx};
+		min-width: #{220rpx};
+		position: absolute;
+		right: 0;
+		bottom: #{80rpx};
+		border-top-left-radius: #{40rpx};
+		border-bottom-left-radius: #{40rpx};
+		background-color: rgba(0, 0, 0, 0.4);
+		z-index: 100;
 
-    .cart {
-        position: fixed;
-        right: #{24rpx};
-        background: rgba(255, 255, 255, 0.5);
-        font-size: 0;
-        padding: #{20rpx};
-        border-radius: #{999rpx};
-        box-shadow: 0 #{1rpx} #{3rpx} rgba(0, 0, 0, 0.2);
-        z-index: 100;
-        image {
-            width: #{42rpx};
-            height: #{42rpx};
-        }
-    }
-    .bd-cart-0 {
-        top: #{250rpx};
-    }
-    .bd-cart-1 {
-        top: #{180rpx};
-    }
-    .share-commission {
-        height: #{80rpx};
-        padding-right: #{10rpx};
-        min-width: #{220rpx};
-        position: absolute;
-        right: 0;
-        bottom: #{80rpx};
-        border-top-left-radius: #{40rpx};
-        border-bottom-left-radius: #{40rpx};
-        background-color: rgba(0, 0, 0, 0.4);
-        z-index: 100;
+		image {
+			width: #{44rpx};
+			height: #{44rpx};
+			margin-right: #{14rpx};
+			margin-left: #{20rpx};
+		}
 
-        image {
-            width: #{44rpx};
-            height: #{44rpx};
-            margin-right: #{14rpx};
-            margin-left: #{20rpx};
-        }
+		.text {
+			color: #ffffff;
+			font-size: $uni-font-size-weak-two;
+		}
+	}
 
-        .text {
-            color: #ffffff;
-            font-size: $uni-font-size-weak-two;
-        }
-    }
+	.swiper {
+		height: #{750rpx};
 
-    .swiper {
-        height: #{750rpx};
+		.swiper-img {
+			width: 100%;
+			height: #{750rpx};
+			background-size: cover;
+			background-repeat: no-repeat;
+			background-position: center;
+			position: relative;
+		}
+	}
 
-        .swiper-img {
-            width: 100%;
-            height: #{750rpx};
-            background-size: cover;
-            background-repeat: no-repeat;
-            background-position: center;
-            position: relative;
-        }
-    }
-    .video-play {
-        width: #{128upx};
-        height: #{128upx};
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-    }
-</style>
+	.video-play {
+		width: #{128upx};
+		height: #{128upx};
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+</style>

+ 1 - 1
src/pages/case/components/hxj-bd-info.vue

xqd
@@ -185,7 +185,7 @@ border-radius: 60rpx 0px 0px 0px;
 			color: #AE8445;
 			opacity: 0.6;
 			padding: 0 6rpx;
-			line-height: 30rpx;
+			line-height: 24rpx;
 			text-align: center;
 		}
 

+ 10 - 5
src/pages/case/components/scroll-list.vue

xqd xqd
@@ -2,7 +2,7 @@
 	<view>
 		<scroll-view class="scroll_list" :style="{'background': background}" scroll-x="true">
 			<view class="main-left" style="padding-left: 40rpx;">
-				<view v-for="(item,index) in list" :key="index" @click="goPage(item.link)">
+				<view v-for="(item,index) in list" :key="index" @click="goPage(item.link,item.open_type,index)">
 					<view class="box" :style="{'width':itemWidth,'height':itemHeight}">
 						<image class="image-bg" :src="item.image"></image>
 						<view class="text t-omit">{{item.title}}</view>
@@ -69,10 +69,15 @@
 			}
 		},
 		methods: {
-			goPage(link){
-				uni.navigateTo({
-					url:link
-				})
+			goPage(link,open_type="navigate",index){
+				if(open_type==="navigate"){
+					uni.navigateTo({
+						url:link
+					})
+				}else{
+					this.$emit("Pclick",index)
+				}
+				
 			}
 		}
 	}

+ 18 - 181
src/pages/case/projectInfo.vue

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -6,11 +6,11 @@
 				:hasHeight="false"></app-nav-bar>
 
 			<!--商品轮播图-->
-			<app-goods-banner :pic-list="compositionList.banner_imgs" :range-key="'banner_imgs'"
+			<app-goods-banner :pic-list="bannerList" :range-key="'banner_imgs'" :current="current"
 				:goods_id="compositionList.id" :isCart="false"></app-goods-banner>
 			<!-- 套装内商品 -->
 			<view style="background-color: #fff;">
-				<view class="link " style="margin-top: 20rpx;">
+				<view class="link " style="padding-top: 50rpx;">
 					<view class="title1 main-left cross-center">
 						套装内商品
 						<image class="coupon_1" src="https://t17.9026.com/web/statics/image/index/coupon_1.png" mode="">
@@ -18,7 +18,7 @@
 						<text class="coupon_sub">IN SET GOODS</text>
 					</view>
 				</view>
-				<hxj-scroll-list :itemWidth="'168rpx'" :itemHeight="'168rpx'" :list="list"></hxj-scroll-list>
+				<hxj-scroll-list :itemWidth="'168rpx'" :itemHeight="'168rpx'" :list="list" @Pclick="selectBanner"></hxj-scroll-list>
 				<hxj-bd-info :theme="getTheme" :name="compositionList.name"
 					:discount_amount="compositionList.discount_amount" :original-price="compositionList.actual_price"
 					:sales="Number(compositionList.sale_num)+Number(compositionList.virtual_sale_num)"
@@ -228,6 +228,7 @@
 			hxjScrollList,
 			hxjBdInfo
 		},
+		
 		data() {
 			return {
 				id: '', //套餐id
@@ -253,60 +254,20 @@
 				sendPath: '',
 				poster_config: this.$api.goods.poster,
 				poster_generate: this.$api.poster.goods_new,
-				// // 限时抢购
-				// flash_sale: null,
-				// checked: null,
-				// // 商品服务
-				// services: null,
-				// // 商品详情
-				// detail: null,
-				// // 商品ID
-				// goodsId: null,
-				// // 套餐组合
-				// composition: null,
-				// autoplay: true,
-				// full_reduce: null,
-				// goods_marketing_award: null,
-				// express: null,
-				// goods_marketing: null,
-				// exchangeStatus: null,
-				// exchange: null,
 
-				// price: null,
-				// level_show: null,
-				// sales: null,
-				// unit: null,
-				// is_sales: null,
-				// extra_quick_share: null,
-				// price_max: null,
-				// price_min: null,
-				// price_member_max: null,
-				// price_member_min: null,
-				// original_price: null,
-				// subtitle: null,
-				// is_negotiable: null,
-				// name: null,
-				// app_share_pic: null,
-				// app_share_title: null,
-				// goodsType: null,
-				// favorite: null,
 				goods_coupon_center: null,
-				// guarantee_title: null,
-				// guarantee_pic: null,
-				// param_content: null,
-				// param_name: null,
-				// attr_groups: null,
-				// goods_num: null,
-				// good_stock: null,
-				// min_number: null,
-				// limit_buy: null,
-				// disable: 'disable',
-				// sell_time: 0,
-				// template_message_list: [],
-				// is_finish_sell: false
+
 			};
 		},
 		computed: {
+			bannerList:function(){
+				let data=[]
+				for (let i = 0; i < this.compositionList.compositionGoods.length; i++) {
+					let item=this.compositionList.compositionGoods[i]
+					data.push({banner_imgs:item.goods.cover_pic})
+				}
+				return data
+			},
 			...mapState({
 				mall: state => state.mallConfig.mall,
 				gConfig: state => state.gConfig,
@@ -454,6 +415,9 @@
 		},
 		// #endif
 		methods: {
+			selectBanner(e){
+				this.current = e
+			},
 			receive() {
 				this.isCouponShow = true
 			},
@@ -502,14 +466,6 @@
 			}) {
 				this.checked = item;
 			},
-			change(e) {
-				if (e.detail.source === 'touch') {
-					this.current = e.detail.current;
-				}
-				if (e.detail.source === 'autoplay') {
-					this.current = e.detail.current;
-				}
-			},
 			quickShare(info) {
 				this.shareData = info;
 				//#ifdef H5
@@ -542,7 +498,8 @@
 								image,
 								link: `/pages/goods/goods?id=${id}`,
 								name,
-								goods_num
+								goods_num,
+								open_type:"click",
 							})
 						}
 					}
@@ -560,126 +517,6 @@
 						this.goods_coupon_center = res.data.list
 					}
 				})
-				// return new Promise((resolve, reject) => {
-				// 	this.$showLoading();
-				// 	this.$request({
-				// 			url: this.$api.goods.detail,
-				// 			data: {
-				// 				id: 18,
-				// 				plugin: options && options.exchange ? 'exchange' : 'mall'
-				// 			}
-				// 		})
-				// 		.then(response => {
-				// 			this.$hideLoading();
-				// 			if (response.code === 0) {
-				// 				let {
-				// 					services,
-				// 					detail,
-				// 					name,
-				// 					vip_card_appoint,
-				// 					plugin_extra,
-				// 					id,
-				// 					goods_activity,
-				// 					goods_marketing_award,
-				// 					goods_marketing,
-				// 					express,
-				// 					price,
-				// 					sales,
-				// 					level_show,
-				// 					is_sales,
-				// 					unit,
-				// 					extra_quick_share,
-				// 					price_max,
-				// 					price_min,
-				// 					price_member_max,
-				// 					price_member_min,
-				// 					original_price,
-				// 					subtitle,
-				// 					is_negotiable,
-				// 					app_share_title,
-				// 					app_share_pic,
-				// 					type,
-				// 					favorite,
-				// 					goods_coupon_center,
-				// 					guarantee_title,
-				// 					guarantee_pic,
-				// 					param_content,
-				// 					param_name,
-				// 					attr_groups,
-				// 					goods_num,
-				// 					good_stock,
-				// 					min_number,
-				// 					limit_buy,
-				// 					sell_time,
-				// 					template_message_list,
-				// 					is_finish_sell
-				// 				} = response.data.goods;
-				// 				this.app_share_pic = app_share_pic;
-				// 				this.app_share_title = app_share_title;
-				// 				this.goods = response.data.goods;
-				// 				this.services = services;
-				// 				this.detail = detail;
-				// 				this.goodsId = id;
-				// 				this.flash_sale = plugin_extra.flash_sale;
-				// 				this.composition = plugin_extra.composition;
-				// 				this.goods_marketing_award = goods_marketing_award;
-				// 				this.goods_marketing = goods_marketing;
-				// 				this.express = express;
-				// 				this.price = price;
-				// 				this.level_show = level_show;
-				// 				this.sales = sales;
-				// 				this.unit = unit;
-				// 				this.is_sales = is_sales;
-				// 				this.price_max = price_max;
-				// 				this.price_min = price_min;
-				// 				this.price_member_max = price_member_max;
-				// 				this.price_member_min = price_member_min;
-				// 				this.original_price = original_price;
-				// 				this.subtitle = subtitle;
-				// 				this.is_negotiable = is_negotiable;
-				// 				this.extra_quick_share = extra_quick_share;
-				// 				this.goodsType = type;
-				// 				this.favorite = favorite;
-				// 				this.goods_coupon_center = goods_coupon_center;
-				// 				this.guarantee_title = guarantee_title;
-				// 				this.param_content = param_content;
-				// 				this.guarantee_pic = guarantee_pic;
-				// 				this.attr_groups = attr_groups;
-				// 				this.param_name = param_name;
-				// 				this.goods_num = goods_num;
-				// 				this.good_stock = good_stock;
-				// 				this.min_number = min_number;
-				// 				this.limit_buy = limit_buy;
-				// 				this.sell_time = sell_time;
-				// 				this.template_message_list = template_message_list;
-				// 				this.is_finish_sell = is_finish_sell;
-				// 				if (goods_activity) {
-				// 					this.full_reduce = goods_activity.full_reduce;
-				// 				}
-				// 				if (vip_card_appoint.discount || vip_card_appoint.discount === '0.00') {
-				// 					this.is_vip = true;
-				// 					this.discount = vip_card_appoint.discount;
-				// 				}
-				// 				this.is_vip_card_user = vip_card_appoint.is_vip_card_user;
-				// 				this.loadRecommend();
-				// 				// #ifdef H5
-				// 				this.hShareAppMessage();
-				// 				// #endif
-				// 				resolve();
-				// 			} else {
-				// 				uni.showToast({
-				// 					title: response.msg,
-				// 					icon: 'none'
-				// 				});
-				// 				reject();
-				// 			}
-				// 		})
-				// 		.catch(() => {
-				// 			reject();
-				// 			this.$hideLoading();
-				// 		});
-				// });
-
 			},
 			onAttr(data) {
 				this.selectAttr = data;

+ 4 - 4
src/pages/goods/goods.vue

xqd xqd
@@ -95,13 +95,13 @@
 				</navigator>
             </view>
 			<view class="hxj-line"></view>			
-			<uTabsSwiper :list="[{tab:'商品评价'},{tab:'商品详情'}]" :current="tabsCurrent" name="tab" :activeColor="getTheme.color" :barHeight="0" :isScroll="false" @change="tabsChange" line></uTabsSwiper>
+			<uTabsSwiper :list="[{tab:'商品详情'},{tab:'商品评价'}]" :current="tabsCurrent" name="tab" :activeColor="getTheme.color" :barHeight="0" :isScroll="false" @change="tabsChange" line></uTabsSwiper>
 			<!-- 评价 -->
-			<view v-show="tabsCurrent===0">
+			<view v-show="tabsCurrent===1">
 				<bd-comments :goods-id="goodsId" ></bd-comments>
 			</view>
             <!--商品详情-->
-			<view v-show="tabsCurrent===1">
+			<view v-show="tabsCurrent===0">
 				<bd-detail :detail="detail" ></bd-detail>
 			</view>
             <!--相关推荐-->
@@ -269,7 +269,7 @@
         },
         data() {
             return {
-				tabsCurrent:1,
+				tabsCurrent:0,
                 showClose: false,
                 is_open: 0,
                 goods: null,

+ 1 - 1
src/pages/order-submit/app-submit-goods.vue

xqd
@@ -429,7 +429,7 @@
 			font-size: 20rpx;
 			font-weight: 500;
 			color: #F59922;
-			line-height: 20rpx;
+			line-height: 23rpx;
 			margin-right: 13rpx;
 			padding: 0 9rpx;
 		}

+ 5 - 33
src/pages/sale/news/news.vue

xqd xqd
@@ -2,10 +2,7 @@
 	<view class="page">
 		<view class="box" v-for="(item,index) in dataList" :key="index">
 			<view class="main-between cross-center header">
-				<!-- <view class="cross-center head t-omit" :class="{'border_bottom':true}">
-					<image src="https://t17.9026.com/web/statics/image/sale/1.png" mode=""></image>
-					周先生
-				</view> -->
+
 				<view class="cross-center head1">
 					<image src="https://t17.9026.com/web/statics/image/index/msg.png" mode=""></image>
 					客户楼盘绑定通知
@@ -16,40 +13,15 @@
 				</view>
 			</view>
 			<view class="center">
-				<!-- <view class="main-between cross-center">
-					<view class="title">整体评价</view>
-					<view class="isopen cross-center">
-						展开
-						<image src="https://t17.9026.com/web/statics/image/user-center/arrow-bottom.png" mode=""></image>
-					</view>
-				</view> -->
+
 				<view class="center-text">{{item.message}}</view>
-				<!-- 客户xxxx向您发起了楼盘xxxx的认证通知,请前往我的-我的客户查看并处理 -->
-				<!-- <view class="center-img">
-					<image v-for="(item, index) in 5" :key="index" src="https://t17.9026.com/web/statics/image/user-center/1.png" mode=""></image>
-				</view>
-				<view class="main-between goods">
-					<view class="main-left desc">
-						<image class="goods-img" src="https://t17.9026.com/web/statics/image/user-center/1.png" mode=""></image>
-						<view>
-							<view class="title">兴城人居ins居家占位套餐</view>
-							<view class="price">
-								<text class="company">¥</text>
-								2466.00
-							</view>
-						</view>
-					</view>
-					<view class="isopen cross-center">
-						收起
-						<image src="https://t17.9026.com/web/statics/image/user-center/arrow-top.png" mode=""></image>
-					</view>
-				</view> -->
+				
 			</view>
-			<view class="main-between footer cross-center border_top">
+			<!-- <view class="main-between footer cross-center border_top">
 				<view class="left">查看详情</view>
 				<image style="width: 12rpx;height: 22rpx;" src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png"
 					mode="" ></image>
-			</view>
+			</view> -->
 		</view>
 		<view class="no-more" v-if="noMore && dataList.length>0">没有更多了...</view>
 	</view>

+ 1 - 1
src/plugins/composition/components/app-bd-info/app-bd-info.vue

xqd
@@ -118,7 +118,7 @@
 			font-size: 20rpx;
 			font-weight: 500;
 			color: #F59922;
-			line-height: 20rpx;
+			line-height: 24rpx;
 			margin-right: 13rpx;
 			padding: 0 9rpx;
 		}

+ 4 - 3
src/plugins/mch/goods/goods.vue

xqd xqd
@@ -42,7 +42,8 @@
 					:min-number="goods.min_number"
                 ></bd-info>
             </view>
-            <template v-if="mch_store">
+			<!-- 关闭多商户 -->
+            <template v-if="mch_store && false">
                 <view class="shop-info dir-left-nowrap cross-center" :clas="mch_store.distance ? 'shop-info-2' : 'shop-info-1'">
                     <image @click="navShop" class="box-grow-0" :src="mch_store.store.cover_url"></image>
                     <view @click="navShop" class="dir-top-nowrap box-grow-1">
@@ -133,10 +134,10 @@
 					<app-sell-tip :time="goods.sell_time" @changeTime="changeTime"></app-sell-tip>
 				</view>
                 <view class="bd-bottom dir-left-nowrap" >
-                    <view class="bd-back dir-top-nowrap main-center cross-center box-grow-0" @click="navShop">
+                   <!-- <view class="bd-back dir-top-nowrap main-center cross-center box-grow-0" @click="navShop">
                         <image class="bd-icon" src="https://t17.9026.com/web/statics/image/mall/static/icon/icon-mch.png"></image>
                         <text>店铺</text>
-                    </view>
+                    </view> -->
                     <view class="bd-back dir-top-nowrap main-center cross-center box-grow-0" @click="back">
                         <image class="bd-icon" src="https://t17.9026.com/web/statics/image/mall/static/icon/index.png"></image>
                         <text>首页</text>