Merge remote-tracking branch 'origin/dev' into dev

sub-operation-service/src/apis/agricultural.js

@@ -12,7 +12,7 @@ export function transaction(params = {}) {
 
 //获取农资列表数据
 export function agriculturalList(params) {
-  return request('goods/goodInfoManage/transactionGoodInfo', {
+  return request('goods/goodInfoManage/transactionGoodInfo?type=1', {
     method: 'GET',
     params,
   });

sub-operation-service/src/apis/brand.js

@@ -1,5 +1,6 @@
 // src/apis/brand.js
 import axios from '@/utils/axios';
+import request from '@/utils/axios.js';
 
 export const getProducts = (params) => {
   return axios.get('/api/brand/products', {
@@ -19,3 +20,10 @@ export const getMonitorList = () => {
     apisType: 'mock',
   });
 };
+
+export function brandList(params) {
+  return request('brand/brandbase/page?status=1&auditStatus=2', {
+    method: 'GET',
+    params,
+  });
+}

sub-operation-service/src/apis/supplier.js

@@ -12,7 +12,7 @@ export function transaction(params = {}) {
 
 //获取农资列表数据
 export function agriculturalList(params) {
-  return request('goods/goodInfoManage/transactionGoodInfo', {
+  return request('goods/goodInfoManage/transactionGoodInfo?type=2', {
     method: 'GET',
     params,
   });

sub-operation-service/src/apis/warehouseLogistics.js

@@ -0,0 +1,9 @@
+import request from '@/utils/axios';
+
+// 获取仓储查询数据
+export function warehouseList(params = {}) {
+  return request('logistics/logisticwarehouse/page?status=1', {
+    method: 'GET',
+    params,
+  });
+}

sub-operation-service/src/views/brand/components/ApplyList.vue

@@ -3,9 +3,9 @@
     <el-col v-for="product in products" :key="product.id" :span="6">
       <el-card class="box-card" :body-style="{ padding: '8px', height: '100%' }">
         <div class="flex-column">
-          <img :src="getAssetsFile(product.imageUrl)" alt="商品图" class="img" />
+          <img :src="product.imgPath" alt="商品图" class="img" />
           <div class="flex-1 flex-around">
-            <p>{{ product.name }}</p>
+            <p>{{ product.title }}</p>
             <el-button type="success" class="button" @click="gotoApplication(product.id)">我要申请</el-button>
           </div>
         </div>
@@ -16,9 +16,10 @@
 
 <script setup>
 import { ref, onMounted } from 'vue';
-import { getApplyList } from '@/apis/brand';
+import { getApplyList, brandList } from '@/apis/brand';
 import { getAssetsFile } from '@/utils/index.js';
 import { useRouter } from 'vue-router';
+import { ElMessage } from 'element-plus';
 const router = useRouter();
 
 const products = ref([]);
@@ -46,10 +47,21 @@ function data() {
   products.value = applyData;
 }
 
+function getApplyData() {
+  brandList().then((res) => {
+    console.log(res);
+    if (res.code === 200) {
+      products.value = res.data.records;
+    } else {
+      ElMessage.error(res.errmsg);
+    }
+  });
+}
+
 // 组件挂载时获取数据
 onMounted(() => {
-  // getApplyList;
-  data();
+  getApplyData();
+  // data();
 });
 </script>
 

sub-operation-service/src/views/ecommerce/agriculturalDetail.vue

@@ -4,7 +4,9 @@
       <template #main>
         <div class="agricultural-detail-info">
           <div class="top-title">
-            <div class="father-title" @click="toBack(-1)">农资交易</div>
+            <div class="father-title" @click="toBack(-1)">
+              <el-icon><ArrowLeftBold /></el-icon>农资交易
+            </div>
             <div class="current-title">查看详情</div>
           </div>
 
@@ -76,68 +78,69 @@
               </div>
 
               <div class="tab-content">
-                <div v-if="tabVal == 'detail'" class="content-detail">
-                  <!--                  <el-descriptions class="detail-des" title=" " :column="2" size="Large" border>-->
-                  <!--                    <el-descriptions-item>-->
-                  <!--                      <template #label>-->
-                  <!--                        <div class="cell-item">品牌</div>-->
-                  <!--                      </template>-->
-                  <!--                      <span>遇合堂</span>-->
-                  <!--                    </el-descriptions-item>-->
-                  <!--                    <el-descriptions-item>-->
-                  <!--                      <template #label>-->
-                  <!--                        <div class="cell-item">系列</div>-->
-                  <!--                      </template>-->
-                  <!--                      <span>农用百货</span>-->
-                  <!--                    </el-descriptions-item>-->
-                  <!--                    <el-descriptions-item>-->
-                  <!--                      <template #label>-->
-                  <!--                        <div class="cell-item">型号</div>-->
-                  <!--                      </template>-->
-                  <!--                      <span>禽畜药</span>-->
-                  <!--                    </el-descriptions-item>-->
-                  <!--                    <el-descriptions-item>-->
-                  <!--                      <template #label>-->
-                  <!--                        <div class="cell-item">产地</div>-->
-                  <!--                      </template>-->
-                  <!--                      <span>中国大陆</span>-->
-                  <!--                    </el-descriptions-item>-->
-                  <!--                    <el-descriptions-item>-->
-                  <!--                      <template #label>-->
-                  <!--                        <div class="cell-item">省份</div>-->
-                  <!--                      </template>-->
-                  <!--                      <span>云南省</span>-->
-                  <!--                    </el-descriptions-item>-->
-                  <!--                    <el-descriptions-item>-->
-                  <!--                      <template #label>-->
-                  <!--                        <div class="cell-item">城市</div>-->
-                  <!--                      </template>-->
-                  <!--                      <span>昆明市</span>-->
-                  <!--                    </el-descriptions-item>-->
-                  <!--                    <el-descriptions-item>-->
-                  <!--                      <template #label>-->
-                  <!--                        <div class="cell-item">储存条件</div>-->
-                  <!--                      </template>-->
-                  <!--                      <span>常温</span>-->
-                  <!--                    </el-descriptions-item>-->
-                  <!--                    <el-descriptions-item>-->
-                  <!--                      <template #label>-->
-                  <!--                        <div class="cell-item">包装方式</div>-->
-                  <!--                      </template>-->
-                  <!--                      <span>盒装</span>-->
-                  <!--                    </el-descriptions-item>-->
-                  <!--                    <el-descriptions-item>-->
-                  <!--                      <template #label>-->
-                  <!--                        <div class="cell-item">净含量</div>-->
-                  <!--                      </template>-->
-                  <!--                      <span>250ml、500ml、750ml、1000ml</span>-->
-                  <!--                    </el-descriptions-item>-->
-                  <!--                    <el-descriptions-item>-->
-                  <!--                      <template #label>-->
-                  <!--                        <div class="cell-item">使用方式</div>-->
-                  <!--                      </template>-->
-                  <!--                      <span>饲喂</span>-->
-                  <!--                    </el-descriptions-item>-->
+                <div v-if="tabVal === 'detail'" class="content-detail">
+                  <div v-if="showDetail">
+                    <el-descriptions class="detail-des" title=" " :column="2" size="Large" border>
+                      <el-descriptions-item>
+                        <template #label>
+                          <div class="cell-item">品牌</div>
+                        </template>
+                        <span>童涵春堂</span>
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template #label>
+                          <div class="cell-item">系列</div>
+                        </template>
+                        <span>农用百货</span>
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template #label>
+                          <div class="cell-item">型号</div>
+                        </template>
+                        <span>种子种苗</span>
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template #label>
+                          <div class="cell-item">产地</div>
+                        </template>
+                        <span>耿马县</span>
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template #label>
+                          <div class="cell-item">省份</div>
+                        </template>
+                        <span>云南省</span>
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template #label>
+                          <div class="cell-item">城市</div>
+                        </template>
+                        <span>临沧市</span>
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template #label>
+                          <div class="cell-item">储存条件</div>
+                        </template>
+                        <span>15~25℃（避免高温或冷冻）</span>
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template #label>
+                          <div class="cell-item">包装方式</div>
+                        </template>
+                        <span>盒装</span>
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template #label>
+                          <div class="cell-item">净含量</div>
+                        </template>
+                        <span>50g、100g、250g、500g</span>
+                      </el-descriptions-item>
+                      <el-descriptions-item>
+                        <template #label>
+                          <div class="cell-item">使用方式</div>
+                        </template>
+                        <span>种植</span>
+                      </el-descriptions-item>
                       <!--                      <el-descriptions-item>-->
                       <!--                        <template #label>-->
                       <!--                          <div class="cell-item">厂名</div>-->
@@ -156,8 +159,8 @@
                       <!--                        </template>-->
                       <!--                        <span>7天</span>-->
                       <!--                      </el-descriptions-item>-->
-                  <!--                  </el-descriptions>-->
-                  <!--                  <el-image :src="getAssetsFile('images/ecommerce/' + 'goods.png')?.href ?? ''" fit="cover" />-->
+                    </el-descriptions>
+                  </div>
                   <div style="display: flex; justify-content: center; flex-wrap: wrap">
                     <el-image
                       v-for="(item, index) in mockData[currentIndex].bigImages"
@@ -212,7 +215,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 const route = useRoute();
 const router = useRouter();
-const goodId = route.params.id; // 获取参数
+const goodId = route.query.id; // 获取参数
 const pId = route.query.pid;
 
 let bannerList = reactive(['images/ecommerce/' + 'banner.png', 'images/ecommerce/' + 'banner.png']);
@@ -223,6 +226,7 @@ const tabList = reactive([
 ]);
 
 const currentIndex = ref(0);
+const showDetail = ref(true);
 
 const mockData = [
   {
@@ -305,6 +309,66 @@ const mockData = [
     images: ['images/mockPic/nyTop.png'],
     bigImages: ['nyBottom1.png', 'nyBottom2.png', 'nyBottom3.png', 'nyBottom4.png'],
   },
+  {
+    titleName: '铁皮石斛种子',
+    sold: 13,
+    price: '80/g',
+    soldAddress: '耿马县',
+    right: '七天保价',
+    weight: ['1g', '2g', '5g', '10g'],
+    images: ['images/mockPic/shihuTop.png'],
+    bigImages: ['shihuBottom0.png', 'shihuBottom1.png', 'shihuBottom2.png', 'shihuBottom3.png'],
+  },
+  {
+    titleName: '黑皮甘蔗苗',
+    sold: 1400,
+    price: '0.7/株',
+    soldAddress: '耿马县',
+    right: '七天保价',
+    weight: ['10株', '50株', '200株', '500株'],
+    images: ['images/mockPic/ganzheTop.png'],
+    bigImages: ['ganzheBottom0.png', 'ganzheBottom1.png', 'ganzheBottom2.png', 'ganzheBottom3.png'],
+  },
+  {
+    titleName: '美人椒种子 -辣椒种子',
+    sold: 548,
+    price: '43/斤',
+    soldAddress: '耿马县',
+    right: '七天保价',
+    weight: ['1斤', '2斤'],
+    images: ['images/mockPic/chiliTop.png'],
+    bigImages: ['chiliBottom0.png', 'chiliBottom1.png', 'chiliBottom2.png', 'chiliBottom3.png'],
+  },
+  {
+    titleName: '四季青种子',
+    sold: 548,
+    price: '19.5/包',
+    soldAddress: '耿马县',
+    right: '七天保价',
+    weight: ['1包（500-2000粒）', '2包', '4包'],
+    images: ['images/mockPic/leafyTop.png'],
+    bigImages: ['leafyBottom0.png', 'leafyBottom1.png', 'leafyBottom2.png'],
+  },
+  {
+    titleName: '青花菜种子',
+    sold: 548,
+    price: '10/包',
+    soldAddress: '耿马县',
+    right: '七天保价',
+    weight: ['1包（300-800粒）', '2包', '4包'],
+    images: ['images/mockPic/broccoliTop.png'],
+    bigImages: ['broccoliBottom2.png', 'broccoliBottom1.png', 'broccoliBottom0.png'],
+  },
+  {
+    titleName: '黑叶小白菜种子',
+    sold: 82,
+    price: '60/公斤',
+    soldAddress: '耿马县',
+    right: '七天保价',
+    weight: ['1公斤', '2公斤', '5公斤'],
+    images: ['images/mockPic/choyTop.png'],
+    bigImages: ['choyBottom0.png', 'choyBottom1.png', 'choyBottom2.png', 'choyBottom3.png'],
+  },
 ];
 
 let tabVal = ref('detail');
@@ -313,6 +377,7 @@ let saveInfo = reactive({
   num: 0,
 });
 onMounted(() => {
+  showDetail.value = false;
   const num = Number(pId);
   if (num === 55) {
     // 1. 获取前四个元素的索引（0, 1, 2, 3）
@@ -336,6 +401,22 @@ onMounted(() => {
     // 3. 选择第一个
     currentIndex.value = shuffledIndices.slice(0, 1)[0];
   }
+  if (Number(goodId) === 2140012566 || Number(goodId) === 2140012569) {
+    currentIndex.value = 8;
+    showDetail.value = true;
+  } else if (Number(goodId) === 2140012546 || Number(goodId) === 2140012547) {
+    currentIndex.value = 9;
+  } else if (Number(goodId) === 2140012562) {
+    currentIndex.value = 2;
+  } else if (Number(goodId) === 2140012563) {
+    currentIndex.value = 10;
+  } else if (Number(goodId) === 2140012586) {
+    currentIndex.value = 11;
+  } else if (Number(goodId) === 2140012587) {
+    currentIndex.value = 12;
+  } else if (Number(goodId) === 2140012588) {
+    currentIndex.value = 13;
+  }
 });
 
 const toCodeDetail = () => {

sub-operation-service/src/views/ecommerce/components/filtertop.vue

@@ -115,7 +115,7 @@ const selectItem = (index, key, item) => {
   if (key && item.id) {
     currentLevel.value = index || 0;
     select[key] = { id: item.id, parentId: item.parentId ? item.parentId : null };
-    emit('select', select);
+    emit('select', { id: item.id });
   }
 };
 

sub-operation-service/src/views/ecommerce/components/goodsItem.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="goods-name txt-ellipsis clamp2">{{ data.title }}</div>
     <div class="goods-do">
-      <div class="price txt-ellipsis clamp">{{ data.goodPrice }}</div>
+      <div class="price txt-ellipsis clamp">{{ data.goodPrice }}/{{ data.unit }}</div>
       <div class="do">
         <div class="iconfont icon-cart"></div>
       </div>

sub-operation-service/src/views/ecommerce/index.vue

@@ -119,19 +119,20 @@ let bannerList = reactive(['images/ecommerce/' + 'banner.png', 'images/ecommerce
 
 const selected = (data) => {
   // 获取所有值并转为数组
-  const val = Object.values(data);
+  // const val = Object.values(data);
   console.log(data);
-  if (val.length === 1) {
-    params.parentId = val[0].id;
-  } else {
-    if (val[0].id === '') {
-      params.childrenId = '';
-      params.parentId = null;
-    } else {
-      params.childrenId = val[val.length - 1].id;
-      params.parentId = val[val.length - 1].parentId;
-    }
-  }
+  params.categoryId = data.id;
+  // if (val.length === 1) {
+  //   params.parentId = val[0].id;
+  // } else {
+  //   if (val[0].id === '') {
+  //     params.childrenId = null;
+  //     params.parentId = null;
+  //   } else {
+  //     params.childrenId = val[val.length - 1].id;
+  //     params.parentId = val[val.length - 1].parentId;
+  //   }
+  // }
   getList();
 };
 </script>

sub-operation-service/src/views/ecommerce/supplier.vue

@@ -228,19 +228,20 @@ const getTree = () => {
 
 const selected = (data) => {
   console.log(data);
+  params.categoryId = data.id;
   // 获取所有值并转为数组
-  const val = Object.values(data);
-  if (val.length === 1) {
-    params.parentId = Number(val[0].id);
-  } else {
-    if (val[0].id === '') {
-      params.childrenId = '';
-      params.parentId = null;
-    } else {
-      params.childrenId = Number(val[val.length - 1].id);
-      params.parentId = Number(val[val.length - 1].parentId);
-    }
-  }
+  // const val = Object.values(data);
+  // if (val.length === 1) {
+  //   params.parentId = Number(val[0].id);
+  // } else {
+  //   if (val[0].id === '') {
+  //     params.childrenId = '';
+  //     params.parentId = null;
+  //   } else {
+  //     params.childrenId = Number(val[val.length - 1].id);
+  //     params.parentId = Number(val[val.length - 1].parentId);
+  //   }
+  // }
   getList();
 };
 </script>

sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue

@@ -5,11 +5,11 @@
       <template #main>
         <el-card shadow="none" style="border-radius: 14px">
           <div class="tabs">
-            <div class="tab" style="color: rgba(153, 153, 153, 1)">仓储分类({{ data.title }})</div>
+            <div class="tab" style="color: rgba(153, 153, 153, 1)">仓储分类</div>
             <div class="tab cursor" :class="{ active: currentTab === 0 }" @click.stop="currentTab = 0">普通仓库</div>
-            <div class="tab cursor" :class="{ active: currentTab === 1 }" @click.stop="currentTab = 1">恒温仓库</div>
+            <!--            <div class="tab cursor" :class="{ active: currentTab === 1 }" @click.stop="currentTab = 1">恒温仓库</div>-->
             <div class="tab cursor" :class="{ active: currentTab === 2 }" @click.stop="currentTab = 2">冷库</div>
-            <div class="tab cursor" :class="{ active: currentTab === 3 }" @click.stop="currentTab = 3">气调仓库</div>
+            <!--            <div class="tab cursor" :class="{ active: currentTab === 3 }" @click.stop="currentTab = 3">气调仓库</div>-->
             <div class="tab">&nbsp;</div>
           </div>
         </el-card>
@@ -18,28 +18,40 @@
             <el-card class="storage-card" shadow="hover">
               <div class="storage-content">
                 <div class="storage-content-top" @click="toLink(item)">
-                  <el-image :src="item.imageUrl" fit="cover" class="storage-image" />
+                  <el-image :src="item.imgPath" fit="cover" class="storage-image" />
                   <div class="storage-info">
-                    <h3 class="storage-title">{{ item.title }}</h3>
+                    <h3 class="storage-title">{{ item.name }}</h3>
                     <div class="storage-desc">
-                      <span>{{ item.description }}</span>
+                      <span>{{ item.parentTitle }}</span>
                       <img :src="getAssetsFile('images/warehouseLogistics/认证.png')" alt="" style="width: 20px" />
                       <img :src="getAssetsFile('images/warehouseLogistics/优先级.png')" alt="" style="width: 20px" />
                     </div>
                     <div class="storage-tags">
-                      <el-tag effect="plain" round style="background-color: rgba(37, 191, 130, 0.2); color: #25bf82">延长仓储</el-tag>
-                      <el-tag effect="plain" round style="background-color: rgba(37, 191, 130, 0.2); color: #25bf82">保鲜储存</el-tag>
+                      <el-tag
+                        v-for="(tags, indexT) in item.tag"
+                        :key="indexT"
+                        effect="plain"
+                        round
+                        style="background-color: rgba(37, 191, 130, 0.2); color: #25bf82"
+                      >
+                        {{ tags }}
+                      </el-tag>
+                      <!--  <el-tag effect="plain" round style="background-color: rgba(37, 191, 130, 0.2); color: #25bf82">保鲜储存</el-tag>-->
                     </div>
                     <div class="storage-location">
                       <el-icon><Location /></el-icon>
-                      {{ item.location }}
+                      {{ item.address }}
                     </div>
                   </div>
                 </div>
                 <div class="storage-price">
                   <div class="storage-price-left">
                     <span class="price-label">报价</span>
-                    <span class="price-amount">¥{{ item.price }}/间/月</span>
+                    <span class="price-amount"
+                      >¥{{ item.price }}/{{ item.priceSpec === 1 ? 'm³' : item.priceSpec === 2 ? '间' : item.priceSpec === 3 ? '㎡' : '' }}/{{
+                        item.timeSpec === 1 ? '天' : item.timeSpec === 2 ? '月' : item.timeSpec === 3 ? '年' : ''
+                      }}
+                    </span>
                   </div>
                   <el-button type="success" class="contact-btn">
                     <img :src="getAssetsFile('images/warehouseLogistics/messageBox.png')" alt="" style="height: 30px; margin-right: 5px" />
@@ -60,12 +72,13 @@
   </section>
 </template>
 <script setup name="page-menu">
-import { ref, reactive, watch } from 'vue';
+import { ref, reactive, watch, onMounted } from 'vue';
 import { getAssetsFile } from '@/utils';
 import { useRoute, useRouter } from 'vue-router';
+import { warehouseList } from '@/apis/warehouseLogistics.js';
 import warehouseLogisticsRoutes from '@/router/modules/warehouseLogistics';
 import Common from '../components/common.vue';
-import { useGetCommonData } from '../../../store/modules/common';
+import { useGetCommonData } from '@/store/modules/common.js';
 import { storeToRefs } from 'pinia';
 const store = useGetCommonData();
 const { data } = storeToRefs(store);
@@ -130,6 +143,18 @@ const state = reactive({
   ],
 });
 
+onMounted(() => {
+  warehouseList().then((res) => {
+    state.data = [];
+    if (res.code === 200) {
+      state.data = res.data.records;
+      for (let i in state.data) {
+        state.data[i].tag = state.data[i].tags.split(',');
+      }
+    }
+  });
+});
+
 const currentTab = ref(0);
 
 const currentChange = (current) => {
@@ -137,10 +162,10 @@ const currentChange = (current) => {
 };
 
 const toLink = (row) => {
-  router.push({
-    path: '/sub-operation-service/warehouse-detail',
-    query: { id: row?.id ?? '100' },
-  });
+  // router.push({
+  //   path: '/sub-operation-service/warehouse-detail',
+  //   query: { id: row?.id ?? '100' },
+  // });
 };
 </script>
 <style lang="scss" scoped>
@@ -149,8 +174,11 @@ const toLink = (row) => {
   line-height: 50px;
   display: flex;
   font-size: 18px;
-  justify-content: space-between;
+  justify-content: flex-start;
   padding: 0 20px;
+  .tab {
+    margin: 0 20px;
+  }
 }
 .cursor {
   cursor: pointer;