商品管理bug修复

pages/index/index.vue

@@ -858,7 +858,7 @@
 			});
 			uni.$on('diverIndexSubEmit', () => {
 				uni.navigateTo({
-					url: '/pages/product/list/index'
+					url: '/pages/product/list/index?diver=1'
 				})
 
 			})
@@ -881,7 +881,10 @@
 					let info = JSON.stringify(data)
 					that.elInfo = data
 					// #ifdef APP-PLUS
+					// if(that.userInfoData.is_newUser){
+					if (true) {
 						that.openDiver()
+					}
 					// #endif
 				})
 				.exec();

pages/index/subnvue/concat.nvue

@@ -18,7 +18,7 @@
 			<image src="/static/images/greenLine.png" style="width:35px;height: 60px;" mode=""></image>
 		</view>
 		<view class="next-btn">
-			<text class="next-btn-text font" @click="next">下一步(3/4){{isActive}} </text>
+			<text class="next-btn-text font" @click="next">下一步(3/4) </text>
 		</view>
 	</view>
 </template>
@@ -156,7 +156,7 @@
 		right: 30rpx;
 		top: 80rpx;
 		border: 1px solid white;
-		padding: 20rpx;
+		padding: 10rpx 20rpx;
 		border-radius: 30rpx;
 	}
 

pages/product/list/components/overly.vue

@@ -0,0 +1,33 @@
+<template>
+	<view class="">
+		<u-overlay :show="showOverly||(where.type==2&&flag)||(where.type==3&&flag1)">
+			<view class="warp">
+				<view class="" style='font-size: 32rpx;'>
+					温馨提示
+				</view>
+				<view class="">
+					当前商品待审核，删除后将移至回收站
+				</view>
+				<view class="warp-foot">
+					<view class="warp-foot-li">
+						<u-button text="返回" @click="showOverly = false"></u-button>
+					</view>
+					<view class="warp-foot-li">
+						<u-button type='primary' text="删除" @tap="handleRecycle(xjItem,where.type)"></u-button>
+						<u-button type='primary' text="我知道了" @tap="Iknow"></u-button>
+						<u-button type='primary' v-else text="继续下架" @tap="handleShelves(xjItem,0)"></u-button>
+					</view>
+				</view>
+			</view>
+		</u-overlay>
+	</view>
+</template>
+
+<script>
+	export default {
+
+	}
+</script>
+
+<style>
+</style>

pages/product/list/index - 副本.vue

