From 4f180abff363eb75e450c206a685899427cdc565 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 4 Nov 2023 17:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=A7=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/nongKe/gather/select_warehouse.vue | 43 +++++++++++++++++-------
 pages/product/list/index.vue             | 11 +++---
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 4b5d0bf..997dcde 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -196,7 +196,9 @@
   } from '@/api/api.js'
   import {
     chooseImage,
-    Toast
+    Toast,
+    getStorage,
+    navigateTo
   } from '@/libs/uniApi'
   export default {
     data() {
@@ -215,12 +217,12 @@
             // src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/saoma.png'
             src: '/static/images/SMRK/bar.png'
           },
-          // {
-          //   name: '非标扫码入库',
-          //   type: 3,
-          //   // src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/saoma.png'
-          //   src: '/static/images/SMRK/img.png'
-          // }
+          {
+            name: '非标手动入库',
+            type: 3,
+            // src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/saoma.png'
+            src: '/static/images/SMRK/img.png'
+          }
         ],
         shadowStyle: {
           backgroundImage: "none",
@@ -551,8 +553,9 @@
           this.scanCode();
           this.pageType = 1;
         }else {
-          this.photograph();
-          this.pageType = 2;
+          // this.photograph();
+          // this.pageType = 2;
+          this.jumpAddGoods();
         }
       },
       // 扫码
@@ -645,7 +648,23 @@
             this.showModel = false;
           }
         })
-      }
+      },
+      // 跳转添加商品界面
+      jumpAddGoods() {
+      	const data = getStorage('addGoodsFormData');
+      	if (data && data.product_id) {
+      		let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
+      			'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils'];
+      		waitDeleteData.forEach(item => {
+      			if (getStorage(item)) {
+      				removeStorage(item);
+      			}
+      		})
+      	}
+      	navigateTo(1, '/pages/product/addGoods/index', {
+      		mer_id: this.mer_id
+      	});
+      },
     },
     onPullDownRefresh() {
       uni.stopPullDownRefresh()
@@ -688,8 +707,8 @@
   }
 
   .select_item {
-    // width: 220.84rpx;
-    width: 336rpx;
+    width: 220.84rpx;
+    // width: 336rpx;
     height: 189.47rpx;
     border-radius: 8px;
     background-color: #eee;
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 106fdfd..09d6e29 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -9,11 +9,11 @@
 						<block>
 							<swiper-item :class="{ active: 0 == swiperCur }">
 								<view class="slide-navigator">
-									<view class="item" hover-class='none' @click="jumpAddGoods">
+									<!-- <view class="item" hover-class='none' @click="jumpAddGoods">
 										<image mode='widthFix' class="image" src="../static/images/product_add.png">
 										</image>
 										<text class="text">添加商品</text>
-									</view>
+									</view> -->
 									<navigator class="item"
 										:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`"
 										hover-class='none'>
@@ -124,9 +124,9 @@
 						</view>
 						<view class="operation acea-row row-between-wrapper">
 							<view class="acea-row row-middle">
-								<view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
+								<!-- <view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
 									线上入库
-								</view>
+								</view> -->
 								<view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
 									线下入库
 								</view>
@@ -481,8 +481,7 @@
 				const data = getStorage('addGoodsFormData');
 				if (data && data.product_id) {
 					let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
-						'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils'
-					];
+						'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils'];
 					waitDeleteData.forEach(item => {
 						if (getStorage(item)) {
 							removeStorage(item);