From a391cc6f8af72c2d645ef1a82cfd72be710b795c Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 25 Dec 2023 11:56:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E4=BE=9B=E8=B4=A7?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/nongKe/cloud_entrepot/indexOther.vue |  4 ++-
 pages/product/list/index.vue               | 34 ++++++++++++++++++++--
 pages/store/settled/index.vue              |  2 --
 pages/users/supply_procurement/index.vue   | 23 ++++++++++-----
 4 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/pages/nongKe/cloud_entrepot/indexOther.vue b/pages/nongKe/cloud_entrepot/indexOther.vue
index 3f319dd..36330a7 100644
--- a/pages/nongKe/cloud_entrepot/indexOther.vue
+++ b/pages/nongKe/cloud_entrepot/indexOther.vue
@@ -12,7 +12,7 @@
               <i class="iconfont icon-xiangzuo" style="font-size: 31.54rpx;text-align: left;" @click='backjJump'></i>
               <view class=""
                 style="font-size: 31.54rpx;font-weight: 700;margin-left: 20rpx;color: #F84221;">
-                供货采购商品
+                {{nav_title}}
               </view>
               <!-- <view class=""
                 @click="navGoto(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)"
@@ -227,6 +227,7 @@
     data() {
       return {
         domain: HTTP_REQUEST_URL,
+        nav_title: '供货采购商品',
         defaInd: [0, 0],
         columnData: [],
         showSerch: false,
@@ -327,6 +328,7 @@
     async onLoad(options) {
       // console.log(options);
       this.storeParam.sys_labels = options.value;
+      if(options.value==12)this.nav_title = '赊账进货'
       this.tips = options.tips;
       let userInfo = this.$store.state.app.userInfo;
       if(typeof userInfo == 'string') this.userInfoData = JSON.parse(userInfo);
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 7e39175..103b7a4 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -111,6 +111,12 @@
 									<text class="num">库存: {{item.stock}}</text>
 									<text class="num">销量: {{item.sales}}</text>
 								</view>
+                <view class="stock_type">
+                	<view class="type_btn btn_a">现货现款</view>
+                	<view class="type_btn">赊账进货</view>
+                	<view class="type_btn">线上铺货</view>
+                	<view class="type_btn">线下铺货</view>
+                </view>
 								<view class='money-wrap'>
 									<block v-if="mer_info.type_code=='TypeSupplyChain'">
                     <block v-if="item.attrValue[0]">
@@ -951,7 +957,11 @@
 				position: relative;
 				flex: 1;
 				min-width: 0;
-				padding: 10rpx 10rpx 20rpx 30rpx;
+				padding: 0 10rpx 0 20rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
+        min-height: 150rpx;
 
 				.name {
 					color: #282828;
@@ -978,9 +988,27 @@
 					line-height: 28rpx;
 					margin-right: 8rpx;
 				}
+        
+        .stock_type{
+          display: flex;
+          margin-top: 10rpx;
+          font-size: 20rpx;
+					color: #868686;
+          flex-wrap: wrap;
+          .type_btn{
+            border: 2rpx solid #868686;
+            margin-right: 15rpx;
+            padding: 2rpx 10rpx 3rpx 10rpx;
+            border-radius: 40rpx;
+          }
+          .btn_a{
+            border: 2rpx solid #F84221;
+            color: #F84221;
+          }
+        }
 
 				.money-wrap {
-					margin-top: 20rpx;
+					margin-top: 5rpx;
 
 					.price {
 						font-size: 30rpx;
@@ -996,7 +1024,7 @@
 				}
 
 				.sales {
-					margin-top: 20rpx;
+					margin-top: 5rpx;
 					color: #868686;
 					font-size: 22rpx;
 
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 2370a6b..87f83a2 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -493,7 +493,6 @@
 			// 获取历史提交数据详情
 			getGoodsDetails(id) {
 				getGoodsDetails(id).then(res => {
-					console.log(res);
 					let arr = Object.keys(this.merchantData)
 					let resData = res.data
 					arr.map(item => {
@@ -509,7 +508,6 @@
 						this.street_id = resData.street_id
 						this.mer_storeType = resData.mer_storeType
 						this.village_id = resData.village_id
-
 					})
 					this.pics = resData.images
 					this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue
index edd0bf5..bb91618 100644
--- a/pages/users/supply_procurement/index.vue
+++ b/pages/users/supply_procurement/index.vue
@@ -23,11 +23,11 @@
     :key="item.value"
     	@click="navigator(`/pages/nongKe/cloud_entrepot/${item.name=='现款现货'?'indexb':'indexOther'}?type_id=12&value=${item.value}&tips=${item.content}`)">
     	<image class="con_img" :src="item.bg" mode=""></image>
-    	<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
     	<view class="con_text">
     		<h3>{{item.name}}</h3>
-    		<span>{{item.content}}</span>
+    		<view>{{item.content}}</view>
     	</view>
+    	<image class="con_ico" :src="item.icon" mode=""></image>
     </view>
 	</view>
 </template>
@@ -54,21 +54,25 @@
             if(item.name=='线上铺货'){
               item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/71e06202312151146467207.png';
               item.content = '线上选品 一键铺货';
+              item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e5ce2202312251013084460.png";
             }
             if(item.name=='实体铺货'){
               item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/8cb7a202312151147485701.png';
               item.content = '先售利润 后结货款';
+              item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0c441202312251013392852.png";
             }
             if(item.name=='现款现货'){
               item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f4521202312151148087081.png';
               item.content = '先付款 后发货';
+              item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0a377202312251014023667.png";
             }
             if(item.name=='赊账进货'){
               item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/899a4202312151148319478.png';
               item.content = '先发货 后付款';
+              item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/6a23e202312251014183019.png";
             }
           })
-		  res.data = res.data.filter(item=>item.name!='线上铺货'&&item.name!='实体铺货')
+          res.data = res.data.filter(item=>item.name!='线上铺货'&&item.name!='实体铺货')
           this.list = res.data;
         })
       },
@@ -104,17 +108,22 @@
 
 			.con_ico {
 				position: absolute;
-				left: 15px;
-				top: 32px;
+				right: 15px;
+				top: 50%;
+        transform: translateY(-50%);
 				width: 31px;
 				height: 32px;
 			}
 
 			.con_text {
 				position: absolute;
-				left: 55px;
-				top: 20px;
+        left: 15px;
+				top: 50%;
+        transform: translateY(-50%);
 				color: white;
+        view{
+          margin-top: 12rpx;
+        }
 			}
 		}
 	}