Forráskód Böngészése

套餐内领取优惠券,供应商商品详情,商品详情参数详情,销售端订单总额,我的消息,切换销售端闪烁优化

huangzhe 3 éve
szülő
commit
cf0ecbd257

+ 0 - 1
src/components/basic-component/app-close/app-close.vue

xqd
@@ -91,7 +91,6 @@
                 url: this.$api.index.status,
                 data: para
             }).then(response => {
-                console.log(para)
                 let mallStatus = response.data;
                 if(!this.isMall) {
                     response.data.shift();

+ 0 - 1
src/components/basic-component/app-layout/app-user-login/app-user-login.vue

xqd
@@ -204,7 +204,6 @@
                 // #endif
 				// #ifdef MP-WEIXIN
 				this.$user.getUserProfile(e).then(res => {
-					console.log(res)
 					this.getUserInfo(res);
 				}).catch(res => {
 					console.log(res)

+ 1 - 1
src/components/page-component/app-area-picker/app-area-picker.vue

xqd
@@ -109,7 +109,7 @@ export default {
 			immediate: true
 		},
 		place(newData,old){
-			console.log('地址变化',newData)
+			console.log('地址',newData)
 			this.$emit('place', newData);
 		}
 	},

+ 0 - 1
src/components/page-component/app-head-navigation/app-head-navigation.vue

xqd
@@ -45,7 +45,6 @@
 	    methods: {
             active(item) {
                 this.isSwitch = false;
-                console.log(item);
                 this.$emit('click', item);
             }
 	    },

+ 0 - 1
src/components/page-component/app-quick-navigation/app-quick-navigation.vue

xqd
@@ -226,7 +226,6 @@
                 }
                 // #ifdef H5
                 if (item.customize) {
-                    console.log(item)
                     if (item.customize.open_type === 'app') {
                         function changePx(num){
                             return uni.upx2px(num)+ 'px';

+ 1 - 1
src/components/page-component/goods/bd-coupon.vue

xqd
@@ -86,7 +86,7 @@
 											<view v-else>限品类</view>
 											<view class="t-omit t-small-color time-area hjx-tc-B19D60">{{item.begin_time.split(' ')[0]}} - {{item.end_time.split(' ')[0]}}</view>
 										</view>
-										<view class="item-right-btn cross-center" v-if="item.is_receive == `0`">
+										<view class="item-right-btn cross-center" >
 											<view class="btn" @click="receive(item.id, index)">{{item.is_receive == 0 ? '立即领取' : '已领取'}}</view>
 										</view>
 									</view>

+ 38 - 8
src/components/page-component/goods/bd-xbc.vue

xqd xqd xqd xqd
@@ -32,13 +32,26 @@
             </view>
             <image class="bd-icon" src="https://shop.9026.com/web/statics/image/mall/static/icon/arrow-right.png"></image>
         </view>
-        <view v-if="param_content.length > 0" class="dir-left-nowrap cross-center bd-server" @click.stop="open('param')">
-            <text class="box-grow-0 bd-name">参数</text>
-            <view class="box-grow-1 u-content u-line-1">
-                {{paramStr}}
-            </view>
-            <image class="bd-icon" src="https://shop.9026.com/web/statics/image/mall/static/icon/arrow-right.png"></image>
-        </view>
+        <template v-if="param_style===1">
+        	<view v-if="param_content.length > 0" class="dir-left-nowrap cross-center bd-server" @click.stop="open('param')">
+        	    <text class="box-grow-0 bd-name">参数</text>
+        	    <view class="box-grow-1 u-content u-line-1">
+        	        {{paramStr}}
+        	    </view>
+        	    <image class="bd-icon" src="https://shop.9026.com/web/statics/image/mall/static/icon/arrow-right.png"></image>
+        	</view>
+        </template>
+		<template  v-if="param_style===2">
+			<view v-if="param_content.length > 0" class="bd-server" >
+			    <view class="bd-name">参数</view>
+			   <view style="padding: 10rpx;">
+				   <view v-for="(con, index) of param_content" :key="index" class="main-between cross-center"> 
+					   <view class="p-label1">{{ con.key }}</view>
+					   <view class="p-value1">{{ con.value }}</view>
+				   </view>
+			   </view>
+			</view>
+		</template>
         <u-popup v-model="show" mode="bottom" border-radius="14" @close="show = false">
             <view class="model">
                 <view class="f-top dir-left-nowrap main-between cross-center">
@@ -70,7 +83,7 @@
                         </template>
                         <template v-else-if="isShow === 'param'">
                             <view v-for="(con, index) of param_content" :key="index" class="p-box dir-left-nowrap cross-center">
-                                <view class="p-label">{{ con.key }}</view>
+                                <view class="p-label t-omit">{{ con.key }}</view>
                                 <view class="p-value">{{ con.value }}</view>
                             </view>
                         </template>
@@ -99,6 +112,10 @@
                 }
             },
             param_name: String,
+			param_style: {
+				type:Number,
+				default:1
+			},
             type: String,
             goodsStock: Number,
             coAttr: {
@@ -347,4 +364,17 @@
         color: #353535;
         word-break: break-word;
     }
+	.p-label1 {
+		font-size: 24rpx;
+	    width: 150upx;
+	    min-width: 120upx;
+	    color: #999999;
+	    margin-right: calc(36upx);
+	    word-break: break-word;
+	}
+	.p-value1 {
+		font-size: 22rpx;
+	    color: #353535;
+	    word-break: break-word;
+	}
 </style>

+ 1 - 2
src/components/page-component/index/app-diy-list.vue

xqd xqd
@@ -89,7 +89,6 @@ export default {
           // 获取商品数组
         copyList() {
             let list = this.list && this.list.length > 0 ? this.list : this.temp.data.list;
-			console.log('商品列表',list)
             return list;
         },
     },
@@ -115,7 +114,7 @@ export default {
         }
     },
     created() {
-        // console.log(this.list)
+        
     },
     methods: {
         attrShow(e) {

+ 0 - 1
src/components/page-component/index/app-diy-page.vue

xqd
@@ -1134,7 +1134,6 @@ export default {
     },
     pageScroll() {
       let style = "";
-      console.log(uni.getSystemInfoSync(), this.scroll, this.hasTabs);
       let windowHeight = uni.getSystemInfoSync().windowHeight;
       let screenHeight = uni.getSystemInfoSync().screenHeight;
       // #ifdef MP-ALIPAY

+ 0 - 2
src/components/page-component/index/app-nav-bar.vue

xqd xqd
@@ -65,7 +65,6 @@ export default {
     },
     watch: {
         'leftIcon'(newValue, oldValue) {
-            console.log('lefticon 监听测试');
             this.doSomething();
         }
     },
@@ -263,7 +262,6 @@ export default {
                         height: uni.upx2px(height) + 'px',
                         width: uni.upx2px(width) + 'px',
                     };
-                    console.log(self.hw_style);
                 }
             })
         },

+ 1 - 0
src/pages/goods/goods.vue

xqd
@@ -58,6 +58,7 @@
                 :guarantee-pic="guarantee_pic"
                 :param_content="param_content"
                 :param_name="param_name"
+				:param_style="2"
                 :services="services"
                 :attr-groups="attr_groups"
                 :goods-stock="goods_num"

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

xqd
@@ -63,7 +63,7 @@
 										<text class="rmb">{{compositionItem.total_price.split('.')[0]}}</text>
 										<text class="decimal">.{{compositionItem.total_price.split('.')[1]}}</text>
 									</text>
-									<text class="price-line"><text>¥</text>{{compositionItem.original_price}}</text>
+									<text class="price-line"><text>¥</text>{{compositionItem.original_price.toFixed(2)}}</text>
 								</view>
 								<view class="main-between">
 									<view class="main-left">

+ 4 - 4
src/pages/sale/components/app-my-income.vue

xqd
@@ -1,18 +1,18 @@
 <template>
 	<view class="main-between income" style="margin-top: 29rpx;">
 		<view class="item" @click="goPage('/pages/sale/mySaleOrder')">
-			<view class="title">订单总额()</view>
+			<view class="title">订单总额()</view>
 			<view class="main-between cross-center">
-				<view class="num">{{(userInfo.salesperson_info.order_total_amount/10000).toFixed(4)}}</view>
+				<view class="num">{{(userInfo.salesperson_info.order_total_amount).toFixed(2)}}</view>
 				<image style="width: 12rpx;height: 21rpx;" src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png"
 					mode=""></image>
 			</view>
 		</view>
 		<view class="line"></view>
 		<view class="item" @click="$jump({'open_type':'navigate','url':'/pages/sale/myCommission'})">
-			<view class="title">我的提成()</view>
+			<view class="title">我的提成()</view>
 			<view class="main-between cross-center">
-				<view class="num">{{(userInfo.salesperson_info.order_total_commission/10000).toFixed(4)}}</view>
+				<view class="num">{{(userInfo.salesperson_info.order_total_commission).toFixed(2)}}</view>
 				<image style="width: 12rpx;height: 21rpx;" src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png"
 					mode=""></image>
 			</view>

+ 1 - 4
src/pages/sale/cusmter/addCustomer.vue

xqd xqd xqd
@@ -137,7 +137,7 @@
 			// wx.enableAlertBeforeUnload({
 			// 	message:'还未保存',
 			// 	success:()=>{
-			// 		console.log('qqqqqqqqqqqqqq')
+			// 		console.log('')
 			// 	}
 			// })
 		},
@@ -167,7 +167,6 @@
 				}
 			},
 			areaEvent(data,index=this.formIndex) {
-				console.log('data',data)
 				if (data) {
 					this.form.estates[index].regionId.province_id = data.province.id;
 					this.form.estates[index].regionId.city_id = data.city.id;
@@ -191,8 +190,6 @@
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
 					sourceType: ['album', 'camera'], //从相册选择
 					success: (res) => {
-						console.log(res);
-						console.log(JSON.stringify(res.tempFilePaths));
 						uploadFile({
 							url: this.$api.upload.file,
 							filePath: res.tempFilePaths[0],

+ 7 - 7
src/pages/sale/mySaleOrder.vue

xqd xqd xqd
@@ -54,13 +54,13 @@
 						客户楼盘绑定通知
 					</view> -->
 					<view class="main-between cross-center">
-						<view class="date">{{item.status_text}}</view>
+						<view class="order_status">{{item.status_text}}</view>
 						<!-- <image class="del" src="https://t17.9026.com/web/statics/image/user-center/del.png" mode="">
 						</image> -->
 					</view>
 				</view>
 				<view class="center">
-					<view class="main-between goods" v-for="(goods,index1) in item.detail" :key="index1" @click="$jump({open_type:'navigate',url:'/pages/goods/goods?id='+goods.id})">
+					<view class="main-between goods" v-for="(goods,index1) in item.detail" :key="index1" @click="$jump({open_type:'navigate',url:'/pages/goods/goods?id='+goods.goods_id})">
 						<view class="main-left desc">
 							<image class="goods-img" :src="goods.goods_info.pic_url"
 								mode=""></image>
@@ -442,11 +442,11 @@ font-size: 24rpx;
 				color: #222222;
 			}
 
-			.date {
+			.order_status {
+				text-align: right;
 				font-size: 22rpx;
 				font-weight: 500;
 				color: #222222;
-				margin-right: 30rpx;
 			}
 
 			.del {
@@ -501,14 +501,14 @@ font-size: 24rpx;
 
 				.desc {
 					width: 100%;
-					height: 141rpx;
+					height: 156rpx;
 					// background: #F8F8F8;
 					border-radius: 6rpx;
 					padding: 18rpx 0 18rpx 0;
 
 					.goods-img {
-						width: 147rpx;
-						height: 110rpx;
+						width: 120rpx;
+						height: 120rpx;
 						border-radius: 8rpx;
 						margin-right: 21rpx;
 					}

+ 69 - 45
src/pages/sale/news/news.vue

xqd xqd xqd xqd xqd
@@ -4,7 +4,10 @@
 			<view class="main-between cross-center header">
 
 				<view class="cross-center head1">
-					<image src="https://t17.9026.com/web/statics/image/index/msg.png" mode=""></image>
+					<view class="headimg">
+						<image src="https://t17.9026.com/web/statics/image/index/msg.png" mode=""></image>
+						<view class="isread" v-if="item.is_read!=1"></view>
+					</view>
 					客户楼盘绑定通知
 				</view>
 				<view class="main-between cross-center" @click="del_msg(item.id,index)">
@@ -15,7 +18,7 @@
 			<view class="center">
 
 				<view class="center-text">{{item.message}}</view>
-				
+
 			</view>
 			<!-- <view class="main-between footer cross-center border_top">
 				<view class="left">查看详情</view>
@@ -31,65 +34,65 @@
 	export default {
 		data() {
 			return {
-				page:1,
-				dataList:[],
-				noMore:false
+				page: 1,
+				dataList: [],
+				noMore: false
 			};
 		},
 		onLoad() {
 			this.getMessageList()
 		},
 		onReachBottom() {
-			if(!this.noMore){
+			if (!this.noMore) {
 				this.page++
 				this.getMessageList()
 			}
 		},
-		methods:{
-			getMessageList(){
+		methods: {
+			getMessageList() {
 				this.$request({
-					url:this.$api.sale.message_list,
-					data:{
-						page:this.page
+					url: this.$api.sale.message_list,
+					data: {
+						page: this.page
 					},
-					method:'post'
-				}).then(res=>{
-					if(res.code===0){
-						if(this.page===1){
-							this.dataList=res.data.list
-						}else{
-							this.dataList=this.dataList(res.data.list)
+					method: 'post'
+				}).then(res => {
+					if (res.code === 0) {
+						if (this.page === 1) {
+							this.dataList = res.data.list
+						} else {
+							this.dataList = this.dataList(res.data.list)
 						}
-						if(res.data.list.length<20){
-							this.noMore=true
+						if (res.data.list.length < 20) {
+							this.noMore = true
 						}
 					}
-					
+
 				})
 			},
-			del_msg(id,index){
+			del_msg(id, index) {
 				uni.showModal({
-				    title: '提示',
-				    content: '确定删除该条消息吗',
-				    success:(qq)=> {
-				        if (qq.confirm) {
-				            this.$request({
-				            	url:this.$api.sale.message_delete,
-				            	data:{
-				            		message_id:id
-				            	},
-				            	method:'post'
-				            }).then(res=>{
-				            	if(res.code===0){
-									this.dataList.splice(index,1)
+					title: '提示',
+					content: '确定删除该条消息吗',
+					success: (qq) => {
+						if (qq.confirm) {
+							this.$request({
+								url: this.$api.sale.message_delete,
+								data: {
+									message_id: id
+								},
+				 			method: 'post'
+							}).then(res => {
+								if (res.code === 0) {
+									this.dataList.splice(index, 1)
 								}
-				            })
-				        } else if (qq.cancel) {
-				            console.log('用户点击取消');
-				        }
-				    }
+							})
+						} else if (qq.cancel) {
+							console.log('用户点击取消');
+						}
+					}
 				});
-				
+
 			}
 		}
 	};
@@ -126,7 +129,8 @@
 				background: #f6f6f6;
 				border-radius: 24rpx;
 				padding: 0 17rpx;
-overflow: hidden;
+				overflow: hidden;
+
 				image {
 					width: 32rpx;
 					height: 32rpx;
@@ -142,14 +146,34 @@ overflow: hidden;
 			.head1 {
 				max-width: 500rpx;
 				height: 48rpx;
-overflow: hidden;
-				image {
+				overflow: hidden;
+
+				.headimg {
 					width: 45rpx;
 					height: 45rpx;
+					position: relative;
 					margin-right: 14rpx;
-					border-radius: 50%;
+
+					image {
+						width: 45rpx;
+						height: 45rpx;
+
+						border-radius: 50%;
+					}
+
+					.isread {
+						position: absolute;
+						top: 0;
+						right: 0;
+						width: 16rpx;
+						height: 16rpx;
+						background: #FB122B;
+						border: 2rpx solid #FFFFFF;
+						border-radius: 50%;
+					}
 				}
 
+
 				font-size: 30rpx;
 				font-weight: bold;
 				color: #222222;

+ 27 - 3
src/pages/sale/sale-user-center.vue

xqd xqd xqd xqd xqd
@@ -24,7 +24,11 @@
 							<view class="box-grow-1 main-between" style="max-width: 100%">
 								<view class="name">{{item.name}}</view>
 								<view class="num" v-if="item.num">
-									{{item.num===1?Number(userInfo.salesperson_info.already_verify_num) + Number(userInfo.salesperson_info.not_verify_num):userInfo.salesperson_info.estate_num}}
+									{{item.num===1?Number(userInfo.salesperson_info.already_verify_num) + Number(userInfo.salesperson_info.not_verify_num):''}}
+									{{item.num===2?userInfo.salesperson_info.estate_num:''}}
+								</view>
+								<view class="dto" v-if="item.dto">
+									<view class="red" v-if="userInfo.salesperson_info.unread_message_num!='0'"></view>
 								</view>
 							</view>
 							<view class="box-grow-0">
@@ -41,7 +45,11 @@
 						<view class="box-grow-1 main-between" style="max-width: 100%">
 							<view class="name">{{item.name}}</view>
 							<view class="num" v-if="item.num">
-								{{item.num===1?Number(userInfo.salesperson_info.already_verify_num) + Number(userInfo.salesperson_info.not_verify_num):userInfo.salesperson_info.estate_num}}
+								{{item.num===1?Number(userInfo.salesperson_info.already_verify_num) + Number(userInfo.salesperson_info.not_verify_num):''}}
+								{{item.num===2?userInfo.salesperson_info.estate_num:''}}
+							</view>
+							<view class="dto" v-if="item.dto">
+								<view class="red"></view>
 							</view>
 						</view>
 						<view class="box-grow-0">
@@ -67,7 +75,11 @@
 								<view class="box-grow-1" style="max-width: 100%">
 									<view class="name">{{item.name}}</view>
 									<view class="num" v-if="item.num">
-										{{item.num===1?Number(userInfo.salesperson_info.already_verify_num) + Number(userInfo.salesperson_info.not_verify_num):userInfo.salesperson_info.estate_num}}
+										{{item.num===1?Number(userInfo.salesperson_info.already_verify_num) + Number(userInfo.salesperson_info.not_verify_num):''}}
+										{{item.num===2?userInfo.salesperson_info.estate_num:''}}
+									</view>
+									<view class="dto" v-if="item.dto">
+										<view class="red"></view>
 									</view>
 								</view>
 								<view class="box-grow-0" v-if="userCenter.menu_style=='1'">
@@ -160,6 +172,7 @@
 						link_url: "/pages/sale/news/news",
 						name: "我的消息",
 						open_type: "navigate",
+						dto:1
 					},
 					{
 						icon_url: "https://t17.9026.com/web/statics/image/index/kf.png",
@@ -478,6 +491,17 @@
 					color: #999999;
 					margin-right: 32rpx;
 				}
+				.dto{
+					margin-right: 33rpx;
+					.red{
+						margin-top: 10rpx;
+						width: 16rpx;
+						height: 16rpx;
+						background: #FB122B;
+						border: 2rpx solid #FFFFFF;
+						border-radius: 50%;
+					}
+				}
 			}
 		}
 

+ 1 - 1
src/pages/user-center/user-center.vue

xqd xqd
@@ -7,6 +7,7 @@
             :top-style="4"
             :member-pic-url="userCenter.member_pic_url"
             :is_icon_super_vip="is_icon_super_vip"
+			:isRealname="userInfo.estate?true:false"
             user-name-color="#262626"
         ></app-user-center-top>
 
@@ -159,7 +160,6 @@
 						val.splice(1, 0, {icon_url:'',name:'我的优惠券'})
 						val.splice(2,1)
 						return val;
-						console.log(val)
 					}else{
 						return state.userCenter.data.foot_bar
 					}

+ 0 - 1
src/plugins/clerk/detail/detail.vue

xqd
@@ -231,7 +231,6 @@
         },
         methods: {
             showForm(e) {
-                console.log(e)
                 this.haveForm = e && e.length ? true : false
             },
             toClerk(id) {

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

xqd
@@ -11,7 +11,7 @@
 							<text class="rmb">{{total}}</text>
 							<text class="decimal">.00</text>
 						</text>
-						<text class="price-line"><text>¥</text>{{info.min_composition_price}}</text>
+						<text class="price-line"><text v-if="info.min_composition_price">¥</text>{{info.min_composition_price}}</text>
 					</view>
 					<view class="main-between">
 						<view class="main-left">

+ 12 - 10
src/plugins/composition/components/app-list/app-list.vue

xqd xqd xqd xqd
@@ -2,11 +2,9 @@
     <view>
         <view class="app-list" :style="{'margin-top': `${top}rpx`}">
             <view class="app-item" v-for="(item,index) in list" :key="item.id">
-                
                 <view class="item-goods main-between" v-for="(goods,index1) in item.host_list" :key="goods.id">
-                   
                     <view class="main-left">
-						<image @click="toDetail(goods.goods_id)" class="goods-img" :src="goods.cover_pic"></image>
+						<image @click="toDetail(goods.goods_id,goods.mch_id)" class="goods-img" :src="goods.cover_pic"></image>
 						<view v-if="goods.stock == 0 || item.stock == 0" class="out-dialog">
 						    <image :src="appSetting.is_use_stock == '1' ? appImg.plugins_out : appSetting.sell_out_pic"></image>
 						</view>
@@ -31,7 +29,7 @@
                 </view>                    
                 <view class="item-goods main-between" v-for="(goods,idx) in item.goods_list" :key="goods.id">
 					<view class="main-left">
-                    <image @click="toDetail(goods.goods_id)" class="goods-img" :src="goods.cover_pic"></image>
+                    <image @click="toDetail(goods.goods_id,goods.mch_id)" class="goods-img" :src="goods.cover_pic"></image>
                     <view v-if="goods.stock == 0 || item.stock == 0" class="out-dialog">
                         <image :src="appSetting.is_use_stock == '1' ? appImg.plugins_out : appSetting.sell_out_pic"></image>
                     </view>
@@ -163,12 +161,17 @@
             // 规格选择
             check({item}) {
                 this.checked = item;
-				console.log(this.checked)
             },
-            toDetail(id) {
-                uni.navigateTo({
-                    url: '/pages/goods/goods?id=' + id
-                });
+            toDetail(id,mch_id) {
+				if(mch_id){//供应商商品详情
+					uni.navigateTo({
+					    url: `/plugins/mch/goods/goods?id=${id}&mch_id=${mch_id}`
+					});
+				}else{
+					uni.navigateTo({
+					    url: '/pages/goods/goods?id=' + id
+					});
+				}
             },
             buyClick() {
                 let that = this;
@@ -232,7 +235,6 @@
                 that.checked = null;
             },
             chooseAttr(goods,index, type) {
-                console.log(goods)
                 this.goods = goods;
                 this.index = index;
                 this.attrShow = Math.random();

+ 0 - 2
src/plugins/composition/detail/detail.vue

xqd
@@ -238,8 +238,6 @@
 									list[0].goods_list.push(list[0].composition_list[j].goods_list[y])
 								}
 							}
-							console.log('this.list',this.list)
-							console.log('list',list)
 							let jump_url = `/pages/order-submit/order-submit?mch_list=${JSON.stringify(list)}`;
 							jump_url +=
 								`&preview_url=${encodeURIComponent(this.$api.composition.order_preview)}&submit_url=${encodeURIComponent(this.$api.composition.order_submit)}&plugin=composition`;

+ 23 - 6
src/plugins/mch/goods/goods.vue

xqd xqd xqd xqd xqd xqd xqd
@@ -1,7 +1,7 @@
 <template>
     <app-layout>
         <view v-if="!goods" class="u-goods-detail"></view>
-        <template v-if="goods">
+        <view v-if="goods" style="background: #fff;">
 			<app-nav-bar  :fixed="true" :background-color="''" :xStyle="1" :hasMallSetting="2"
 				:hasHeight="false"></app-nav-bar>
             <!--商品轮播图-->
@@ -101,8 +101,18 @@
                 :shipping="goods.goods_marketing.shipping"
                 :pickup="goods.goods_marketing.pickup"
             ></bd-kb>
-            <bd-comments :goods-id="goods.id"></bd-comments>
-            <bd-detail :detail="goods.detail"></bd-detail>
+			<view class="hxj-line"></view>
+			<uTabsSwiper :list="[{tab:'商品详情'},{tab:'商品评价'}]" :current="tabsCurrent" name="tab" :activeColor="getTheme.color" :barHeight="0" :isScroll="false" @change="tabsChange" line></uTabsSwiper>
+			<!-- 评价 -->
+			<view v-show="tabsCurrent===1">
+				<bd-comments :goods-id="goods.id" ></bd-comments>
+			</view>
+			<!--商品详情-->
+			<view v-show="tabsCurrent===0">
+				<bd-detail :detail="goods.detail" ></bd-detail>
+			</view>
+            <!-- <bd-comments :goods-id="goods.id"></bd-comments>
+            <bd-detail :detail="goods.detail"></bd-detail> -->
             <!--相关推荐-->
             <view class="recommend">
                 <view class="recommend-title dir-left-nowrap main-center">
@@ -113,7 +123,7 @@
                         <view class="border"></view>
                     </view>
                 </view>
-                <view class="recommend-list">
+                <view class="recommend-list" style="padding: 0 24rpx;">
                     <u-ordinary-list :is-under-line-price="isListUnderlinePrice == 1 ? true : false" :isShowAttr="true" :list="recommend_list" :theme="getTheme" :list-style="2"></u-ordinary-list>
                 </view>
             </view>
@@ -176,7 +186,7 @@
                 @check="onAttr"
             >
             </u-attr>
-        </template>
+        </view>
         <app-close v-if="showClose" :mch_id="mch_id" :modal="false" @update="getMall"></app-close>
     </app-layout>
 </template>
@@ -198,6 +208,8 @@
 	import goodsMixin from '@/core/goods-mixin.js';
 
 import appNavBar from '@/components/page-component/index/app-nav-bar.vue';
+
+import uTabsSwiper from '@/components/basic-component/u-tabs-swiper/u-tabs-swiper.vue';
     export default {
         name: "goods",
 		mixins: [goodsMixin],
@@ -215,10 +227,12 @@ import appNavBar from '@/components/page-component/index/app-nav-bar.vue';
             appClose,
 			appSellTip,
 			
-			appNavBar
+			appNavBar,
+			uTabsSwiper
         },
         data() {
             return {
+				tabsCurrent:0,
                 showClose: false,
                 is_open: 0,
                 goods: null,
@@ -505,6 +519,9 @@ import appNavBar from '@/components/page-component/index/app-nav-bar.vue';
 					this.clickAttr();
 				}
 			},
+			tabsChange(e){
+				this.tabsCurrent=e
+			},
         },
     }
 </script>

+ 0 - 1
src/store/modules/userCenter.js

xqd
@@ -26,7 +26,6 @@ const actions = {
         Vue.prototype.$request({
             url: Vue.prototype.$api.user.config,
         }).then(res => {
-			console.log(res,'请求数据查看')
             let { data, code } = res;
             if (code === 0) {
                 let config = data.config;