反馈修改-0718

commons/style.css

@@ -230,24 +230,6 @@ page {background-color: #eaeaea;}
 	z-index: 99;
 	overflow-x: auto;
 }
-.news-nav-bg::-webkit-scrollbar{
-	width: 0;
-	height: 0;
-	opacity: 0;
-}
-.news-nav-bg .pull-nav-btns{
-	justify-content: start !important;
-}
-.news-nav-bg .pull-nav-btns .btn{
-	width: 180rpx !important;
-	margin: 0 20rpx !important;
-}
-.news-nav-bg .pull-nav-btns .btn:first-child{
-	margin-left: 0 !important;
-}
-.news-nav-bg .pull-nav-btns .btn:last-child{
-	margin-right: 0 !important;
-}
 .news-list-bg{
 	padding: 10rpx 30rpx;
 }

components/nav-tab/nav-tab.vue

@@ -1,13 +1,15 @@
 <template>
-	<view class="pull-nav-btns" :class="type=='radio'?'search-btns':''" :style="{width:newWidth}">
+	<scroll-view scroll-x="true" :scroll-left="tabsScrollLeft" @scroll="scroll">
-		<view @tap="chooseEv(index,item.id)" :class="currentIndex==index?'radio-btn active':'radio-btn'" v-for="(item,index) in list" v-if="type=='radio'">
+		<view class="pull-nav-btns" :class="type=='radio'?'search-btns':''" :style="{width:newWidth}" id="tab_list">
+			<view @tap="chooseEv(index,item.id)" id="tab_item" :class="currentIndex==index?'radio-btn active':'radio-btn'" v-for="(item,index) in list" v-if="type=='radio'">
 				<view class="radio"></view>
 				<text>{{item.name}}</text>
 			</view>
-		<view @tap="chooseEv(index,item.id)" :class="currentIndex==index?'btn active':'btn'" v-for="(item,index) in list" v-if="type=='list' && index<=maxNum">{{item.name}}</view>
+			<view @tap="chooseEv(index,item.id)" id="tab_item" :style="{width:'220rpx',margin:'0 25rpx'}" :class="currentIndex==index?'btn active':'btn'" v-for="(item,index) in list" v-if="type=='list' && index<=maxNum && maxNum<=3">{{item.name}}</view>
+			<view @tap="chooseEv(index,item.id)" id="tab_item" :style="{width:'170rpx',margin:'0 20rpx'}" :class="currentIndex==index?'btn active':'btn'" v-for="(item,index) in list" v-if="type=='list' && index<=maxNum && maxNum>3">{{item.name}}</view>
 		</view>
+	</scroll-view>
 </template>
-
 <script>
 	export default {
 		name:'nav-tab',
@@ -29,14 +31,23 @@
 			newWidth:{
 				type:String,
 				default:''
-			}
+			},
 		},
 		data(){
 			return {
 				currentIndex:0, //当前位置
-				left:'',
+				scrollLeft:0,
-				scrollLeft:'0px',
+				tabsScrollLeft:0,
-				width:uni.getSystemInfoSync().windowWidth,
+				styleData:{}, //样式控制
+			}
+		},
+		watch: {
+			list() {
+				this.setTabList()
+			},
+			value() {
+				this.currentIndex = this.value
+				this.setTabList()
 			}
 		},
 		methods:{
@@ -45,8 +56,36 @@
 				if(this.currentIndex !== index){
 					this.currentIndex = index;
 					// 抛出事件
-					this.$emit('chooseEv',index,id)
+					this.$emit('chooseEv',index,id);
+					this.setTabList();
 				}
+			},
+			setTabList() {
+				this.$nextTick(() => {
+					if (this.list.length > 0) {
+						this.setLeft()
+					}
+				})
+			},
+			setLeft() {
+				let lineLeft = 0;
+				this.getElementData('#tab_list', (data) => {
+					let list = data[0];
+					this.getElementData(`#tab_item`, (res) => {
+						let el = res[this.currentIndex]
+						lineLeft = el.width / 2 + (-list.left) + el.left - list.width / 2 - this.scrollLeft
+						this.tabsScrollLeft = this.scrollLeft + lineLeft
+					})
+				})
+			},
+			getElementData(el, callback) {
+				uni.createSelectorQuery().in(this).selectAll(el).boundingClientRect().exec((data) => {
+					callback(data[0]);
+				});
+			},
+			//滚动
+			scroll(e) {
+				this.scrollLeft = e.detail.scrollLeft;
 			}
 		}
 	}
@@ -62,9 +101,7 @@
 	}
 	
 	.pull-nav-btns .btn {
-		width: 220rpx;
 		height: 66rpx;
-		margin: 0 25rpx;
 		border-radius: 10rpx;
 		line-height: 66rpx;
 		text-align: center;
@@ -73,11 +110,11 @@
 	}
 	
 	.pull-nav-btns .btn:first-child{
-		margin-left: 0;
+		margin-left: 0 !important;
 	}
 	
 	.pull-nav-btns .btn:last-child{
-		margin-right: 0;
+		margin-right: 0 !important;
 	}
 	
 	.pull-nav-btns .btn.active {

components/shopping-carts/cart-slide.vue

@@ -94,6 +94,7 @@
 				size:10,
 				total:0,
 				vipPrice:false,// 是否显示会员价
+				
 			};
 		},
 		mounted() {
@@ -231,11 +232,13 @@
 					})
 					uni.setStorageSync('buyList',buyList);
 					uni.navigateTo({
-						url:'/pagesA/cart/settlement'
+						url:'/pagesA/cart/prepare'
 					})
 				}
 			},
 			
+			
+			
 			// 数量加减事件
 			addCutEv(index,num) {
 				if(this.listData[index].slide_x==0){

pages.json

@@ -81,6 +81,13 @@
 						"enablePullDownRefresh": false
 					}
 				},