@@ -298,9 +298,11 @@
 			}
 		},
 		onLoad(options) {
+
+
+
 			this.getUserInfo()
 			this.getCategoryList();
-
 			var that = this;
 			// 获取设备宽度
 			uni.getSystemInfo({

pages/product/list/index.vue

@@ -1,6 +1,5 @@
 <template>
 	<view style="padding-bottom: 200rpx;">
-		<button @click="openDiver">anniy</button>
 		<view class="order-index" ref="container">
 			<view class="search" style="margin-bottom: 24rpx;">
 				<u-search :showAction="true" actionText="搜索" v-model="keyword" :animation="true"
@@ -48,9 +47,15 @@
 						<view class=""
 							style="display: flex;justify-content: space-between;font-size: 28rpx;font-size: 28rpx;">
 							<view class="" style="border-right: 1px solid #CECECE;flex: 1;text-align: center;"
-								@click="showOverly=true,xjItem=item" v-if='where.type==6||where.type==5||where.type==7'>
+								@click="showOverly=true,xjItem=item"
+								v-if='where.type==6||where.type==5||where.type==7||where.type==2'>
 								删除
 							</view>
+							<view class="" v-if="where.type==2"
+								style="border-right: 1px solid #CECECE;flex: 1;text-align: center;"
+								@click="Fline(item)">
+								修改库存
+							</view>
 							<view class="" v-else style="border-right: 1px solid #CECECE;flex: 1;text-align: center;"
 								@click="Fline(item)">
 								修改库存
@@ -86,70 +91,12 @@
 							<view class="ellipsis" style="width: 650rpx;">
 								审核未通过：{{item.refusal}}
 							</view>
-							<!-- <view class="card-footer-li" style="flex: 1.5;">
-								近30天： 访客<text style="color: #FC452F;">{{item.product_visitor_number}}</text>
 						</view>
-							<view class="card-footer-li" style="flex: 1;">
-								咨询<text style="color: #FC452F;">{{item.product_consult_number}}</text>
-							</view>
-							<view class="card-footer-li" style="flex: 1;border: none;">
-								订单<text style="color: #FC452F;">{{item.product_order_number}}</text>
-							</view> -->
-						</view>
-						<!-- <view class='item' @click="yinc">
-							<view class='image'>
-								<image :src='item.image'></image>
-								<text v-if="item.spec_type == 1" class="spec">多规格</text>
-							</view>
-							<view class='text'>
-								<view class='name'>
-									<text v-if="item.is_gift_bag" class="font-org">礼包</text>
-									<text class="text_name acea-row line1">{{item.store_name}}</text>
-
-								</view>
-								<view class="sales">
-									<text class="num">库存: {{item.stock}}</text>
-								</view>
-								<view class="stock_type" v-if="mer_info.type_code=='TypeSupplyChain'">
-									<view class="type_btn" v-for="lable in lableList" :key="lable.product_label_id"
-										@click="changeLable(item)"
-										:class="{'btn_a': lable.label_name=='现款现货'||item.mer_labels&&item.mer_labels.find(item=>item.product_label_id==lable.product_label_id)}">
-										{{lable.label_name}}
-									</view>
-								</view>
-								<view class='money-wrap'>
-									<block v-if="mer_info.type_code=='TypeSupplyChain'">
-										<block v-if="item.attrValue[0]">
-											<text class='price font-color'>￥{{item.attrValue[0].wholesale_price}}</text>
-											<text class='ot_price'>零售价￥{{item.attrValue[0].price}}</text>
-										</block>
-										<text v-else class='ot_price'>商品规格错误</text>
-									</block>
-									<text v-else class='price font-color'>￥{{item.price}}</text>
 					</view>
 				</view>
 
-						</view>
+				<u-empty v-else :text=" where.type==1? '暂无出售商品，立即发布商品，让更多生意找上门':'暂无商品'" mode="data"
-
+					style="min-height: 80vh;" icon="/static/empty/goodsEmpty.png">
-						<view class="operation acea-row row-between-wrapper">
-							<view class="acea-row row-middle">
-								<view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
-									修改库存
-								</view>
-								<view v-if="item.is_show == 1 && item.status == 1" class="bnt"
-									@tap.stop="handleShelves(item,0)">下架
-								</view>
-								<view v-if="item.is_show == 0 && item.status == 1" class="bnt"
-									@tap.stop="handleShelves(item),1">上架
-								</view>
-								<view @click="editGoods(item)" class="bnt">编辑45</view>
-							</view>
-						</view> -->
-					</view>
-				</view>
-
-				<u-empty v-else text="暂无商品~" mode="data" style="min-height: 80vh;"
-					icon="http://cdn.uviewui.com/uview/empty/data.png">
 				</u-empty>
 			</view>
 			<Loading :loaded="loaded" :loading="loading"></Loading>
@@ -163,9 +110,11 @@
 				扫码入库
 			</view>
 			<view class="footer-li act fbsp" @click="handClick(3)">
-				发布商品
+				发布商品{{where.type}}
 			</view>
 		</view>
+
+		<!-- 太忙了，没时间优化 -->
 		<u-overlay :show="showOverly||(where.type==2&&flag)||(where.type==3&&flag1)">
 			<view class="warp">
 				<view class="" style='font-size: 32rpx;'>
@@ -174,7 +123,7 @@
 				<view class="" v-if='where.type==6'>
 					当前商品待审核，删除后将移至回收站
 				</view>
-				<view class="" v-else-if='where.type==5||where.type==7'>
+				<view class="" v-else-if='where.type==5||where.type==7||(where.type==2&& !flag)'>
 					确定删除吗？
 				</view>
 				<view class="" v-else-if='where.type==2'>
@@ -187,14 +136,15 @@
 					当前商品正在销售中,下架后将移至仓库
 				</view>
 				<view class="warp-foot">
-					<view class="warp-foot-li" v-if='![2,3].includes(where.type)'>
+					<view class="warp-foot-li" v-if='![2,3].includes(where.type) ||(where.type==2 && !flag)'>
 						<u-button text="返回" @click="showOverly = false"></u-button>
 					</view>
 					<view class="warp-foot-li" v-if='where.type==3&&!flag1'>
 						<u-button text="返回" @click="showOverly = false"></u-button>
 					</view>
 					<view class="warp-foot-li">
-						<u-button type='primary' v-if='where.type==6||where.type==5||where.type==7' text="删除"
+						<u-button type='primary'
+							v-if='where.type==6||where.type==5||where.type==7 ||(where.type==2&&!flag)' text="删除"
 							@tap="handleRecycle(xjItem,where.type)"></u-button>
 						<u-button type='primary' v-else-if='(where.type==2 && flag) ||(where.type==3 &&flag1)'
 							text="我知道了" @tap="Iknow"></u-button>
@@ -202,9 +152,9 @@
 					</view>
 				</view>
 			</view>
-
 		</u-overlay>
 
+
 		<u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
 			<image src="@/static/images/xianxia.png" mode="widthFix"></image>
 			<view class="popen">
@@ -301,6 +251,7 @@
 		},
 		data() {
 			return {
+				newUser: false,
 				elInfo: "",
 				current: 0,
 				flag1: true,
@@ -365,13 +316,12 @@
 			}
 		},
 		onLoad(options) {
+			this.newUser = Boolean(options.diver)
 			this.getUserInfo()
 			this.getCategoryList();
 			this.isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale == 2;
 			if (options.type) {
 				this.where.type = options.type
-				// console.log(options.type)
-				// this.tabClick = options.type
 			}
 			var that = this;
 			// 获取设备宽度
@@ -396,6 +346,7 @@
 			this.getList(this.mer_id, false);
 		},
 		onReady() {
+			if (!this.newUser) return
 			let that = this
 			const query = uni.createSelectorQuery().in(this);
 			query

pages/product/list/subnvue/concat.nvue

@@ -160,7 +160,7 @@
 		right: 30rpx;
 		top: 80rpx;
 		border: 1px solid white;
-		padding: 20rpx;
+		padding: 10rpx 20rpx;
 		border-radius: 30rpx;
 	}
 </style>