浏览代码

bug 修改

lilei 9 月之前
父节点
当前提交
5431a1f5d2

+ 1 - 1
App.vue

@@ -1,7 +1,7 @@
 <script>
 <script>
 	export default {
 	export default {
 		globalData: {
 		globalData: {
-			baseUrl: 'http://192.168.2.10:7002/saas/clz/', // 本地
+			baseUrl: 'http://192.168.2.100:9110/saas/clz/', // 本地
 			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		},

+ 1 - 2
components/icon-items-list/icon-items-list.vue

@@ -83,7 +83,7 @@
 	}
 	}
 	.icon-items-list-img{
 	.icon-items-list-img{
 		.icon-items-icons{
 		.icon-items-icons{
-			margin: 0;
+			margin-bottom: 5px;
 		}
 		}
 		.icon-items-imgse{
 		.icon-items-imgse{
 			position: relative;
 			position: relative;
@@ -125,7 +125,6 @@
 	}
 	}
 	.icon-items-icons{
 	.icon-items-icons{
 		text-align: center;
 		text-align: center;
-		margin: 20upx 0;
 		display: flex;
 		display: flex;
 		align-items: center;
 		align-items: center;
 		flex-direction: column;
 		flex-direction: column;

+ 75 - 52
pages/index/index.vue

@@ -85,7 +85,7 @@
 					</view>
 					</view>
 					<!-- banner -->
 					<!-- banner -->
 					<view class="banner">
 					<view class="banner">
-						<u-swiper mode="dot" bg-color="" img-mode="widthFix" @click="clickBanner" :interval="3000" :height="hasShopiing?280:374" :list="imgList"></u-swiper>
+						<u-swiper mode="dot" bg-color="" img-mode="widthFix" @click="clickBanner" :interval="3000" :height="hasShopiing?280:350" :list="imgList"></u-swiper>
 					</view>
 					</view>
 					<!-- 快捷导航 -->
 					<!-- 快捷导航 -->
 					<view class="quick-nav pa-box" v-if="hasShopiing&&navList.length">
 					<view class="quick-nav pa-box" v-if="hasShopiing&&navList.length">
@@ -233,7 +233,7 @@
 			imgList(){
 			imgList(){
 				let list = [
 				let list = [
 					{
 					{
-						image: this.hasShopiing ? '/static/banner1.jpg':'/static/banner1.png',
+						image: '/static/banner1.jpg',
 						activeType: ''
 						activeType: ''
 					}
 					}
 				]
 				]
@@ -241,7 +241,7 @@
 				if(this.hasRedPacket&&this.hasShelf){
 				if(this.hasRedPacket&&this.hasShelf){
 					list.push(
 					list.push(
 					{
 					{
-						image: this.hasShopiing ? '/static/banner2.jpg':'/static/banner2.png',
+						image: '/static/banner2.jpg',
 						activeType: 'redPacket'
 						activeType: 'redPacket'
 					})
 					})
 				}
 				}
@@ -330,27 +330,6 @@
 			uni.$off('refashHome')
 			uni.$off('refashHome')
 			uni.$off('refashProm')
 			uni.$off('refashProm')
 		},
 		},
-		// 下拉刷新
-		onPullDownRefresh(){
-			// 商品分类
-			this.getGoodType()
-			this.pageInit(true)
-			setTimeout(function () {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onShareAppMessage() {},
-		// 页面滚动
-		onPageScroll(e) {
-			this.showFixed = e.scrollTop > 120
-		},
-		// 滚动到底部,加载热门产品
-		onReachBottom() {
-			if(this.hasShopiing && this.hotProductPageNo < this.totalhotPage){
-				this.hotProductPageNo++
-				this.getProductList()
-			}
-		},
 		onShow() {
 		onShow() {
 			// 用户头像
 			// 用户头像
 			this.avatarUrl = uni.getStorageSync('userPhoto');
 			this.avatarUrl = uni.getStorageSync('userPhoto');
@@ -372,31 +351,28 @@
 				this.getScrollLog()
 				this.getScrollLog()
 			}
 			}
 		},
 		},
+		// 下拉刷新
+		onPullDownRefresh(){
+			// 商品分类
+			this.getGoodType()
+			this.pageInit(true)
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onShareAppMessage() {},
+		// 页面滚动
+		onPageScroll(e) {
+			this.showFixed = e.scrollTop > 120
+		},
+		// 滚动到底部,加载热门产品
+		onReachBottom() {
+			if(this.hasShopiing && this.hotProductPageNo < this.totalhotPage){
+				this.hotProductPageNo++
+				this.getProductList()
+			}
+		},
 		methods: {
 		methods: {
-			// 扫描vin
-			beforeSwitch(index){
-				const row = this.$store.state.vuex_tabBarList[index]
-				if(row.text == '促销'){
-					uni.$emit('refashProm')
-				}
-				if(row.text == '购物车'){
-					uni.navigateTo({
-						url:'/pagesB/cart/index',
-						target: 'page'
-					})
-				}
-				if(row.text == '扫描VIN'){
-					this.openCamera()
-				}else{
-					return true
-				}
-			},
-			// 去搜索产品
-			toSearch(event){
-				uni.navigateTo({
-					url:'/pagesB/shopiing/searchProduct?queryWord='+event.value+'&clzId='
-				})
-			},
 			// 初始化页面
 			// 初始化页面
 			pageInit(flag){
 			pageInit(flag){
 				this.carouselList = []
 				this.carouselList = []
@@ -417,11 +393,40 @@
 						// 商品分类
 						// 商品分类
 						this.getGoodType()
 						this.getGoodType()
 					}
 					}
-					
 				}else{
 				}else{
 					uni.removeStorageSync('token')
 					uni.removeStorageSync('token')
 				}
 				}
 			},
 			},
+			// 扫描vin
+			beforeSwitch(index){
+				const row = this.$store.state.vuex_tabBarList[index]
+				if(row.text == '促销'){
+					uni.$emit('refashProm')
+				}
+				if(row.text == '购物车'){
+					if(!this.hasLogin){
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+						return true
+					}
+					uni.navigateTo({
+						url:'/pagesB/cart/index',
+						target: 'page'
+					})
+				}
+				if(row.text == '扫描VIN'){
+					this.openCamera()
+				}else{
+					return true
+				}
+			},
+			// 去搜索产品
+			toSearch(event){
+				uni.navigateTo({
+					url:'/pagesB/shopiing/searchProduct?queryWord='+event.value+'&clzId='
+				})
+			},
 			// 轮播图片
 			// 轮播图片
 			getCarousel(){
 			getCarousel(){
 				this.carouselList = []
 				this.carouselList = []
@@ -575,7 +580,7 @@
 			// 商品一级分类
 			// 商品一级分类
 			getGoodType(){
 			getGoodType(){
 				this.productTypeList = []
 				this.productTypeList = []
-				getShopCategory({categoryLevel: 1}).then(res => {
+				getShopCategory({categoryLevel: 1, status: 1}).then(res => {
 					const list = res.data || []
 					const list = res.data || []
 					const ret = []
 					const ret = []
 					list.forEach(item => {
 					list.forEach(item => {
@@ -605,7 +610,7 @@
 			// 商品列表查询
 			// 商品列表查询
 			getProductList(){
 			getProductList(){
 				this.status = "loading"
 				this.status = "loading"
-				 getShopProductList({pageNo:this.hotProductPageNo,pageSize:10,hotFlag:1}).then(res => {
+				 getShopProductList({pageNo:this.hotProductPageNo,pageSize:10,hotFlag:1, status: 1}).then(res => {
 					 if(res.status == 200){
 					 if(res.status == 200){
 						 const list = res.data ? res.data.list : []
 						 const list = res.data ? res.data.list : []
 						 this.productList.push(list)
 						 this.productList.push(list)
@@ -636,6 +641,8 @@
 							// 商品分类
 							// 商品分类
 							this.getGoodType()
 							this.getGoodType()
 						}else{ // 没有商城
 						}else{ // 没有商城
+							// 隐藏tab 购物车,显示视频
+							this.showVideoTab()
 							// 滚动扫描记录
 							// 滚动扫描记录
 							this.getScrollLog()
 							this.getScrollLog()
 							// 获取扫描记录
 							// 获取扫描记录
@@ -671,6 +678,21 @@
 					})
 					})
 				}
 				}
 			},
 			},
+			// 显示视频tab,隐藏购物车
+			showVideoTab(){
+				const videoIndex = this.$store.state.vuex_tabBarList.findIndex(item => item.text == '视频')
+				const catIndex = this.$store.state.vuex_tabBarList.findIndex(item => item.text == '购物车')
+				if(videoIndex<0 && catIndex >= 0){
+					// 替换购物车为视频
+					this.$store.state.vuex_tabBarList.splice(catIndex,1,{
+						"pagePath": "/pages/videos/index",
+						"iconPath": "/static/tab/tab_video_normal.png",
+						"selectedIconPath": "/static/tab/tab_video_pressed.png",
+						"text": "视频",
+						'customIcon': false,
+					})
+				}
+			},
 			// 查询是否支持数字货架, flag: true 再次刷新,false 首次加载
 			// 查询是否支持数字货架, flag: true 再次刷新,false 首次加载
 			getStoreShelf(flag){
 			getStoreShelf(flag){
 				findStoreShelf().then(res => {
 				findStoreShelf().then(res => {
@@ -982,13 +1004,14 @@
 				background: #fff;
 				background: #fff;
 				border-radius: 6px;
 				border-radius: 6px;
 				margin: 10px 0;
 				margin: 10px 0;
+				padding: 10px 0;
 				box-shadow: 1px 1px 3px #eee;
 				box-shadow: 1px 1px 3px #eee;
+				border: 1px solid #f8f8f8;
 			}
 			}
 			.product-box{
 			.product-box{
 				margin: 10px 0;
 				margin: 10px 0;
 			}
 			}
 			.ptype-nav{
 			.ptype-nav{
-				padding: 10px 0;
 				position: relative;
 				position: relative;
 				.indicator-dots{
 				.indicator-dots{
 					width: 100%;
 					width: 100%;

+ 3 - 3
pages/index/productItem.vue

@@ -9,7 +9,7 @@
 	    :key="item.id" @click="toDetail(item)">
 	    :key="item.id" @click="toDetail(item)">
 			<view>
 			<view>
 				<image mode="aspectFit" :src="item.productMsg+'?x-oss-process=image/resize,p_30'" style="height: 140px;width: 100%;"></image>
 				<image mode="aspectFit" :src="item.productMsg+'?x-oss-process=image/resize,p_30'" style="height: 140px;width: 100%;"></image>
-				<!-- <view class="back-price" v-if="item.promoRuleValue">返<text>{{item.promoRuleValue}}</text>元</view> -->
+				<view class="back-price" v-if="item.dealerScopeFlag==0">售罄</view>
 				<view class="product-code"><text class="ellipsis-one" overflow="ellipsis">{{item.productCode}}</text></view>
 				<view class="product-code"><text class="ellipsis-one" overflow="ellipsis">{{item.productCode}}</text></view>
 			</view>
 			</view>
 			<view>
 			<view>
@@ -168,11 +168,11 @@
 	}
 	}
 	.back-price{
 	.back-price{
 		padding: 6rpx 65rpx;
 		padding: 6rpx 65rpx;
-		background: rgba(255 ,87 ,34 , 1);
+		background: rgba(197, 197, 198, 1.0);
 		position: absolute;
 		position: absolute;
 		top: 18rpx;
 		top: 18rpx;
 		right: -45rpx;
 		right: -45rpx;
-		color: #fff;
+		color: #666;
 		z-index: 2;
 		z-index: 2;
 		font-size: 20rpx;
 		font-size: 20rpx;
 		text-align: center;
 		text-align: center;

+ 24 - 0
pages/morePage/morePage.vue

@@ -327,6 +327,10 @@
 			if(this.hasRedPacket&&this.hasShelf){
 			if(this.hasRedPacket&&this.hasShelf){
 				this.getUserReward()
 				this.getUserReward()
 			}
 			}
+			// 隐藏促销模块
+			if(!this.hasLogin){
+				this.hidePromoTab()
+			}
 		},
 		},
 		// 页面卸载
 		// 页面卸载
 		onUnload() {
 		onUnload() {
@@ -358,6 +362,20 @@
 					})
 					})
 				}
 				}
 			},
 			},
+			// 隐藏促销模块
+			hidePromoTab(){
+				// 删除促销模块
+				const promoIndex = this.$store.state.vuex_tabBarList.findIndex(item => item.text == '促销')
+				if(promoIndex > -1){
+					this.$store.state.vuex_tabBarList.splice(promoIndex,1)
+				}
+				// 扫描按钮不局中
+				const scanTab = this.$store.state.vuex_tabBarList.find(item => item.text == '扫描VIN')
+				if(scanTab){
+					scanTab.iconPath = "/static/tab/tab_scan_normal.png"
+					scanTab.midButton = false
+				}
+			},
 			// tab单击
 			// tab单击
 			beforeSwitch(index){
 			beforeSwitch(index){
 				const row = this.$store.state.vuex_tabBarList[index]
 				const row = this.$store.state.vuex_tabBarList[index]
@@ -365,6 +383,12 @@
 					uni.$emit('refashProm')
 					uni.$emit('refashProm')
 				}
 				}
 				if(row.text == '购物车'){
 				if(row.text == '购物车'){
+					if(!this.hasLogin){
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+						return true
+					}
 					uni.navigateTo({
 					uni.navigateTo({
 						url:'/pagesB/cart/index',
 						url:'/pagesB/cart/index',
 						target: 'page'
 						target: 'page'

+ 6 - 0
pages/promo/index.vue

@@ -121,6 +121,12 @@
 					uni.$emit('refashProm')
 					uni.$emit('refashProm')
 				}
 				}
 				if(row.text == '购物车'){
 				if(row.text == '购物车'){
+					if(!this.hasLogin){
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+						return true
+					}
 					uni.navigateTo({
 					uni.navigateTo({
 						url:'/pagesB/cart/index',
 						url:'/pagesB/cart/index',
 						target: 'page'
 						target: 'page'

+ 0 - 6
pages/videos/index.vue

@@ -187,12 +187,6 @@
 				if(row.text == '促销'){
 				if(row.text == '促销'){
 					uni.$emit('refashProm')
 					uni.$emit('refashProm')
 				}
 				}
-				if(row.text == '购物车'){
-					uni.navigateTo({
-						url:'/pagesB/cart/index',
-						target: 'page'
-					})
-				}
 				if(row.text == '扫描VIN'){
 				if(row.text == '扫描VIN'){
 					this.openCamera()
 					this.openCamera()
 				}else{
 				}else{

+ 17 - 4
pagesA/digitalShelf/choosePart.vue

@@ -100,7 +100,7 @@
 		</div>
 		</div>
 		<!-- 底部提交按钮 -->
 		<!-- 底部提交按钮 -->
 		<sklineFooter></sklineFooter>
 		<sklineFooter></sklineFooter>
-		<div class="cpb_footer flex align-center flex_column">
+		<div class="cpb_footer flex align-center flex_column" :style="{zIndex:hideFooter?0:10}">
 			<view class="flex align-center">
 			<view class="flex align-center">
 				<div>
 				<div>
 					<div class="cpb_cart" @click="openCart">
 					<div class="cpb_cart" @click="openCart">
@@ -123,7 +123,7 @@
 		<page-container
 		<page-container
 		:show="showCart" 
 		:show="showCart" 
 		:round="true"
 		:round="true"
-		:z-index="10"
+		:z-index="5"
 		position="bottom" 
 		position="bottom" 
 		custom-style="height:70%"
 		custom-style="height:70%"
 		@afterleave="closeCart">
 		@afterleave="closeCart">
@@ -190,7 +190,7 @@
 		<!-- 价格查看 -->
 		<!-- 价格查看 -->
 		<uni-popup ref="showPriceModal" type="center">
 		<uni-popup ref="showPriceModal" type="center">
 			<view class="show-price-modal popu-modal" v-if="tempData">
 			<view class="show-price-modal popu-modal" v-if="tempData">
-				<view class="popu-close" @click="$refs.showPriceModal.close()"><uni-icons type="closeempty" size="28"></uni-icons></view>
+				<view class="popu-close" @click="closePriceModal"><uni-icons type="closeempty" size="28"></uni-icons></view>
 				<view class="itemlist">
 				<view class="itemlist">
 					<text>产品编码</text>
 					<text>产品编码</text>
 					<text>{{tempData.code||'--'}}</text>
 					<text>{{tempData.code||'--'}}</text>
@@ -248,6 +248,7 @@
 			return {
 			return {
 				showOther: true,
 				showOther: true,
 				showPriceModal: false,
 				showPriceModal: false,
+				hideFooter: false,
 				theme: '',
 				theme: '',
 				vinNumber: '',
 				vinNumber: '',
 				leve2Data: [],  //  二级菜单数据
 				leve2Data: [],  //  二级菜单数据
@@ -340,6 +341,7 @@
 				// 未认证
 				// 未认证
 				if(!this.storeApply || this.storeApply&&!this.storeApply.auditStatus){
 				if(!this.storeApply || this.storeApply&&!this.storeApply.auditStatus){
 					this.$refs.showPopup.open()
 					this.$refs.showPopup.open()
+					this.hideFooter = true
 				}
 				}
 			}
 			}
 		},
 		},
@@ -389,19 +391,28 @@
 					}
 					}
 					this.tempData = row
 					this.tempData = row
 					this.$refs.showPriceModal.open()
 					this.$refs.showPriceModal.open()
+					this.hideFooter = true
 				}
 				}
 			},
 			},
+			// 关闭价格弹框
+			closePriceModal(){
+				this.$refs.showPriceModal.close()
+				this.hideFooter = false
+			},
+			// 扫描记录
 			scanVinLogCopy(){
 			scanVinLogCopy(){
 				scanVinLogCopy({id:this.carInfo.id}).then(res => {
 				scanVinLogCopy({id:this.carInfo.id}).then(res => {
 					console.log(res)
 					console.log(res)
 				})
 				})
 			},
 			},
+			// 去认证
 			toAuthStore(){
 			toAuthStore(){
 				this.$refs.showPopup.close()
 				this.$refs.showPopup.close()
 				uni.redirectTo({
 				uni.redirectTo({
 					url: '/pages/storeManage/storeAuth'
 					url: '/pages/storeManage/storeAuth'
 				})
 				})
 			},
 			},
+			// 联系经销商
 			callPhone() {
 			callPhone() {
 				if(this.dealerPhone!=''){
 				if(this.dealerPhone!=''){
 					uni.makePhoneCall({
 					uni.makePhoneCall({
@@ -409,6 +420,7 @@
 					})
 					})
 				}
 				}
 			},
 			},
+			// 查看产品图片
 			viewImg(item){
 			viewImg(item){
 				uni.previewImage({
 				uni.previewImage({
 					urls: [item.images]
 					urls: [item.images]
@@ -690,6 +702,7 @@
 					// 未认证
 					// 未认证
 					if(!this.storeApply || this.storeApply&&(!this.storeApply.auditStatus || this.storeApply.auditStatus == 'REFUSE')){
 					if(!this.storeApply || this.storeApply&&(!this.storeApply.auditStatus || this.storeApply.auditStatus == 'REFUSE')){
 						this.$refs.showPopup.open()
 						this.$refs.showPopup.open()
+						this.hideFooter = true
 					}
 					}
 					// 认证通过
 					// 认证通过
 					if(this.storeApply&&this.storeApply.auditStatus=='WAIT'){
 					if(this.storeApply&&this.storeApply.auditStatus=='WAIT'){
@@ -894,7 +907,7 @@
 		background-color: #fff;
 		background-color: #fff;
 		align-items: center;
 		align-items: center;
 		justify-content: space-between;
 		justify-content: space-between;
-		z-index: 1000;
+		z-index: 10;
 		position: fixed;
 		position: fixed;
 		width: 100%;
 		width: 100%;
 		left: 0;
 		left: 0;

+ 7 - 2
pagesB/cart/index.vue

@@ -52,7 +52,8 @@
 						<view class="cart-footer-left">
 						<view class="cart-footer-left">
 								<view class="cart-footer-left-all" @click="chooseAll">
 								<view class="cart-footer-left-all" @click="chooseAll">
 									<view class="cart-footer-left-all-icon">
 									<view class="cart-footer-left-all-icon">
-										<uni-icons :type="allChecked?'checkbox-filled':'circle'" size="24" :color="allChecked?'#dd0000':'#666'"></uni-icons>
+										<uni-icons v-if="allDisabled" type="circle-filled" size="24" color="#999"></uni-icons>
+										<uni-icons v-else :type="allChecked?'checkbox-filled':'circle'" size="24" :color="allChecked?'#dd0000':'#666'"></uni-icons>
 										<!-- <image style="width: 24px;height: 24px;" mode="aspectFill" :src="'../static/'+(allChecked?'round_check_fill':'round')+'.png'"></image> -->
 										<!-- <image style="width: 24px;height: 24px;" mode="aspectFill" :src="'../static/'+(allChecked?'round_check_fill':'round')+'.png'"></image> -->
 									</view>
 									</view>
 									<view class="cart-footer-left-all-text">
 									<view class="cart-footer-left-all-text">
@@ -133,6 +134,9 @@
 			...mapState(['hasLogin']),
 			...mapState(['hasLogin']),
 			userInfo(){
 			userInfo(){
 				return this.$store.state.vuex_userInfo
 				return this.$store.state.vuex_userInfo
+			},
+			allDisabled(){
+				return this.list.every(item => item.status==0||item.dealerScopeFlag==0)
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
@@ -173,7 +177,8 @@
 							productCode: key.productEntity.code,
 							productCode: key.productEntity.code,
 							productOrigCode: key.productEntity.origCode,
 							productOrigCode: key.productEntity.origCode,
 							unit: key.productEntity.unit,
 							unit: key.productEntity.unit,
-							status: key.status
+							status: key.status,
+							dealerScopeFlag: key.dealerScopeFlag
 						})
 						})
 				  })
 				  })
 				  _this.list.push(ret)
 				  _this.list.push(ret)

+ 3 - 1
pagesB/cart/productitem.vue

@@ -6,12 +6,14 @@
 		>
 		>
 			<view class="choose-product-item-check" @click="checkItem(item.cartSn)">
 			<view class="choose-product-item-check" @click="checkItem(item.cartSn)">
 				<!-- <image style="width: 24px;height: 24px;" mode="aspectFill" :src="'../static/'+(item.checked?'round_check_fill':'round')+'.png'"></image> -->
 				<!-- <image style="width: 24px;height: 24px;" mode="aspectFill" :src="'../static/'+(item.checked?'round_check_fill':'round')+'.png'"></image> -->
-				<uni-icons :type="item.checked?'checkbox-filled':'circle'" size="24" :color="item.checked?'#dd0000':'#666'"></uni-icons>
+				<uni-icons v-if="item.status==0||item.dealerScopeFlag==0" type="circle-filled" size="24" color="#999"></uni-icons>
+				<uni-icons v-else :type="item.checked?'checkbox-filled':'circle'" size="24" :color="item.checked?'#dd0000':'#666'"></uni-icons>
 			</view>
 			</view>
 			 <view>
 			 <view>
 				 <view class="choose-product-item-img">
 				 <view class="choose-product-item-img">
 					<image mode="aspectFit" :src="item.productImage+'?x-oss-process=image/resize,p_30'" style="width: 100%;height: 180rpx;"></image>
 					<image mode="aspectFit" :src="item.productImage+'?x-oss-process=image/resize,p_30'" style="width: 100%;height: 180rpx;"></image>
 					<view class="back-price xiajia" v-if="item.status==0">下架</view>
 					<view class="back-price xiajia" v-if="item.status==0">下架</view>
+					<view class="back-price xiajia" v-if="item.dealerScopeFlag==0">售罄</view>
 					<view class="choose-product-item-left-info-code">
 					<view class="choose-product-item-left-info-code">
 						<text max-lines="1" overflow="ellipsis">{{item.productCode}}</text>
 						<text max-lines="1" overflow="ellipsis">{{item.productCode}}</text>
 					</view>
 					</view>

+ 5 - 0
pagesB/shopiing/searchProduct.vue

@@ -224,6 +224,11 @@
 							// 追加数据
 							// 追加数据
 							this.list.push(ret)
 							this.list.push(ret)
 						}
 						}
+					}else{
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
 					}
 					}
 				})
 				})
 			},
 			},

二进制
static/banner1.png


二进制
static/banner2.png


+ 4 - 4
store/index.js

@@ -82,10 +82,10 @@ const store = new Vuex.Store({
 				'midButton': false
 				'midButton': false
 			},
 			},
 			{
 			{
-				"pagePath": "/pages/videos/index",
-				"iconPath": "/static/tab/tab_video_normal.png",
-				"selectedIconPath": "/static/tab/tab_video_pressed.png",
-				"text": "视频",
+				"pagePath": "/pages/cart/index",
+				"iconPath": "/static/tab/tab_cart_normal.png",
+				"selectedIconPath": "/static/tab/tab_cart_pressed.png",
+				"text": "购物车",
 				'customIcon': false,
 				'customIcon': false,
 			},
 			},
 			{
 			{