+				{ //订单准备
+				    "path" : "cart/prepare",
+				    "style" : {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
 				{ //订单提交
 				    "path" : "cart/settlement",
 				    "style" : {

pages/tabbar/news/news.vue

@@ -2,7 +2,7 @@
 	<view class="pad-b150">
 		<status-nav :ifReturn="false" navBarTitle="资讯" :marginBottom="0"></status-nav>
 		<view class="nav-list-bg news-nav-bg" :style="{top:newTop+'px'}">
-			<nav-tab :list="navTabList" :maxNum="5" @chooseEv="chooseEv" :newWidth="newWidth"></nav-tab>
+			<nav-tab :list="navTabList" :maxNum="5" @chooseEv="chooseEv" :newWidth="tabWidth"></nav-tab>
 		</view>
 		<view class="news-list-bg" v-if="isLoading">
 			<pull-list :list="articleList" :collection="0"  @toDetail="toArticleDetail"></pull-list>
@@ -19,6 +19,7 @@
 <script>
 	import statusNav from '@/components/status-navs/status-nav';
 	import navTab from '@/components/nav-tab/nav-tab.vue';
+	import swiperTab from '@/components/swiper-tab/swiper-tab.vue'
 	import pullList from '@/components/pull-list/pull-list.vue';
 	import enterCart from '@/components/enter-cart/enter-cart.vue';
 	// 底部组件
@@ -29,6 +30,7 @@
 		components:{
 			statusNav,
 			navTab,
+			swiperTab,
 			pullList,
 			enterCart,
 			footTab,
@@ -47,7 +49,7 @@
 				totalAll:-1,//总数
 				cacheBusinessId:-1, //商户id
 				isLoading:false,
-				newWidth:'',
+				tabWidth:'',
 			}
 		},
 		computed:{
@@ -104,12 +106,13 @@
 						res.data.forEach(item=>{
 							let obj = {
 								id:item.id,
-								name:item.title
+								title:item.title,
+								name:item.title,
 							}
 							newArr.push(obj)
 						})
 						this.navTabList = newArr;
-						this.newWidth = this.navTabList.length*220-20+'rpx';
+						this.tabWidth = this.navTabList.length*210-50+'rpx';
 						this.articleNavId = this.navTabList[0].id;
 						// 获取文章列表
 						this.getArticleList();

pagesA/cart/prepare.vue

@@ -0,0 +1,194 @@
+<template>
+	<view class="pad-b150">
+		<status-nav :ifReturn="true" navBarTitle="购物车" :marginBottom="0"></status-nav>
+		<view class="cart-content">
+			<view class="slide-list">
+				<view class="slide-item" v-for="(item, index) in listData" :key="index">
+					<view class="slide-item-li" @click="clickItemMethod(item)">
+						<view class="shop-img">
+							<image :src="item.image" mode="widthFix"></image>
+						</view>
+						<view class="shop-txt">
+							<view class="shop-txt-top">
+								<view class="title clips2">{{item.title}}</view>
+								<view class="specs clips2">规格：{{item.customTitle==''?item.skuName:item.customTitle}}</view>
+							</view>
+							<view class="shop-txt-bottom">
+								<!-- 商品价格 -->
+								<view class="price">￥{{business_code!==''?item.price:item.original_price}}</view>
+								<!-- 商品数量 -->
+								<view class="num"><text>x{{item.num}}</text></view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 全选 -->
+			<view class="change-all">
+				<view class="all-price">
+					<view class="price">合计：<span>￥{{original_total}}</span></view>
+					<view class="btn" :style="{background: '#0073bc'}" @tap="submitEv">提交订单</view>
+				</view> 
+			</view> 
+		</view>
+	</view>
+</template>
+
+<script>
+	// 底部组件
+	import statusNav from '@/components/status-navs/status-nav.vue';
+	import cartSlide from '@/components/shopping-carts/cart-slide';
+	export default {
+		components:{
+			statusNav,
+			cartSlide
+		},
+		data() {
+			return { 
+				listData:[],
+				business_code:uni.getStorageSync('business_code'),
+				original_total:'',
+			}
+		},
+		onReachBottom() {
+		},
+		onShow() {
+			this.getListData();
+		},
+		methods: {
+			getListData(){
+				this.$requst.post('/api/order/prepare-info',{sku_list:uni.getStorageSync('buyList')}).then(res=>{
+					if(res.code==0) {
+						this.original_total = res.data.original_total;
+						console.log(res.data,22222)
+						console.log(this.original_total,11111)
+						let newArr = []
+						res.data.list.forEach(item=>{
+							let obj = {
+								id: item.id,
+								num:item.num,
+								coding:item.coding,
+								price:item.price,
+								original_price: item.original_price,
+								image: item.spu_cover,
+								skuName: item.sku_name,
+								title: item.goods_name,
+								customTitle: item.custom_title,
+							}
+							newArr.push(obj);
+						})
+						this.listData = newArr;
+					}
+				})
+			},
+			submitEv(){
+				uni.navigateTo({
+					url:'/pagesA/cart/settlement'
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.slide-list{
+		margin-top: 20rpx;
+	}
+	.slide-item{
+		margin-top: 30rpx;
+	}
+	.slide-list .slide-item:first-child{
+		margin-top: 0;
+	}
+	.slide-item-li{
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		background-color: #FFFFFF;
+	}
+	.slide-item-li .shop-img{
+		width: 230rpx;
+		height: 150rpx;
+		border-radius: 10rpx;
+		margin: 0 24rpx 0 6rpx;
+		overflow: hidden;
+	}
+	.slide-item-li .shop-img image{
+		width: 230rpx;
+		min-height: 150rpx;
+	}
+	.slide-item-li .shop-txt{
+		width: calc(100% - 260rpx);
+	}
+	.shop-txt-top{
+		min-height: 100rpx;
+	}
+	.shop-txt-top .title{
+		font-size: 30rpx;
+		line-height: 1.5;
+		color: #000000;
+		font-weight: bold;
+	}
+	.shop-txt-top .specs{
+		font-size: 24rpx;
+		line-height: 1.5;
+		color: #8c8c9b;
+		margin: 3rpx;
+	}
+	.shop-txt-bottom{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 100%;
+		height: 50rpx;
+	}
+	.shop-txt-bottom .price{
+		font-size: 30rpx;
+		line-height: 1.5;
+		color: #f81c1c;
+	}
+	.shop-txt-bottom .num{
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		width: 170rpx;
+		font-size: 24rpx;
+	}
+	.shop-txt-bottom .num>text{
+		font-size: 24rpx;
+		line-height: 1.5;
+		color: #666666;
+	}
+	.change-all{
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 100vw;
+		height: 130rpx;
+		padding: 0 30rpx;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		background-color: #FFFFFF;
+	}
+	.all-price{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 100%;
+	}
+	.all-price .price{
+		font-size: 24rpx;
+		margin-right: 25rpx;
+		color: #000000;
+	}
+	.all-price .btn{
+		line-height: 84rpx;
+		padding: 0 30rpx;
+		border-radius: 10rpx;
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
+</style>

pagesA/order/detail.vue

@@ -163,7 +163,7 @@
 				})
 				uni.setStorageSync('buyList',buyList);
 				uni.navigateTo({
-					url:'/pagesA/cart/settlement'
+					url:'/pagesA/cart/prepare'
 				})
 			},
 			//去商品详情页

pagesA/order/order.vue

@@ -211,7 +211,7 @@
 				})
 				uni.setStorageSync('buyList',buyList);
 				uni.navigateTo({
-					url:'/pagesA/cart/settlement'
+					url:'/pagesA/cart/prepare'
 				})
 			}
 		}

pagesA/shop/detail.vue

@@ -15,7 +15,7 @@
 					<view class="shop-pric-vip" v-if="vipPrice"><text>会员价：</text>￥{{shopDetail.price}}</view>
 				</view>
 				<view class="right flex">
-					<view class="collection-btn flex" :class="shopDetail.is_collected == 1?'active':''" @tap="collectionEv(shopDetail.id)">
+					<view class="collection-btn flex" :class="shopDetail.is_collected == 1?'active':''" @tap="collectionEv(shopDetail.id)" v-if="source == 'shop'">
 						<image src="/static/public/icon-collection.png" mode=""></image>
 						<text>{{shopDetail.is_collected == 1?'已收藏':'收藏'}}</text>
 					</view>

unpackage/dist/dev/mp-weixin/app.json

@@ -16,6 +16,7 @@
       "root": "pagesA",
       "pages": [
         "cart/cart",
+        "cart/prepare",
         "cart/settlement",
         "cart/finish",
         "shop/shop",

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -792,24 +792,6 @@ page {background-color: #eaeaea;}
 	z-index: 99;
 	overflow-x: auto;
 }
-.news-nav-bg::-webkit-scrollbar{
-	width: 0;
-	height: 0;
-	opacity: 0;
-}
-.news-nav-bg .pull-nav-btns{
-	justify-content: start !important;
-}
-.news-nav-bg .pull-nav-btns .btn{
-	width: 180rpx !important;
-	margin: 0 20rpx !important;
-}
-.news-nav-bg .pull-nav-btns .btn:first-child{
-	margin-left: 0 !important;
-}
-.news-nav-bg .pull-nav-btns .btn:last-child{
-	margin-right: 0 !important;
-}
 .news-list-bg{
 	padding: 10rpx 30rpx;
 }

unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/nothing/nothing-page":1,"components/enter-cart/enter-cart":1,"components/foot-tab/foot-tab":1,"components/nav-tab/nav-tab":1,"components/product-list/product-list":1,"components/pull-list/pull-list":1,"components/status-navs/status-nav":1,"components/swipers/swiper-pu":1,"components/customer-service/customer-service":1,"components/shopping-carts/cart-slide":1,"components/customer/customer-one":1};
+/******/ 		var cssChunks = {"components/nothing/nothing-page":1,"components/enter-cart/enter-cart":1,"components/foot-tab/foot-tab":1,"components/nav-tab/nav-tab":1,"components/product-list/product-list":1,"components/pull-list/pull-list":1,"components/status-navs/status-nav":1,"components/swipers/swiper-pu":1,"components/customer-service/customer-service":1,"components/swiper-tab/swiper-tab":1,"components/shopping-carts/cart-slide":1,"components/customer/customer-one":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/containers/status-container":"components/containers/status-container","components/nothing/nothing-page":"components/nothing/nothing-page","components/enter-cart/enter-cart":"components/enter-cart/enter-cart","components/foot-tab/foot-tab":"components/foot-tab/foot-tab","components/nav-tab/nav-tab":"components/nav-tab/nav-tab","components/product-list/product-list":"components/product-list/product-list","components/pull-list/pull-list":"components/pull-list/pull-list","components/status-navs/status-nav":"components/status-navs/status-nav","components/swipers/swiper-pu":"components/swipers/swiper-pu","components/customer-service/customer-service":"components/customer-service/customer-service","components/shopping-carts/cart-slide":"components/shopping-carts/cart-slide","components/customer/customer-one":"components/customer/customer-one","components/nothing/pitera":"components/nothing/pitera"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/containers/status-container":"components/containers/status-container","components/nothing/nothing-page":"components/nothing/nothing-page","components/enter-cart/enter-cart":"components/enter-cart/enter-cart","components/foot-tab/foot-tab":"components/foot-tab/foot-tab","components/nav-tab/nav-tab":"components/nav-tab/nav-tab","components/product-list/product-list":"components/product-list/product-list","components/pull-list/pull-list":"components/pull-list/pull-list","components/status-navs/status-nav":"components/status-navs/status-nav","components/swipers/swiper-pu":"components/swipers/swiper-pu","components/customer-service/customer-service":"components/customer-service/customer-service","components/swiper-tab/swiper-tab":"components/swiper-tab/swiper-tab","components/shopping-carts/cart-slide":"components/shopping-carts/cart-slide","components/customer/customer-one":"components/customer/customer-one","components/nothing/pitera":"components/nothing/pitera"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

unpackage/dist/dev/mp-weixin/components/nav-tab/nav-tab.js

@@ -124,6 +124,8 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
 var _default2 =
 {
   name: 'nav-tab',
@@ -150,11 +152,20 @@ var _default2 =
   data: function data() {
     return {
       currentIndex: 0, //当前位置
-      left: '',
+      scrollLeft: 0,
-      scrollLeft: '0px',
+      tabsScrollLeft: 0,
-      width: uni.getSystemInfoSync().windowWidth };
+      styleData: {} //样式控制
-
+    };
   },
+  watch: {
+    list: function list() {
+      this.setTabList();
+    },
+    value: function value() {
+      this.currentIndex = this.value;
+      this.setTabList();
+    } },
+
   methods: {
     // 导航选择事件
     chooseEv: function chooseEv(index, id) {
@@ -162,7 +173,35 @@ var _default2 =
         this.currentIndex = index;
         // 抛出事件
         this.$emit('chooseEv', index, id);
+        this.setTabList();
       }
+    },
+    setTabList: function setTabList() {var _this = this;
+      this.$nextTick(function () {
+        if (_this.list.length > 0) {
+          _this.setLeft();
+        }
+      });
+    },
+    setLeft: function setLeft() {var _this2 = this;
+      var lineLeft = 0;
+      this.getElementData('#tab_list', function (data) {
+        var list = data[0];
+        _this2.getElementData("#tab_item", function (res) {
+          var el = res[_this2.currentIndex];
+          lineLeft = el.width / 2 + -list.left + el.left - list.width / 2 - _this2.scrollLeft;
+          _this2.tabsScrollLeft = _this2.scrollLeft + lineLeft;
+        });
+      });
+    },
+    getElementData: function getElementData(el, callback) {
+      uni.createSelectorQuery().in(this).selectAll(el).boundingClientRect().exec(function (data) {
+        callback(data[0]);
+      });
+    },
+    //滚动
+    scroll: function scroll(e) {
+      this.scrollLeft = e.detail.scrollLeft;
     } } };exports.default = _default2;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/components/nav-tab/nav-tab.wxml

@@ -1 +1 @@
-<view class="{{['pull-nav-btns','data-v-2197f1dc',type=='radio'?'search-btns':'']}}" style="{{'width:'+(newWidth)+';'}}"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><block wx:if="{{type=='radio'}}"><view data-event-opts="{{[['tap',[['chooseEv',[index,'$0'],[[['list','',index,'id']]]]]]]}}" class="{{['data-v-2197f1dc',currentIndex==index?'radio-btn active':'radio-btn']}}" bindtap="__e"><view class="radio data-v-2197f1dc"></view><text class="data-v-2197f1dc">{{item.name}}</text></view></block></block><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><block wx:if="{{type=='list'&&index<=maxNum}}"><view data-event-opts="{{[['tap',[['chooseEv',[index,'$0'],[[['list','',index,'id']]]]]]]}}" class="{{['data-v-2197f1dc',currentIndex==index?'btn active':'btn']}}" bindtap="__e">{{item.name}}</view></block></block></view>
+<scroll-view scroll-x="true" scroll-left="{{tabsScrollLeft}}" data-event-opts="{{[['scroll',[['scroll',['$event']]]]]}}" bindscroll="__e" class="data-v-2197f1dc"><view class="{{['pull-nav-btns','data-v-2197f1dc',type=='radio'?'search-btns':'']}}" style="{{'width:'+(newWidth)+';'}}" id="tab_list"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><block wx:if="{{type=='radio'}}"><view class="{{['data-v-2197f1dc',currentIndex==index?'radio-btn active':'radio-btn']}}" id="tab_item" data-event-opts="{{[['tap',[['chooseEv',[index,'$0'],[[['list','',index,'id']]]]]]]}}" bindtap="__e"><view class="radio data-v-2197f1dc"></view><text class="data-v-2197f1dc">{{item.name}}</text></view></block></block><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><block wx:if="{{type=='list'&&index<=maxNum&&maxNum<=3}}"><view class="{{['data-v-2197f1dc',currentIndex==index?'btn active':'btn']}}" style="{{'width:'+('220rpx')+';'+('margin:'+('0 25rpx')+';')}}" id="tab_item" data-event-opts="{{[['tap',[['chooseEv',[index,'$0'],[[['list','',index,'id']]]]]]]}}" bindtap="__e">{{item.name}}</view></block></block><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><block wx:if="{{type=='list'&&index<=maxNum&&maxNum>3}}"><view class="{{['data-v-2197f1dc',currentIndex==index?'btn active':'btn']}}" style="{{'width:'+('170rpx')+';'+('margin:'+('0 20rpx')+';')}}" id="tab_item" data-event-opts="{{[['tap',[['chooseEv',[index,'$0'],[[['list','',index,'id']]]]]]]}}" bindtap="__e">{{item.name}}</view></block></block></view></scroll-view>

unpackage/dist/dev/mp-weixin/components/nav-tab/nav-tab.wxss

@@ -7,9 +7,7 @@
 	padding: 25rpx 0;
 }
 .pull-nav-btns .btn.data-v-2197f1dc {
-	width: 220rpx;
 	height: 66rpx;
-	margin: 0 25rpx;
 	border-radius: 10rpx;
 	line-height: 66rpx;
 	text-align: center;
@@ -17,10 +15,10 @@
 	color: #000000;
 }
 .pull-nav-btns .btn.data-v-2197f1dc:first-child{
-	margin-left: 0;
+	margin-left: 0 !important;
 }
 .pull-nav-btns .btn.data-v-2197f1dc:last-child{
-	margin-right: 0;
+	margin-right: 0 !important;
 }
 .pull-nav-btns .btn.active.data-v-2197f1dc {
 	background-color: #0073bc;

unpackage/dist/dev/mp-weixin/components/shopping-carts/cart-slide.js

@@ -211,6 +211,7 @@ var _publicApi = __webpack_require__(/*! @/jsFile/public-api.js */ 9);function o
       total: 0,
       vipPrice: false // 是否显示会员价
     };
+
   },
   mounted: function mounted() {
     this.listData = this.list;
@@ -347,11 +348,13 @@ var _publicApi = __webpack_require__(/*! @/jsFile/public-api.js */ 9);function o
         });
         uni.setStorageSync('buyList', buyList);
         uni.navigateTo({
-          url: '/pagesA/cart/settlement' });
+          url: '/pagesA/cart/prepare' });
 
       }
     },
 
