From 98dfd452f758284c90ea08467276235b9117399b Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 4 Nov 2023 18:23:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=89=8D=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                   | 68 +++++++++++++++----------
 pages/moreProject/moreProject.vue       | 16 +++---
 pages/nongKe/supply_chain/supplierA.vue | 14 ++++-
 3 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3b2edb6..e5915e4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -423,31 +423,37 @@
             name: '商品管理',
             type: 1,
             image: require('@/static/images/index7.png')
-          }, {
+          },
+          {
+            name: '入库管理',
+            type: 13,
+            image: require('@/static/images/index9.png')
+          }, 
+          {
             name: '订单管理',
             type: 2,
             image: require('@/static/images/index1.png')
           }, 
-          // {
-          //   name: '供货采购',
-          //   type: 3,
-          //   image: require('@/static/images/index4.png')
-          // },
+          {
+            name: '供货采购',
+            type: 3,
+            image: require('@/static/images/index4.png')
+          },
           // {
           //   name: '进货管理',
           //   type: 4,
           //   image: require('@/static/images/index5.png')
           // }, 
-          {
-            name: '扫码出库',
-            type: 11,
-            image: require('@/static/images/index10.png')
-          }, 
-          {
-            name: '商户设置',
-            type: 12,
-            image: require('@/static/images/index11.png')
-          }, 
+          // {
+          //   name: '扫码出库',
+          //   type: 11,
+          //   image: require('@/static/images/index10.png')
+          // }, 
+          // {
+          //   name: '商户设置',
+          //   type: 12,
+          //   image: require('@/static/images/index11.png')
+          // }, 
           {
             name: '提现管理',
             type: 5,
@@ -470,7 +476,12 @@
           name: '商品管理',
           type: 1,
           image: require('@/static/images/index7.png')
-        }, {
+        },
+        {
+          name: '入库管理',
+          type: 13,
+          image: require('@/static/images/index9.png')
+        },  {
           name: '订单管理',
           type: 2,
           image: require('@/static/images/index1.png')
@@ -486,15 +497,13 @@
           name: '订单核销',
           type: 7,
           image: require('@/static/images/index2.png')
-        }, {
-          name: '委托销售',
-          type: 9,
-          image: require('@/static/images/index6.png')
-        }, {
-          name: '委托订单',
-          type: 10,
-          image: require('@/static/images/index2.png')
-        }, {
+        },
+        {
+          name: '商户设置',
+          type: 12,
+          image: require('@/static/images/index11.png')
+        }, 
+        {
           name: '全部',
           type: 8,
           image: require('@/static/images/index3.png')
@@ -1101,6 +1110,13 @@
               			.mer_id}`
                 })
                 break;
+              case 13:
+                uni.navigateTo({
+                  url: `/pages/nongKe/gather/select_warehouse?mer_id=${this.userInfoData
+              			.service
+              			.mer_id}&stype=2`
+                })
+                break;
               default:
                 uni.navigateTo({
                   url: '/pages/moreProject/moreProject'
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 726de7e..5311aa7 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -34,16 +34,16 @@
                 <image class="icon_img" src="@/static/images/index21.png" mode="aspectFit"></image>
                 <text class="text">在售管理</text>
               </view>
-              <view class="examine"
+              <!-- <view class="examine"
 								@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
 								<image class="icon_img" src="@/static/images/index18.png" mode="aspectFit">
 									<text class="text">财务管理</text>
-							</view>
-              <!-- <view class="examine"
+							</view> -->
+              <view class="examine"
                 @click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
                 <image class="icon_img" src="@/static/images/index18.png" mode="aspectFit">
                   <text class="text">财务管理</text>
-              </view> -->
+              </view>
               <view class="examine"
                 @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
                 <image class="icon_img" src="@/static/images/index1.png" mode="aspectFit">
@@ -86,12 +86,12 @@
                 </image>
                 <text class="text">委托销售</text>
               </view> -->
-              <view class="examine" @click="navigator(`/pages/commissionedSales/receivedCommission/index?type_id=${userInfoData.mer_info.type_id}`)">
+              <view v-if="no_prod" class="examine" @click="navigator(`/pages/commissionedSales/receivedCommission/index?type_id=${userInfoData.mer_info.type_id}`)">
                 <image class="icon_img" src="@/static/images/index13.png" mode="aspectFit">
                 </image>
                 <text class="text">委托销售</text>
               </view>
-              <view class="examine" @click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
+              <view v-if="no_prod" class="examine" @click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
                 <image class="icon_img" src="@/static/images/index17.png" mode="aspectFit">
                 </image>
                 <text class="text">委托订单</text>
@@ -141,12 +141,12 @@
                   <image class="icon_img" src="@/static/images/index4.png" mode="aspectFit"></image>
                   <text class="text">供货采购</text>
                 </view> -->
-                <view v-if="no_prod" class="examine"
+                <view class="examine"
                   @click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">  
                   <image class="icon_img" src="@/static/images/index4.png" mode="aspectFit"></image>
                   <text class="text">供货采购</text>
                 </view>
-                <view v-if="no_prod" class="examine" @click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
+                <view  class="examine" @click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
                   <image class="icon_img" src="@/static/images/index5.png" mode="aspectFit"></image>
                   <text class="text">进货管理</text>
                 </view>
diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue
index b71538e..ee96914 100644
--- a/pages/nongKe/supply_chain/supplierA.vue
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -31,14 +31,16 @@
 						</view>
 
 					</view>
-          <u-tabs :list="[{name: '先款后货'},{name: '先货后款'}]" :scrollable="false" lineColor="#ff6d20" lineWidth="30" :itemStyle="{height: '88rpx'}" @change="changeTabs">
+          <u-tabs v-if="no_prod" :list="[{name: '先款后货'},{name: '先货后款'}]" :scrollable="false" lineColor="#ff6d20" lineWidth="30" :itemStyle="{height: '88rpx'}" @change="changeTabs">
           </u-tabs>
 				</view>
 				<view class="content">
-					<view class="hot_serch">
+					<view v-if="no_prod" class="hot_serch">
 						<!-- <text>热搜:</text> <text>热a搜商品</text> <text>热搜商品</text>
 							<text>热搜sasas商品</text> -->
 					</view>
+          <view v-else class="hot_serch2">
+          </view>
 
 					<!-- <view class="menu_cls">
 							<u-scroll-list>
@@ -308,6 +310,7 @@
 		},
 		data() {
 			return {
+        no_prod: false,
 				titName: "",
 				price: 0,
 				stock: 0,
@@ -901,6 +904,13 @@
 			margin: 10rpx;
 		}
 	}
+  
+  .hot_serch2{
+    padding-top: 72rpx;
+    /* #ifdef H5 */
+    padding-top: 90rpx;
+    /* #endif */
+  }
 
 	.productList .search .input {
 		flex: 1;