Merge branch 'pre-release' of https://gitea.lihaink.cn/mkm/shop-applet into pre-release

pages/index/index.vue

@@ -844,7 +844,9 @@
 		},
 
 		async onLoad() {
+			// #ifdef APP
 			this.subNVue = uni.getSubNVueById('concat')
+			// #endif
 			this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
 			await this.$onLaunched;
 			this.list1();

pages/product/list/index.vue

@@ -49,12 +49,12 @@
 								v-if='where.type==6||where.type==5||where.type==7||where.type==2'>
 								删除
 							</view>
-							<view v-if="where.type==2"
+							<view v-if="where.type==2 && where.type != 5"
 								style="border-right: 1px solid #CECECE;flex: 1;text-align: center;"
 								@click="Fline(item)">
 								修改库存
 							</view>
-							<view v-else style="border-right: 1px solid #CECECE;flex: 1;text-align: center;"
+							<view v-if="where.type!=2 && where.type != 5" style="border-right: 1px solid #CECECE;flex: 1;text-align: center;"
 								@click="Fline(item)">
 								修改库存
 							</view>
@@ -68,9 +68,12 @@
 								@click="handleShelves(item,1)">
 								上架
 							</view>
-							<view style="flex: 1;text-align: center;" @click="editGoods(item)">
+							<view v-if="where.type != 5" style="flex: 1;text-align: center;" @click="editGoods(item)">
 								编辑商品
 							</view>
+							<view v-if="where.type == 5" style="flex: 1;text-align: center;" @click="handleRestore(item)">
+								恢复
+							</view>
 						</view>
 						<view class="card-footer" v-if='where.type==1'>
 							<view class="card-footer-li" style="flex: 1.5;">
@@ -214,7 +217,8 @@
 		productRecommendApi,
 		productUpdateFree,
 		productTitle,
-		productDestory
+		productDestory,
+		productRestore
 	} from "@/api/product";
 	import {
 		labelLst
@@ -851,6 +855,26 @@
 					})
 
 
+				this.showOverly = false
+			},
+			handleRestore(item) {
+				let index = this.productList.findIndex(items => items.product_id == item.product_id)
+				let that = this
+				productRestore(that.mer_id, item.product_id)
+				.then(res => {
+					that.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					});
+					that.getList(this.mer_id, true)
+					// this.$set(this, 'num', -1);
+				})
+				.catch(rej => {
+
+					this.$set(this, 'num', -1);
+					Toast(`${rej}, 删除失败`);
+				})
+
 				this.showOverly = false
 			},
 			//下架 0