+
+
     // 数量加减事件
     addCutEv: function addCutEv(index, num) {var _this3 = this;
       if (this.listData[index].slide_x == 0) {

unpackage/dist/dev/mp-weixin/components/swiper-tab/swiper-tab.js

@@ -0,0 +1,287 @@
+(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["components/swiper-tab/swiper-tab"],{
+
+/***/ 242:
+/*!******************************************************************!*\
+  !*** D:/鲁班家具小程序/luban-mall/components/swiper-tab/swiper-tab.vue ***!
+  \******************************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _swiper_tab_vue_vue_type_template_id_72dc0878___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./swiper-tab.vue?vue&type=template&id=72dc0878& */ 243);
+/* harmony import */ var _swiper_tab_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./swiper-tab.vue?vue&type=script&lang=js& */ 245);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _swiper_tab_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _swiper_tab_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony import */ var _swiper_tab_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./swiper-tab.vue?vue&type=style&index=0&lang=scss& */ 247);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 17);
+
+var renderjs
+
+
+
+
+
+/* normalize component */
+
+var component = Object(_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__["default"])(
+  _swiper_tab_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
+  _swiper_tab_vue_vue_type_template_id_72dc0878___WEBPACK_IMPORTED_MODULE_0__["render"],
+  _swiper_tab_vue_vue_type_template_id_72dc0878___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
+  false,
+  null,
+  null,
+  null,
+  false,
+  _swiper_tab_vue_vue_type_template_id_72dc0878___WEBPACK_IMPORTED_MODULE_0__["components"],
+  renderjs
+)
+
+component.options.__file = "components/swiper-tab/swiper-tab.vue"
+/* harmony default export */ __webpack_exports__["default"] = (component.exports);
+
+/***/ }),
+
+/***/ 243:
+/*!*************************************************************************************************!*\
+  !*** D:/鲁班家具小程序/luban-mall/components/swiper-tab/swiper-tab.vue?vue&type=template&id=72dc0878& ***!
+  \*************************************************************************************************/
+/*! exports provided: render, staticRenderFns, recyclableRender, components */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_template_id_72dc0878___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./swiper-tab.vue?vue&type=template&id=72dc0878& */ 244);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_template_id_72dc0878___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_template_id_72dc0878___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_template_id_72dc0878___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_template_id_72dc0878___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+
+
+
+/***/ }),
+
+/***/ 244:
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/鲁班家具小程序/luban-mall/components/swiper-tab/swiper-tab.vue?vue&type=template&id=72dc0878& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! exports provided: render, staticRenderFns, recyclableRender, components */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
+var components
+var render = function() {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+}
+var recyclableRender = false
+var staticRenderFns = []
+render._withStripped = true
+
+
+
+/***/ }),
+
+/***/ 245:
+/*!*******************************************************************************************!*\
+  !*** D:/鲁班家具小程序/luban-mall/components/swiper-tab/swiper-tab.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./swiper-tab.vue?vue&type=script&lang=js& */ 246);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
+/***/ 246:
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/鲁班家具小程序/luban-mall/components/swiper-tab/swiper-tab.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+var _default2 =
+{
+  props: {
+    value: [Number, String],
+    list: { // 传值
+      type: Array,
+      default: function _default() {
+        return [
+        { title: '标题一' },
+        { title: '标题二' },
+        { title: '标题三' },
+        { title: '标题四' },
+        { title: '标题五' },
+        { title: '标题六' },
+        { title: '标题七' },
+        { title: '标题八' },
+        { title: '标题九' }];
+
+      } },
+
+    itemColor: String, // tab内容颜色
+    lineColor: String, // 下划线颜色
+    lineAnimated: { // 是否展示下划线动画
+      type: Boolean,
+      default: true } },
+
+
+  data: function data() {
+    return {
+      currentIndex: 0,
+      lineStyle: {},
+      scrollLeft: 0,
+      tabsScrollLeft: 0,
+      duration: 0.3 };
+
+  },
+  computed: {
+    showTitleSlot: function showTitleSlot() {
+      return this.$scopedSlots.title;
+    } },
+
+  watch: {
+    list: function list() {
+      this.setTabList();
+    },
+    value: function value() {
+      this.currentIndex = this.value;
+      this.setTabList();
+    } },
+
+  mounted: function mounted() {
+    this.currentIndex = this.value;
+    this.setTabList();
+    if (!this.lineAnimated) {
+      this.duration = 0;
+    }
+    console.log(this.$scopedSlots);
+  },
+  methods: {
+    select: function select(item, index) {
+      this.$emit('changeEv', index);
+    },
+    setTabList: function setTabList() {var _this = this;
+      this.$nextTick(function () {
+        if (_this.list.length > 0) {
+          _this.setLine();
+          _this.scrollIntoView();
+        }
+      });
+    },
+    setLine: function setLine() {var _this2 = this;
+      var lineWidth = 0,
+      lineLeft = 0;
+      this.getElementData("#tab_item", function (data) {
+        var el = data[_this2.currentIndex];
+        _this2.$emit('tabheight', el.height);
+        lineWidth = el.width / 2;
+        // lineLeft = el.width * (this.currentIndex + 0.5)  // 此种只能针对每个item长度一致的
+        lineLeft = el.width / 2 + -data[0].left + el.left;
+        _this2.lineStyle = {
+          width: "".concat(lineWidth, "px"),
+          transform: "translateX(".concat(lineLeft, "px) translateX(-50%)"),
+          transitionDuration: "".concat(_this2.duration, "s") };
+
+      });
+    },
+    scrollIntoView: function scrollIntoView() {var _this3 = this; // item滚动
+      var lineLeft = 0;
+      this.getElementData('#tab_list', function (data) {
+        var list = data[0];
+        _this3.getElementData("#tab_item", function (data) {
+          var el = data[_this3.currentIndex];
+          // lineLeft = el.width * (this.currentIndex + 0.5) - list.width / 2 - this.scrollLeft
+          lineLeft = el.width / 2 + -list.left + el.left - list.width / 2 - _this3.scrollLeft;
+          _this3.tabsScrollLeft = _this3.scrollLeft + lineLeft;
+        });
+      });
+    },
+    getElementData: function getElementData(el, callback) {
+      uni.createSelectorQuery().in(this).selectAll(el).boundingClientRect().exec(function (data) {
+        callback(data[0]);
+      });
+    },
+    scroll: function scroll(e) {
+      this.scrollLeft = e.detail.scrollLeft;
+    } } };exports.default = _default2;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+
+/***/ 247:
+/*!****************************************************************************************************!*\
+  !*** D:/鲁班家具小程序/luban-mall/components/swiper-tab/swiper-tab.vue?vue&type=style&index=0&lang=scss& ***!
+  \****************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./swiper-tab.vue?vue&type=style&index=0&lang=scss& */ 248);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_swiper_tab_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
+/***/ 248:
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/鲁班家具小程序/luban-mall/components/swiper-tab/swiper-tab.vue?vue&type=style&index=0&lang=scss& ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+    if(false) { var cssReload; }
+  
+
+/***/ })
+
+}]);
+//# sourceMappingURL=../../../.sourcemap/mp-weixin/components/swiper-tab/swiper-tab.js.map
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'components/swiper-tab/swiper-tab-create-component',
+    {
+        'components/swiper-tab/swiper-tab-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('1')['createComponent'](__webpack_require__(242))
+        })
+    },
+    [['components/swiper-tab/swiper-tab-create-component']]
+]);

unpackage/dist/dev/mp-weixin/components/swiper-tab/swiper-tab.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/components/swiper-tab/swiper-tab.wxml

@@ -0,0 +1 @@
+<block wx:if="{{list.length>0}}"><view class="tabBlock"><scroll-view scroll-x="true" scroll-with-animation="{{true}}" scroll-left="{{tabsScrollLeft}}" data-event-opts="{{[['scroll',[['scroll',['$event']]]]]}}" bindscroll="__e"><view class="tab" id="tab_list"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="{{['tab__item',[(currentIndex===index)?'tab__item--active':'']]}}" style="{{'color:'+(currentIndex===index?''+itemColor:'')+';'}}" id="tab_item" data-event-opts="{{[['tap',[['select',['$0',index],[[['list','',index]]]]]]]}}" bindtap="__e"><block wx:if="{{!showTitleSlot}}"><view>{{item.title}}</view></block></view></block></view><view class="tab__line" style="{{'background:'+(lineColor)+';'+('width:'+(lineStyle.width)+';')+('transform:'+(lineStyle.transform)+';')+('transition-duration:'+(lineStyle.transitionDuration)+';')}}"></view></scroll-view></view></block>

unpackage/dist/dev/mp-weixin/components/swiper-tab/swiper-tab.wxss

@@ -0,0 +1,63 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.tabBlock {
+  position: relative;
+  background: #fff;
+}
+.tabBlock .tab {
+  position: relative;
+  display: flex;
+  font-size: 28rpx;
+  padding-bottom: 15rpx;
+  white-space: nowrap;
+}
+.tabBlock .tab__item {
+  padding: 0 20rpx;
+  flex-shrink: 0;
+  text-align: center;
+  line-height: 90rpx;
+  color: #868695;
+}
+.tabBlock .tab__item--active {
+  color: #007aff;
+  font-weight: bold;
+}
+.tabBlock .tab__item-title {
+  margin: 0 40rpx;
+}
+.tabBlock .tab__line {
+  display: block;
+  height: 6rpx;
+  position: absolute;
+  bottom: 20rpx;
+  left: 0;
+  z-index: 1;
+  border-radius: 6rpx;
+  position: relative;
+  background: #007aff;
+}
+

unpackage/dist/dev/mp-weixin/pages/tabbar/news/news.js

@@ -185,20 +185,22 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 
 
 var _publicApi = __webpack_require__(/*! @/jsFile/public-api.js */ 9);
-var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var statusNav = function statusNav() {__webpack_require__.e(/*! require.ensure | components/status-navs/status-nav */ "components/status-navs/status-nav").then((function () {return resolve(__webpack_require__(/*! @/components/status-navs/status-nav */ 192));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var navTab = function navTab() {__webpack_require__.e(/*! require.ensure | components/nav-tab/nav-tab */ "components/nav-tab/nav-tab").then((function () {return resolve(__webpack_require__(/*! @/components/nav-tab/nav-tab.vue */ 164));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var pullList = function pullList() {__webpack_require__.e(/*! require.ensure | components/pull-list/pull-list */ "components/pull-list/pull-list").then((function () {return resolve(__webpack_require__(/*! @/components/pull-list/pull-list.vue */ 171));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var enterCart = function enterCart() {__webpack_require__.e(/*! require.ensure | components/enter-cart/enter-cart */ "components/enter-cart/enter-cart").then((function () {return resolve(__webpack_require__(/*! @/components/enter-cart/enter-cart.vue */ 178));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var footTab = function footTab() {__webpack_require__.e(/*! require.ensure | components/foot-tab/foot-tab */ "components/foot-tab/foot-tab").then((function () {return resolve(__webpack_require__(/*! @/components/foot-tab/foot-tab.vue */ 185));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);}; //引入mapState
+var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var statusNav = function statusNav() {__webpack_require__.e(/*! require.ensure | components/status-navs/status-nav */ "components/status-navs/status-nav").then((function () {return resolve(__webpack_require__(/*! @/components/status-navs/status-nav */ 192));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var navTab = function navTab() {__webpack_require__.e(/*! require.ensure | components/nav-tab/nav-tab */ "components/nav-tab/nav-tab").then((function () {return resolve(__webpack_require__(/*! @/components/nav-tab/nav-tab.vue */ 164));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var swiperTab = function swiperTab() {__webpack_require__.e(/*! require.ensure | components/swiper-tab/swiper-tab */ "components/swiper-tab/swiper-tab").then((function () {return resolve(__webpack_require__(/*! @/components/swiper-tab/swiper-tab.vue */ 242));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var pullList = function pullList() {__webpack_require__.e(/*! require.ensure | components/pull-list/pull-list */ "components/pull-list/pull-list").then((function () {return resolve(__webpack_require__(/*! @/components/pull-list/pull-list.vue */ 171));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var enterCart = function enterCart() {__webpack_require__.e(/*! require.ensure | components/enter-cart/enter-cart */ "components/enter-cart/enter-cart").then((function () {return resolve(__webpack_require__(/*! @/components/enter-cart/enter-cart.vue */ 178));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var footTab = function footTab() {__webpack_require__.e(/*! require.ensure | components/foot-tab/foot-tab */ "components/foot-tab/foot-tab").then((function () {return resolve(__webpack_require__(/*! @/components/foot-tab/foot-tab.vue */ 185));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);}; //引入mapState
 var _default = {
   components: {
     statusNav: statusNav,
     navTab: navTab,
+    swiperTab: swiperTab,
     pullList: pullList,
     enterCart: enterCart,
     footTab: footTab },
 
   data: function data() {
-    return _defineProperty({
+    return {
       scrollHeight: uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - 50,
       newWidth: uni.getSystemInfoSync().windowWidth,
       newTop: uni.getSystemInfoSync().statusBarHeight + 50,
@@ -210,8 +212,8 @@ var _default = {
       total: 0, //总数
       totalAll: -1, //总数
       cacheBusinessId: -1, //商户id
-      isLoading: false }, "newWidth",
+      isLoading: false,
-    '');
+      tabWidth: '' };
 
   },
   computed: _objectSpread({},
@@ -268,12 +270,13 @@ var _default = {
           res.data.forEach(function (item) {
             var obj = {
               id: item.id,
+              title: item.title,
               name: item.title };
 
             newArr.push(obj);
           });
           _this2.navTabList = newArr;
-          _this2.newWidth = _this2.navTabList.length * 220 - 20 + 'rpx';
+          _this2.tabWidth = _this2.navTabList.length * 210 - 50 + 'rpx';
           _this2.articleNavId = _this2.navTabList[0].id;
           // 获取文章列表
           _this2.getArticleList();

unpackage/dist/dev/mp-weixin/pages/tabbar/news/news.json

@@ -6,6 +6,7 @@
     "pull-list": "/components/pull-list/pull-list",
     "enter-cart": "/components/enter-cart/enter-cart",
     "foot-tab": "/components/foot-tab/foot-tab",
-    "status-nav": "/components/status-navs/status-nav"
+    "status-nav": "/components/status-navs/status-nav",
+    "swiper-tab": "/components/swiper-tab/swiper-tab"
   }
 }

unpackage/dist/dev/mp-weixin/pages/tabbar/news/news.wxml

@@ -1 +1 @@
-<view class="pad-b150"><status-nav vue-id="08fb4b62-1" ifReturn="{{false}}" navBarTitle="资讯" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="nav-list-bg news-nav-bg" style="{{'top:'+(newTop+'px')+';'}}"><nav-tab vue-id="08fb4b62-2" list="{{navTabList}}" maxNum="{{5}}" newWidth="{{newWidth}}" data-event-opts="{{[['^chooseEv',[['chooseEv']]]]}}" bind:chooseEv="__e" bind:__l="__l"></nav-tab></view><block wx:if="{{isLoading}}"><view class="news-list-bg"><pull-list vue-id="08fb4b62-3" list="{{articleList}}" collection="{{0}}" data-event-opts="{{[['^toDetail',[['toArticleDetail']]]]}}" bind:toDetail="__e" bind:__l="__l"></pull-list></view></block><block wx:if="{{totalAll==total}}"><view class="more-txt">暂无更多内容</view></block><enter-cart vue-id="08fb4b62-4" bind:__l="__l"></enter-cart><foot-tab vue-id="08fb4b62-5" current="3" bind:__l="__l"></foot-tab></view>
+<view class="pad-b150"><status-nav vue-id="08fb4b62-1" ifReturn="{{false}}" navBarTitle="资讯" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="nav-list-bg news-nav-bg" style="{{'top:'+(newTop+'px')+';'}}"><nav-tab vue-id="08fb4b62-2" list="{{navTabList}}" maxNum="{{5}}" newWidth="{{tabWidth}}" data-event-opts="{{[['^chooseEv',[['chooseEv']]]]}}" bind:chooseEv="__e" bind:__l="__l"></nav-tab></view><block wx:if="{{isLoading}}"><view class="news-list-bg"><pull-list vue-id="08fb4b62-3" list="{{articleList}}" collection="{{0}}" data-event-opts="{{[['^toDetail',[['toArticleDetail']]]]}}" bind:toDetail="__e" bind:__l="__l"></pull-list></view></block><block wx:if="{{totalAll==total}}"><view class="more-txt">暂无更多内容</view></block><enter-cart vue-id="08fb4b62-4" bind:__l="__l"></enter-cart><foot-tab vue-id="08fb4b62-5" current="3" bind:__l="__l"></foot-tab></view>

unpackage/dist/dev/mp-weixin/pagesA/cart/prepare.js

@@ -0,0 +1,257 @@
+(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pagesA/cart/prepare"],{
+
+/***/ 252:
+/*!************************************************************************!*\
+  !*** D:/鲁班家具小程序/luban-mall/main.js?{"page":"pagesA%2Fcart%2Fprepare"} ***!
+  \************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 5);
+
+
+var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
+var _prepare = _interopRequireDefault(__webpack_require__(/*! ./pagesA/cart/prepare.vue */ 253));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // @ts-ignore
+wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;createPage(_prepare.default);
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
+
+/***/ }),
+
+/***/ 253:
+/*!*****************************************************!*\
+  !*** D:/鲁班家具小程序/luban-mall/pagesA/cart/prepare.vue ***!
+  \*****************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _prepare_vue_vue_type_template_id_d59ec468_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./prepare.vue?vue&type=template&id=d59ec468&scoped=true& */ 254);
+/* harmony import */ var _prepare_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./prepare.vue?vue&type=script&lang=js& */ 256);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _prepare_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _prepare_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony import */ var _prepare_vue_vue_type_style_index_0_id_d59ec468_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./prepare.vue?vue&type=style&index=0&id=d59ec468&scoped=true&lang=css& */ 258);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 17);
+
+var renderjs
+
+
+
+
+
+/* normalize component */
+
+var component = Object(_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__["default"])(
+  _prepare_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
+  _prepare_vue_vue_type_template_id_d59ec468_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"],
+  _prepare_vue_vue_type_template_id_d59ec468_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
+  false,
+  null,
+  "d59ec468",
+  null,
+  false,
+  _prepare_vue_vue_type_template_id_d59ec468_scoped_true___WEBPACK_IMPORTED_MODULE_0__["components"],
+  renderjs
+)
+
+component.options.__file = "pagesA/cart/prepare.vue"
+/* harmony default export */ __webpack_exports__["default"] = (component.exports);
+
+/***/ }),
+
+/***/ 254:
+/*!************************************************************************************************!*\
+  !*** D:/鲁班家具小程序/luban-mall/pagesA/cart/prepare.vue?vue&type=template&id=d59ec468&scoped=true& ***!
+  \************************************************************************************************/
+/*! exports provided: render, staticRenderFns, recyclableRender, components */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_template_id_d59ec468_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./prepare.vue?vue&type=template&id=d59ec468&scoped=true& */ 255);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_template_id_d59ec468_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_template_id_d59ec468_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_template_id_d59ec468_scoped_true___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_template_id_d59ec468_scoped_true___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+
+
+
+/***/ }),
+
+/***/ 255:
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/鲁班家具小程序/luban-mall/pagesA/cart/prepare.vue?vue&type=template&id=d59ec468&scoped=true& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! exports provided: render, staticRenderFns, recyclableRender, components */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
+var components
+var render = function() {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+}
+var recyclableRender = false
+var staticRenderFns = []
+render._withStripped = true
+
+
+
+/***/ }),
+
+/***/ 256:
+/*!******************************************************************************!*\
+  !*** D:/鲁班家具小程序/luban-mall/pagesA/cart/prepare.vue?vue&type=script&lang=js& ***!
+  \******************************************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./prepare.vue?vue&type=script&lang=js& */ 257);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
+/***/ 257:
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/鲁班家具小程序/luban-mall/pagesA/cart/prepare.vue?vue&type=script&lang=js& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var statusNav = function statusNav() {__webpack_require__.e(/*! require.ensure | components/status-navs/status-nav */ "components/status-navs/status-nav").then((function () {return resolve(__webpack_require__(/*! @/components/status-navs/status-nav.vue */ 192));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var cartSlide = function cartSlide() {Promise.all(/*! require.ensure | components/shopping-carts/cart-slide */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/shopping-carts/cart-slide")]).then((function () {return resolve(__webpack_require__(/*! @/components/shopping-carts/cart-slide */ 213));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+  components: {
+    statusNav: statusNav,
+    cartSlide: cartSlide },
+
+  data: function data() {
+    return {
+      listData: [],
+      business_code: uni.getStorageSync('business_code'),
+      original_total: '' };
+
+  },
+  onReachBottom: function onReachBottom() {
+  },
+  onShow: function onShow() {
+    this.getListData();
+  },
+  methods: {
+    getListData: function getListData() {var _this = this;
+      this.$requst.post('/api/order/prepare-info', { sku_list: uni.getStorageSync('buyList') }).then(function (res) {
+        if (res.code == 0) {
+          _this.original_total = res.data.original_total;
+          console.log(res.data, 22222);
+          console.log(_this.original_total, 11111);
+          var newArr = [];
+          res.data.list.forEach(function (item) {
+            var obj = {
+              id: item.id,
+              num: item.num,
+              coding: item.coding,
+              price: item.price,
+              original_price: item.original_price,
+              image: item.spu_cover,
+              skuName: item.sku_name,
+              title: item.goods_name,
+              customTitle: item.custom_title };
+
+            newArr.push(obj);
+          });
+          _this.listData = newArr;
+        }
+      });
+    },
+    submitEv: function submitEv() {
+      uni.navigateTo({
+        url: '/pagesA/cart/settlement' });
+
+    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+
+/***/ 258:
+/*!**************************************************************************************************************!*\
+  !*** D:/鲁班家具小程序/luban-mall/pagesA/cart/prepare.vue?vue&type=style&index=0&id=d59ec468&scoped=true&lang=css& ***!
+  \**************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_style_index_0_id_d59ec468_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./prepare.vue?vue&type=style&index=0&id=d59ec468&scoped=true&lang=css& */ 259);
+/* harmony import */ var _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_style_index_0_id_d59ec468_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_style_index_0_id_d59ec468_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_style_index_0_id_d59ec468_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_style_index_0_id_d59ec468_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_app_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_prepare_vue_vue_type_style_index_0_id_d59ec468_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
+/***/ 259:
+/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/鲁班家具小程序/luban-mall/pagesA/cart/prepare.vue?vue&type=style&index=0&id=d59ec468&scoped=true&lang=css& ***!
+  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+    if(false) { var cssReload; }
+  
+
+/***/ })
+
+},[[252,"common/runtime","common/vendor"]]]);
+//# sourceMappingURL=../../../.sourcemap/mp-weixin/pagesA/cart/prepare.js.map

unpackage/dist/dev/mp-weixin/pagesA/cart/prepare.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "status-nav": "/components/status-navs/status-nav",
+    "cart-slide": "/components/shopping-carts/cart-slide"
+  }
+}

unpackage/dist/dev/mp-weixin/pagesA/cart/prepare.wxml

@@ -0,0 +1 @@
+<view class="pad-b150 data-v-d59ec468"><status-nav vue-id="10e39cba-1" ifReturn="{{true}}" navBarTitle="购物车" marginBottom="{{0}}" class="data-v-d59ec468" bind:__l="__l"></status-nav><view class="cart-content data-v-d59ec468"><view class="slide-list data-v-d59ec468"><block wx:for="{{listData}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="slide-item data-v-d59ec468"><view data-event-opts="{{[['tap',[['clickItemMethod',['$0'],[[['listData','',index]]]]]]]}}" class="slide-item-li data-v-d59ec468" bindtap="__e"><view class="shop-img data-v-d59ec468"><image src="{{item.image}}" mode="widthFix" class="data-v-d59ec468"></image></view><view class="shop-txt data-v-d59ec468"><view class="shop-txt-top data-v-d59ec468"><view class="title clips2 data-v-d59ec468">{{item.title}}</view><view class="specs clips2 data-v-d59ec468">{{"规格："+(item.customTitle==''?item.skuName:item.customTitle)}}</view></view><view class="shop-txt-bottom data-v-d59ec468"><view class="price data-v-d59ec468">{{"￥"+(business_code!==''?item.price:item.original_price)}}</view><view class="num data-v-d59ec468"><text class="data-v-d59ec468">{{"x"+item.num}}</text></view></view></view></view></view></block></view><view class="change-all data-v-d59ec468"><view class="all-price data-v-d59ec468"><view class="price data-v-d59ec468">合计：<label class="_span data-v-d59ec468">{{"￥"+original_total}}</label></view><view data-event-opts="{{[['tap',[['submitEv',['$event']]]]]}}" class="btn data-v-d59ec468" style="{{'background:'+('#0073bc')+';'}}" bindtap="__e">提交订单</view></view></view></view></view>

unpackage/dist/dev/mp-weixin/pagesA/cart/prepare.wxss

@@ -0,0 +1,102 @@
+
+.slide-list.data-v-d59ec468{
+	margin-top: 20rpx;
+}
+.slide-item.data-v-d59ec468{
+	margin-top: 30rpx;
+}
+.slide-list .slide-item.data-v-d59ec468:first-child{
+	margin-top: 0;
+}
+.slide-item-li.data-v-d59ec468{
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	padding: 20rpx 30rpx;
+	background-color: #FFFFFF;
+}
+.slide-item-li .shop-img.data-v-d59ec468{
+	width: 230rpx;
+	height: 150rpx;
+	border-radius: 10rpx;
+	margin: 0 24rpx 0 6rpx;
+	overflow: hidden;
+}
+.slide-item-li .shop-img image.data-v-d59ec468{
+	width: 230rpx;
+	min-height: 150rpx;
+}
+.slide-item-li .shop-txt.data-v-d59ec468{
+	width: calc(100% - 260rpx);
+}
+.shop-txt-top.data-v-d59ec468{
+	min-height: 100rpx;
+}
+.shop-txt-top .title.data-v-d59ec468{
+	font-size: 30rpx;
+	line-height: 1.5;
+	color: #000000;
+	font-weight: bold;
+}
+.shop-txt-top .specs.data-v-d59ec468{
+	font-size: 24rpx;
+	line-height: 1.5;
+	color: #8c8c9b;
+	margin: 3rpx;
+}
+.shop-txt-bottom.data-v-d59ec468{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	height: 50rpx;
+}
+.shop-txt-bottom .price.data-v-d59ec468{
+	font-size: 30rpx;
+	line-height: 1.5;
+	color: #f81c1c;
+}
+.shop-txt-bottom .num.data-v-d59ec468{
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	width: 170rpx;
+	font-size: 24rpx;
+}
+.shop-txt-bottom .num>text.data-v-d59ec468{
+	font-size: 24rpx;
+	line-height: 1.5;
+	color: #666666;
+}
+.change-all.data-v-d59ec468{
+	box-sizing: border-box;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100vw;
+	height: 130rpx;
+	padding: 0 30rpx;
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	background-color: #FFFFFF;
+}
+.all-price.data-v-d59ec468{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+}
+.all-price .price.data-v-d59ec468{
+	font-size: 24rpx;
+	margin-right: 25rpx;
+	color: #000000;
+}
+.all-price .btn.data-v-d59ec468{
+	line-height: 84rpx;
+	padding: 0 30rpx;
+	border-radius: 10rpx;
+	font-size: 32rpx;
+	color: #FFFFFF;
+}
+

unpackage/dist/dev/mp-weixin/pagesA/order/detail.js

@@ -318,7 +318,7 @@ var _default = {
       });
       uni.setStorageSync('buyList', buyList);
       uni.navigateTo({
-        url: '/pagesA/cart/settlement' });
+        url: '/pagesA/cart/prepare' });
 
     },
     //去商品详情页

unpackage/dist/dev/mp-weixin/pagesA/order/order.js

@@ -343,7 +343,7 @@ var _default = {
       });
       uni.setStorageSync('buyList', buyList);
       uni.navigateTo({
-        url: '/pagesA/cart/settlement' });
+        url: '/pagesA/cart/prepare' });
 
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

unpackage/dist/dev/mp-weixin/pagesA/shop/detail.wxml

@@ -1 +1 @@
-<view class="pad-b140"><status-nav vue-id="d5d4c780-1" ifReturn="{{true}}" navBarTitle="商品简介" marginBottom="{{0}}" bind:__l="__l"></status-nav><block wx:if="{{isLoading}}"><view class="shop-img"><swiper-pu vue-id="d5d4c780-2" newRadius="0" bannerList="{{shopBanner}}" newHeight="505rpx" newBottom="35rpx" isplay="{{isplay}}" bind:__l="__l"></swiper-pu></view></block><block wx:if="{{isLoading}}"><view class="shop-summary"><view class="shop-title">{{shopDetail.name}}</view><view class="shop-txt flex"><view class="left"><view class="shop-customized">{{shopDetail.tag==''?'':shopDetail.tag}}</view><view class="shop-pric">{{"￥"+shopDetail.original_price}}</view><block wx:if="{{vipPrice}}"><view class="shop-pric-vip"><text>会员价：</text>{{"￥"+shopDetail.price}}</view></block></view><view class="right flex"><view data-event-opts="{{[['tap',[['collectionEv',['$0'],['shopDetail.id']]]]]}}" class="{{['collection-btn','flex',shopDetail.is_collected==1?'active':'']}}" bindtap="__e"><image src="/static/public/icon-collection.png" mode></image><text>{{shopDetail.is_collected==1?'已收藏':'收藏'}}</text></view><view class="share-btn flex"><image src="/static/public/icon-share.png" mode></image><text>分享</text><button plain="true" data-name="shareBtn" open-type="share"></button></view></view></view><view data-event-opts="{{[['tap',[['openSpecs',[1]]]]]}}" class="specs-btn flex" bindtap="__e"><image src="/static/public/icon-specs.png" mode="widthFix"></image><text>规格：查看详细规格</text><image src="/static/public/icon-more.png" mode="widthFix"></image></view></view></block><view class="shop-detail"><view class="shop-detail-tab flex"><block wx:for="{{shopDetailTab}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeDetail',[index]]]]]}}" class="{{['tab-btn',showCurrent==index?'cur':'']}}" bindtap="__e">{{item}}</view></block></view><view class="shop-detail-txt"><block wx:if="{{showCurrent==0}}"><view class="txt-box"><rich-text nodes="{{shopDetail.content}}"></rich-text></view></block><block wx:if="{{showCurrent==1}}"><view class="txt-box"><view><rich-text nodes="{{shopDetail.params}}"></rich-text></view></view></block></view></view><block wx:if="{{source=='shop'}}"><view class="shop-btns flex"><view data-event-opts="{{[['tap',[['openSpecs',[0]]]]]}}" class="btn" bindtap="__e">加入购物车</view><view data-event-opts="{{[['tap',[['openSpecs',[1]]]]]}}" class="btn" bindtap="__e">立即购买</view></view></block><block wx:if="{{source=='kit'}}"><view class="kit-shop-btns"><view data-event-opts="{{[['tap',[['backEv',['$event']]]]]}}" class="btn" bindtap="__e">返回套件继续购买</view></view></block><block wx:if="{{isShow}}"><view data-event-opts="{{[['tap',[['closeSpecs',['$event']]]]]}}" class="pull-all-bg" bindtap="__e"></view></block><block wx:if="{{isShow}}"><view class="specs-detail-bg"><view class="specs-detail"><view data-event-opts="{{[['tap',[['closeSpecs',['$event']]]]]}}" class="close-specs" bindtap="__e"><image src="/static/public/icon-close.png" mode="widthFix"></image></view><view class="price">{{"￥"+shopDetail.original_price}}</view><block wx:if="{{vipPrice}}"><view class="price"><text>会员价：</text>{{"￥"+shopDetail.price}}</view></block><view class="specs-ul"><text>规格</text><block wx:for="{{shopSku}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeSpecs',[index]]]]]}}" class="{{['specs-li','flex',specsIndex==index?'checked':'']}}" bindtap="__e">{{item.custom_title+" "+(item.cycle!==''?'供货周期：'+item.cycle:'')}}</view></block></view><block wx:if="{{changeBtns}}"><view data-event-opts="{{[['tap',[['buyNow',['$0'],['specsIndex']]]]]}}" class="specs-detail-btn" bindtap="__e">立即购买</view></block><block wx:else><view data-event-opts="{{[['tap',[['joinCart',['$0'],['specsIndex']]]]]}}" class="specs-detail-btn" bindtap="__e">加入购物车</view></block></view></view></block><enter-cart vue-id="d5d4c780-3" bottom="{{335}}" bind:__l="__l"></enter-cart><customer-service vue-id="d5d4c780-4" bind:__l="__l"></customer-service></view>
+<view class="pad-b140"><status-nav vue-id="d5d4c780-1" ifReturn="{{true}}" navBarTitle="商品简介" marginBottom="{{0}}" bind:__l="__l"></status-nav><block wx:if="{{isLoading}}"><view class="shop-img"><swiper-pu vue-id="d5d4c780-2" newRadius="0" bannerList="{{shopBanner}}" newHeight="505rpx" newBottom="35rpx" isplay="{{isplay}}" bind:__l="__l"></swiper-pu></view></block><block wx:if="{{isLoading}}"><view class="shop-summary"><view class="shop-title">{{shopDetail.name}}</view><view class="shop-txt flex"><view class="left"><view class="shop-customized">{{shopDetail.tag==''?'':shopDetail.tag}}</view><view class="shop-pric">{{"￥"+shopDetail.original_price}}</view><block wx:if="{{vipPrice}}"><view class="shop-pric-vip"><text>会员价：</text>{{"￥"+shopDetail.price}}</view></block></view><view class="right flex"><block wx:if="{{source=='shop'}}"><view data-event-opts="{{[['tap',[['collectionEv',['$0'],['shopDetail.id']]]]]}}" class="{{['collection-btn','flex',shopDetail.is_collected==1?'active':'']}}" bindtap="__e"><image src="/static/public/icon-collection.png" mode></image><text>{{shopDetail.is_collected==1?'已收藏':'收藏'}}</text></view></block><view class="share-btn flex"><image src="/static/public/icon-share.png" mode></image><text>分享</text><button plain="true" data-name="shareBtn" open-type="share"></button></view></view></view><view data-event-opts="{{[['tap',[['openSpecs',[1]]]]]}}" class="specs-btn flex" bindtap="__e"><image src="/static/public/icon-specs.png" mode="widthFix"></image><text>规格：查看详细规格</text><image src="/static/public/icon-more.png" mode="widthFix"></image></view></view></block><view class="shop-detail"><view class="shop-detail-tab flex"><block wx:for="{{shopDetailTab}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeDetail',[index]]]]]}}" class="{{['tab-btn',showCurrent==index?'cur':'']}}" bindtap="__e">{{item}}</view></block></view><view class="shop-detail-txt"><block wx:if="{{showCurrent==0}}"><view class="txt-box"><rich-text nodes="{{shopDetail.content}}"></rich-text></view></block><block wx:if="{{showCurrent==1}}"><view class="txt-box"><view><rich-text nodes="{{shopDetail.params}}"></rich-text></view></view></block></view></view><block wx:if="{{source=='shop'}}"><view class="shop-btns flex"><view data-event-opts="{{[['tap',[['openSpecs',[0]]]]]}}" class="btn" bindtap="__e">加入购物车</view><view data-event-opts="{{[['tap',[['openSpecs',[1]]]]]}}" class="btn" bindtap="__e">立即购买</view></view></block><block wx:if="{{source=='kit'}}"><view class="kit-shop-btns"><view data-event-opts="{{[['tap',[['backEv',['$event']]]]]}}" class="btn" bindtap="__e">返回套件继续购买</view></view></block><block wx:if="{{isShow}}"><view data-event-opts="{{[['tap',[['closeSpecs',['$event']]]]]}}" class="pull-all-bg" bindtap="__e"></view></block><block wx:if="{{isShow}}"><view class="specs-detail-bg"><view class="specs-detail"><view data-event-opts="{{[['tap',[['closeSpecs',['$event']]]]]}}" class="close-specs" bindtap="__e"><image src="/static/public/icon-close.png" mode="widthFix"></image></view><view class="price">{{"￥"+shopDetail.original_price}}</view><block wx:if="{{vipPrice}}"><view class="price"><text>会员价：</text>{{"￥"+shopDetail.price}}</view></block><view class="specs-ul"><text>规格</text><block wx:for="{{shopSku}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeSpecs',[index]]]]]}}" class="{{['specs-li','flex',specsIndex==index?'checked':'']}}" bindtap="__e">{{item.custom_title+" "+(item.cycle!==''?'供货周期：'+item.cycle:'')}}</view></block></view><block wx:if="{{changeBtns}}"><view data-event-opts="{{[['tap',[['buyNow',['$0'],['specsIndex']]]]]}}" class="specs-detail-btn" bindtap="__e">立即购买</view></block><block wx:else><view data-event-opts="{{[['tap',[['joinCart',['$0'],['specsIndex']]]]]}}" class="specs-detail-btn" bindtap="__e">加入购物车</view></block></view></view></block><enter-cart vue-id="d5d4c780-3" bottom="{{335}}" bind:__l="__l"></enter-cart><customer-service vue-id="d5d4c780-4" bind:__l="__l"></customer-service></view>