fix：商品模块部分接口对接

commit/order.js

@@ -205,6 +205,7 @@ export function confirmReceiptApi(id, data) {
  * @returns 
  */
 export function getPhpGlobalToken(data, merId) {
+    return ;
     return myRequestPhp({
         url: `${pre}mer/getPhpToken?${merId}`,
         method: 'POST',

commit/product.js

@@ -21,12 +21,88 @@ export function getSupplyChainTab(data) {
 /**
  * 获取供应链tab
  */
-export function getSupplyChainTab(data) {
+// export function getSupplyChainTab(data) {
+//     return myRequestPhp({
+//         url: `${pre}mer/store/product/gong_lst_filter`,
+//         method: 'GET',
+//         data,
+//         apiType
+//     })
+// }
+
+/**
+ * 供应链列表
+ * page: 1
+ limit: 20
+ keyword:
+     type: 1   2
+ spec_type: 商品规格 null 0 1
+ * @param {*} data 
+ * @returns 
+ */
+export function getSupplyChainList(data) {
     return myRequestPhp({
-        url: `${pre}mer/store/product/gong_lst_filter`,
+        url: `${pre}mer/store/product/gong_lst`,
+        method: 'GET',
+        data,
+        apiType
+    })
+}
+// 供应链修改价格
+/**
+ *{
+     "skuArr": [{
+         "sku_id": "Se88f891b5d",
+         "edit_price": "10.5"
+     }],
+     "type": 1
+ }
+ * @param {*} id 
+ * @param {*} data 
+ * @returns 
+ */
+export function editSupplyChainPrice(id,data) {
+     return myRequestPhp({
+         url: `${pre}mer/store/product/edit_price/${id}`,
+         method: 'POST',
+         data,
+         apiType
+     })
+}
+/**
+ * @description 供应链商品 -- 上下架
+ */
+export function postchangeshow(data) {
+     return myRequestPhp({
+         url: `${pre}mer/store/product/change_show`,
+         method: 'POST',
+         data,
+         apiType
+     })
+}
+
+
+
+/**商品列表    */
+
+// 商品列表tab
+
+export function getGoodsTab(data) {
+    return myRequestPhp({
+        url: `${pre}mer/store/product/lst_filter`,
         method: 'GET',
         data,
         apiType
     })
+}
+
+// 平台商品分类
+export function getGoodsClassCategory(data) {
+    return myRequestPhp({
+        url: `${pre}mer/store/category/list`,
+        method: 'GET',
+        data,
+        apiType
+    })
+}
 
-}

commit/request.js

@@ -7,7 +7,7 @@ var baseURL = 'https://api.hxxfb.com/gateway/' // API访问的地址
 	 // baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
 	 // baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
 	   baseURL = 'https://testapi.hxxfb.com/gateway/'; //预生产环境
-	//    baseURL = '/gateway/'; //预生产环境
+	   // baseURL = '/gateway/'; //预生产环境
 	
  }else{
 	  baseURL = 'https://api.hxxfb.com/gateway/'; //预生产环境

commit/requestPhp.js

@@ -70,5 +70,7 @@ export function myRequestPhp(options) {
 				uni.hideToast();
 			}
 		});
-	}).catch(() => {});
+	}).catch(() => {
+		uni.hideToast();
+	});
 };

pages/ordermanagement/index.vue

@@ -513,6 +513,7 @@ page {
       width: 30rpx;
       height: 30rpx;
       border-radius: 50%;
+      padding: 6rpx;
       background: #fe0032;
       font-size: 20rpx;
       font-weight: 400;

pages/supplychainon/ProductCard.vue

@@ -2,26 +2,35 @@
 <template>
   <view class="product-card">
     <!-- 图片容器增加背景和阴影 -->
-    <!-- <view class="image-container">
+    <view class="image-container">
       <image
         class="product-image"
         :src="data.image"
-        mode="aspectFill"
+        :webp="true"
+        v-if="data.image && !isError"
         :style="{ background: '#f5f5f5' }"
+        @error="handleError"
+      />
+      <image
+      v-else
+        class="product-image"
+        src="/static/images/new_ui/kongtu.png"
+        :webp="true"
+     
       />
       <view v-if="data.activity" class="activity-badge">
         {{ data.activity }}
       </view>
-    </view> -->
+    </view>
 
     <!-- 信息内容区域 -->
     <view class="content">
       <!-- 标题与状态开关 -->
       <view class="header">
-        <text class="title">{{ data.name }}</text>
+        <text class="title">{{ data.store_name }}</text>
         <switch
-          :checked="data.status"
-          @change="$emit('status-change', $event.detail.value)"
+          :checked="data.is_show==1?true:false"
+          @change="$emit('status-change', data)"
           class="status-switch"
         />
       </view>
@@ -30,11 +39,11 @@
       <view class="data-grid">
         <view class="data-item">
           <text class="label">售价</text>
-          <text class="value highlight">¥1000</text>
+          <text class="value highlight">¥{{data.price ||"0.00"}}</text>
         </view>
         <view class="data-item">
           <text class="label">利润</text>
-          <text class="value profit">¥33333</text>
+          <text class="value profit">¥{{data.plate_mer_profit  ||"0.00"}}</text>
         </view>
       </view>
 
@@ -43,12 +52,12 @@
         <view class="meta-item">
           <uni-icons type="shop-filled" size="30" color="#666" />
 
-          <text class="kucun">销量 555453</text>
+          <text class="kucun">销量 {{data.sales}}</text>
         </view>
         <view class="meta-item">
           <uni-icons type="shop" size="30" color="#666" />
           <text :class="{ warn: data.stock < 100 }" class="kucun"
-            >库存 45345454</text
+            >库存 {{data.stock}}</text
           >
         </view>
       </view>
@@ -73,17 +82,37 @@ export default {
       default: () => {
         return {
           image: "",
-          name: "zfgsdg",
-          price: 1110,
-          sales: 11110,
-          stock: 1110,
-          status: true,
-          profit: 0,
-          activity: "",
+          store_name: "",
+          price: 0,//商品售价
+          sales: 0,//销量
+          stock: 0,//库存
+          status: "",//商品状态
+          is_show: true,//商品状态
+          plate_mer_profit: 0,//利润
+          activity: "",//活动
         };
       },
     },
   },
+  data(){
+    return {
+      isError:false
+    }
+  },
+  methods:{
+    getFormData(image){
+      // console.log(image,"imageimage")
+      if(image){
+        return this.data.image
+      }else{
+        return "/static/images/new_ui/kongtu.png"
+      }
+    },
+    handleError(e){
+      this.isError = e.type=="error"?true:false
+      // console.log(e,"e")
+    }
+  }
 };
 </script>
 
@@ -91,7 +120,8 @@ export default {
 .product-card {
   background: #fff;
   border-radius: 24rpx;
-  margin: 24rpx 32rpx;
+  // margin: 24rpx 32rpx;
+  width: 100%;
   box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.06);
   overflow: hidden;
   display: flex;

pages/supplychainon/price-edit-modal.vue

@@ -51,7 +51,7 @@ export default {
   props: {
     minPrice: { type: Number, default: 8.75 },
     originalPrice: { type: Number, required: true },
-    goodsType: { type: String, default: 'normal' }
+    goodsType: { type: String, default: 1 }
   },
   data() {
     return {
@@ -60,12 +60,12 @@ export default {
       pensionFund: 0,
       makerProfit: 1.75,
       goodsTypes: [
-        { label: '普通商品', value: 'normal' },
-        { label: '会员商品', value: 'member' },
-        { label: '高级会员商品', value: 'vip' },
-        { label: '合伙人商品', value: 'partner' },
-        { label: '股权商品', value: 'stock' },
-        { label: '合伙人+股权商品', value: 'partner_stock' }
+        { label: '普通商品', value: 1 },
+        { label: '会员商品', value: 8 },
+        { label: '高级会员商品', value: 10 },
+        { label: '合伙人商品', value: 14 },
+        { label: '股权商品', value: 15 },
+        { label: '合伙人+股权商品', value: 16 }
       ]
     }
   },

pages/supplychainon/search/search.vue

@@ -1,96 +1,100 @@
 <template>
-	<view class="search-wrapper">
-		      <view class=" flex-row justify-end">
-		        <image
-		          class="search__image"
-		          referrerpolicy="no-referrer"
-		          src="/static/images/new_ui/search_icon_blod.png"
-		        />
-				<input class="search__input" v-model="searchValue" type="text" :placeholder="placeholder" />
-		        <button class="search__btn" @click="haandleSearch">
-		          搜索
-		        </button>
-		      </view>
-	</view>
+  <view class="search-wrapper">
+    <view class="flex-row justify-end">
+      <image
+        class="search__image"
+        referrerpolicy="no-referrer"
+        src="/static/images/new_ui/search_icon_blod.png"
+      />
+      <input
+        class="search__input"
+        v-model="searchValue"
+        type="text"
+        @input="handleInput"
+        :placeholder="placeholder"
+      />
+      <button class="search__btn" @click="haandleSearch">搜索</button>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		props:{
-			placeholder:{
-				type:String,
-				default:"请输入搜索内容"
-			}
-		},
+export default {
+  props: {
+    placeholder: {
+      type: String,
+      default: "请输入搜索内容",
+    },
+  },
 
-		data() {
-			return {
-				searchValue:""
-			};
-		},
-		methods:{
-			haandleSearch(){
-				this.$emit("search",this.searchValue)
-			}
-		}
-	}
+  data() {
+    return {
+      searchValue: "",
+    };
+  },
+  methods: {
+    haandleSearch() {
+      this.$emit("search", this.searchValue);
+    },
+    handleInput() {
+      if (!this.searchValue) {
+        this.$emit("search", this.searchValue);
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-.search-wrapper{
-	background: #FFFFFF;
-	height: 110rpx;
-	display: flex;
-	align-items: center;
-	width: 100%;
-	
-	.search__image{
-		position: absolute;
-		  width: 32rpx;
-		  height: 32rpx;
-		  left:40rpx;
-		  top:18rpx;
-	}
-	.search__input{
-		border:2rpx solid #000;
-		flex:1;
-		height: 60rpx;
-		margin-left:26rpx;
-		padding: 0 120rpx 0 55rpx;
-		border-radius: 30rpx;
-		margin-right: 20rpx;
-		border: none;
-			background: #F8F8F8;
-			font-size: 26rpx;
-			color: #333333;
-	}
-	.flex-row{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		
-	}
-	.justify-end{
-		position: relative;
-		border-radius: 30rpx;
-		    flex: 1;
-		
-		
-	}
-	.search__btn{
-		position: absolute;
-		right:20rpx;
-		width: 108rpx;
-		height: 60rpx;
-		white-space: nowrap;
-		 background-color: rgba(31, 124, 255, 1);
-		border-radius: 30rpx;
-		   text-align: center;
-		    font-size: 28rpx;
-			 line-height:60rpx;
-			 color: rgba(255, 255, 255, 1);
-			 
-	}
-	     
+.search-wrapper {
+  background: #ffffff;
+  height: 110rpx;
+  display: flex;
+  align-items: center;
+  width: 100%;
+
+  .search__image {
+    position: absolute;
+    width: 32rpx;
+    height: 32rpx;
+    left: 40rpx;
+    top: 18rpx;
+  }
+  .search__input {
+    border: 2rpx solid #000;
+    flex: 1;
+    height: 60rpx;
+    margin-left: 26rpx;
+    padding: 0 120rpx 0 55rpx;
+    border-radius: 30rpx;
+    margin-right: 20rpx;
+    border: none;
+    background: #f8f8f8;
+    font-size: 26rpx;
+    color: #333333;
+  }
+  .flex-row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+  .justify-end {
+    position: relative;
+    border-radius: 30rpx;
+    flex: 1;
+  }
+  .search__btn {
+    position: absolute;
+    right: 20rpx;
+    width: 108rpx;
+    height: 60rpx;
+    white-space: nowrap;
+    background-color: rgba(31, 124, 255, 1);
+    border-radius: 30rpx;
+    text-align: center;
+    font-size: 28rpx;
+    line-height: 60rpx;
+    color: rgba(255, 255, 255, 1);
+  }
 }
 </style>

pages/supplychainon/supplychainon.vue

@@ -10,23 +10,32 @@
         class="mt"
         :category="category"
         :curruntActive="curruntActive"
+        @tabs="tabsHandleClick"
       ></tablist>
     </view>
     <view class="content-wrapper">
-      <ProductCard class="mrb" />
-      <ProductCard class="mrb" />
-      <ProductCard class="mrb" />
-      <ProductCard class="mrb" />
-      <ProductCard class="mrb" />
-      <ProductCard class="mrb" />
-        <view
-      class=""
-      style="margin: 60rpx 0 30rpx 0; color: #999999; font-size: 26rpx"
-    >
-      —— 已经到最底部了哦 ——
+      <template v-if="list.length > 0">
+        <ProductCard
+          class="mrb"
+          v-for="(item, index) in list"
+          :key="index"
+          :data="item"
+          @status-change="handleStatusChange"
+          @edit-price="handleEditPrice"
+        />
+      </template>
+      <template v-else>
+        <emptyDataVue style="top: initial" />
+      </template>
+      <view
+        v-if="tihsi == 0 && list.length > 0"
+        class=""
+        style="margin: 0rpx 0 30rpx 0; color: #999999; font-size: 26rpx"
+      >
+        —— 已经到最底部了哦 ——
+      </view>
     </view>
-    </view>
-  
+    <priceEditModal v-if="isshow" @close="isshow=false"/>
   </view>
 </template>
 
@@ -35,48 +44,150 @@ import headerCom from "../../shop/components/headers/headers.vue";
 import searchVue from "./search/search.vue";
 import tablist from "./tablist.vue";
 import ProductCard from "./ProductCard.vue";
+import emptyDataVue from "../../shop/components/emptyData/emptyData.vue";
+import priceEditModal from './price-edit-modal.vue'
+import {
+  getSupplyChainList,
+  getSupplyChainTab,
+  postchangeshow,
+} from "@/commit/product.js";
 export default {
   components: {
     headerCom,
     searchVue,
     tablist,
     ProductCard,
+    emptyDataVue,
+    priceEditModal
   },
   data() {
     return {
+      page: 1,
+      limit: 10,
+      tihsi: "",
+      list: [],
+      keywords: "",
+      is_panudn: true,
       productData: {},
       curruntActive: 0,
-      category: [
-        {
-          type: 1,
-          name: "出售中商品",
-          count: 0,
-        },
-        {
-          type: 2,
-          name: "仓库中商品",
-          count: 0,
-        },
-      ],
+      category: [],
+      type: 1,
+      isshow:false
     };
   },
-  onLoad(options) {
-    this.curruntActive = options.indexs || "0";
+  async onLoad(options) {
+    this.curruntActive = options.indexs || options.tabIndex || "0";
+    this.type = options.type || 1;
+    await this.getSupplyChainTabData();
+    await this.getSupplyChainListData();
+  },
+  onPullDownRefresh() {
+    uni.showLoading({
+      title: "加载中",
+    });
+    this.page = 1;
+    this.is_panudn = true;
+    this.list = [];
+    this.getSupplyChainListData();
+  },
+  onReachBottom() {
+    if (this.is_panudn == true) {
+      this.page++;
+      this.getSupplyChainListData();
+    } else {
+      return;
+    }
   },
   methods: {
+    async tabsHandleClick({ index, item }) {
+      this.indexs = index;
+      this.curruntActive = index;
+      this.list = [];
+      this.type = item.type || 1;
+      this.page = 1;
+      this.is_panudn = true;
+      await this.getSupplyChainListData();
+    },
+    async getSupplyChainTabData() {
+      try {
+        const res = await getSupplyChainTab();
+        if (res.data.status === 200) {
+          this.category = res.data.data || [];
+        }
+      } catch (error) {}
+    },
+    async getSupplyChainListData() {
+      uni.showLoading({
+        title: "加载中",
+      });
+      try {
+        const res = await getSupplyChainList({
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          type: this.type,
+          spec_type: null, //商品规格 null 0 1
+        });
+        uni.stopPullDownRefresh();
+        if (res.data.status === 200) {
+          this.tihsi = res.data.data.list.length || 0;
+          console.log(this.tihsi, "this.tihsi");
+          if (res.data.data.count > 0) {
+            if (this.page == 1) {
+              this.list = res.data.data.list;
+            } else {
+              this.list = this.list.concat(res.data.data.list);
+            }
+          } else {
+            if (this.page == 1) {
+              this.list = [];
+            }
+            this.is_panudn = false;
+          }
+          uni.hideLoading();
+        }
+      } catch (error) {}
+    },
     headerJump() {
       uni.switchTab({ url: "/shop/productManagementModule/index" });
     },
-    onHandleSearch(val) {
-      console.log(val);
+    async onHandleSearch(val) {
+      this.keywords = val;
+      await this.getSupplyChainListData();
+    },
+    handleStatusChange(row) {
+      let ids = [];
+      ids.push(row.product_id);
+      uni.showLoading({
+        title: "状态更改中",
+      });
+      postchangeshow({ ids: ids, is_show: row.is_show })
+        .then((res) => {
+          if (res.data.status === 200) {
+            uni.showToast({
+              title: res.data.message,
+              icon: "none",
+            });
+            this.getSupplyChainTabData();
+            this.getSupplyChainListData();
+          }
+        })
+        .catch((err) => {
+          uni.hideLoading();
+          uni.hideToast();
+        });
     },
+   handleEditPrice(data){
+    //  this.productData = data;
+     this.isshow = true;
+   }
   },
 };
 </script>
 <style>
 page {
   background-color: #f7f8fc;
-  height: 100%;
+  /* height: 100%; */
 }
 </style>
 <style lang="scss" scoped>
@@ -89,12 +200,12 @@ page {
     z-index: 33;
   }
   .content-wrapper {
-     width: 100%;
+    width: calc(100% - 52rpx);
     height: 100%;
     display: flex;
     flex-direction: column;
     align-items: center;
-    margin: 340rpx 0rpx 0rpx;
+    margin: 340rpx 26rpx 0rpx;
     padding-bottom: 60rpx;
   }
 }

shop/afterSalesManagement/afterCardListInfo.vue

@@ -26,7 +26,12 @@
       <!-- item.product.cart_info.product -->
         <view class="order-list-yi-in-neibu-left">
           <view class="order-list-yi-in-neibu-left-img" v-if="item.product">
-            <image :src="item.product.cart_info.product.image" mode="widthFix" v-if="item.product.cart_info"></image>
+            <image :src="item.product.cart_info.product.image" @error="handleError"  mode="widthFix" v-if="item.product.cart_info && !isError"></image>
+            <image
+            v-else
+              src="/static/images/new_ui/wutu.png"
+             mode="widthFix"
+            />
           </view>
           <view class="order-list-yi-in-neibu-left-url">
             <view class="order-list-yi-in-neibu-left-url-top" v-if="item.product">
@@ -74,10 +79,15 @@ export default {
   },
   data() {
     return {
+      isError:false
     };
   },
 
   methods: {
+        handleError(e){
+      this.isError = e.type=="error"?true:false
+      console.log(e,"e",this.isError)
+    },
     formatDataValue(data,type){
       if(type === 'status'){
         return orderRefundFilter(data[type]) || ''
@@ -213,6 +223,7 @@ export default {
         .order-list-yi-in-neibu-left-url {
           // width: 290rpx;
           display: flex;
+          flex-direction: column;
           padding: 0 20rpx;
 
           .order-list-yi-in-neibu-left-url-top {

shop/afterSalesManagement/afterSalesDetail.vue

@@ -397,6 +397,7 @@ export default {
         });
       } finally {
         uni.hideLoading();
+        uni.hideToast();
       }
     },
     handleconfirmReceipt(refund_order_id) {
@@ -499,6 +500,7 @@ export default {
         }
       } finally {
         uni.hideLoading();
+        uni.hideToast();
       }
     },
 
@@ -521,6 +523,7 @@ export default {
       } catch (error) {
       } finally {
         uni.hideLoading();
+        uni.hideToast();
       }
     },
     handleDetailInfo() {

shop/afterSalesManagement/index.vue

@@ -162,7 +162,8 @@ export default {
         const res = await getAfterSaleList(params);
         uni.stopPullDownRefresh();
         if (res.data.status == 200) {
-          this.tihsi = res.data.data.count || 0;
+          this.tihsi = res.data.data.list.length || 0;
+          // this.tihsi = res.data.data.count || 0;
           if (res.data.data.count > 0) {
             if (this.page == 1) {
               this.list = res.data.data.list;

shop/commodity/components/orderDetail/orderCardDetailInfo.vue

@@ -194,6 +194,7 @@ export default {
       } catch (error) {
       } finally {
         uni.hideLoading();
+        uni.hideToast();
       }
     },
     sendGoods() {

shop/commodity/logisticsInformationDetail.vue

@@ -177,6 +177,7 @@ export default {
         uni.makePhoneCall({
           phoneNumber: value,
         });
+        uni.hideToast();
       }
     },
     formatData(data, type) {
@@ -265,6 +266,7 @@ export default {
       } catch (error) {
       } finally {
         uni.hideLoading();
+        uni.hideToast();
       }
     },
     async getLogisticData(id) {

shop/commodity/order.vue

@@ -256,7 +256,7 @@ export default {
       });
 
       getOrderList({
-        mer_id: this.mer_id,
+        // mer_id: this.mer_id,
         status: this.status,
         order_sn: "",
         order_type: -1,
@@ -275,7 +275,8 @@ export default {
         (res) => {
           uni.stopPullDownRefresh();
           if (res.data.status == 200) {
-            this.tihsi = res.data.data.count || 0;
+            // this.tihsi = res.data.data.count || 0;
+            this.tihsi = res.data.data.list.lenght || 0;
             if (res.data.data.count > 0) {
               if (this.page == 1) {
                 this.list = res.data.data.list;
@@ -317,6 +318,7 @@ export default {
       this.status = index == 0 ? null : status;
       this.indexs = index;
       this.page = 1;
+       this.list = [];
       this.is_panudn = true;
       this.orderList();
     },

shop/commodity/sendoutgoods.vue

@@ -263,6 +263,7 @@ export default {
         
       }finally{
         uni.hideLoading();
+        uni.hideToast();
       }
     },
     copyHandle(val) {

shop/department/managementadd.vue

@@ -259,4 +259,4 @@
 			line-height: 98rpx;
 		}
 	}
-</style>
+</style>

shop/productManagementModule/components/listCardInfo.vue

@@ -134,7 +134,7 @@ page {
             width: 30rpx;
             height: 30rpx;
             border-radius: 50%;
-            // padding: 5rpx 8rpx;
+            padding: 5rpx;
             background: #fe0032;
             // word-break: break-all;
             font-size: 20rpx;

shop/productManagementModule/index.vue

@@ -8,22 +8,24 @@
         headerTitle="商品列表"
         class="mb-t1"
         :cardData="dataBuss"
-		   @custom-handle-click="businessHandleClick"
+        @custom-handle-click="businessHandleClick"
       ></listCardInfo>
       <listCardInfo
         headerTitle="供应链"
         class="mb-t1"
         :cardData="onlineData"
-         @custom-handle-click="onGongyingliang"
+        @custom-handle-click="onGongyingliang"
       ></listCardInfo>
       <!-- <listCardInfo headerTitle="在线选品" class="mb-t1"></listCardInfo> -->
       <!-- <listCardInfo headerTitle="商品分类" class="mb-t1" :fullSreen="true" fullSreenTitle="商品分类列表" ></listCardInfo> -->
       <!-- <listCardInfo headerTitle="商品规格" class="mb-t1" :fullSreen="true" fullSreenTitle="商品规格列表"></listCardInfo> -->
-      <listCardInfo headerTitle="商品评价" 
-      class="mb-t1" 
-      :fullSreen="true" 
-      fullSreenTitle="商品评价列表" 
-      @custom-handle-click="onHandlePingJia"></listCardInfo>
+      <listCardInfo
+        headerTitle="商品评价"
+        class="mb-t1"
+        :fullSreen="true"
+        fullSreenTitle="商品评价列表"
+        @custom-handle-click="onHandlePingJia"
+      ></listCardInfo>
       <!-- <listCardInfo headerTitle="在线选品" class="mb-t1"></listCardInfo> -->
       <!-- <listCardInfo headerTitle="在线选品" class="mb-t1"></listCardInfo> -->
       <!-- <listCardInfo headerTitle="在线选品" class="mb-t1"></listCardInfo> -->
@@ -32,9 +34,10 @@
 </template>
 
 <script>
-import readAppInfo,{getPhpToken} from "@/utils/readAppInfo.js";
+import readAppInfo, { getPhpToken } from "@/utils/readAppInfo.js";
 import listCardInfo from "./components/listCardInfo.vue";
-import {toQueryString} from "@/utils/index.js"
+import { toQueryString } from "@/utils/index.js";
+import { getGoodsTab, getSupplyChainTab } from "@/commit/product.js";
 export default {
   components: { listCardInfo },
   data() {
@@ -43,13 +46,13 @@ export default {
         {
           type: 1,
           name: "出售中商品",
-          count: 10,
+          count: 0,
           img: "/static/images/new_ui/yijingchushou.png",
         },
         {
           type: 2,
           name: "仓库中商品",
-          count: 31,
+          count: 0,
           img: "/static/images/new_ui/cangku.png",
         },
         {
@@ -69,13 +72,13 @@ export default {
         {
           type: 1,
           name: "出售中商品",
-          count: 10,
+          count: 0,
           img: "/static/images/new_ui/yijingchushou.png",
         },
         {
           type: 2,
           name: "仓库中商品",
-          count: 31,
+          count:0,
           img: "/static/images/new_ui/cangku.png",
         },
       ],
@@ -116,7 +119,7 @@ export default {
 
     await readAppInfo();
     await getPhpToken();
-return
+    return;
     let jurisdiction = uni.getStorageSync("jurisdiction") || [];
     console.log("jurisdiction", jurisdiction);
     let mnuList = this.mnu;
@@ -162,7 +165,7 @@ return
         selectmerchant.merId > 0 &&
         (selectmerchant.status == 1 || selectmerchant.status == 5)
       ) {
-        return; 
+        return;
       } else if (
         selectmerchant.merId >= 0 &&
         (selectmerchant.status == 3 || selectmerchant.status == 4)
@@ -184,72 +187,77 @@ return
       }
     }
   },
-  onShow() {
-    return;
-
-    // 以下逻辑在onload处理
-
-    this.authorization = uni.getStorageSync("authorization");
-    let userinfo = uni.getStorageSync("userinfo");
-    this.uid = userinfo.uid;
-
-    let authorization = uni.getStorageSync("authorization");
-    // let userinfo = uni.getStorageSync('userinfo')
-    let selectmerchant = uni.getStorageSync("selectmerchant");
-    let uid = userinfo.uid;
-    console.log(selectmerchant, authorization, userinfo);
-    if (authorization && uid) {
-      if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
-        uni.redirectTo({
-          url: "/openmerchant/guide/index", //有或者没有商户 没有金额支付and激活码支付
-        });
-        return;
-      } else if (
-        selectmerchant.merId > 0 &&
-        (selectmerchant.status == 1 || selectmerchant.status == 5)
-      ) {
-        return;
-      } else if (
-        selectmerchant.merId >= 0 &&
-        (selectmerchant.status == 3 || selectmerchant.status == 4)
-      ) {
-        uni.redirectTo({
-          url: "/openmerchant/shopentry/process?mer_id=" + selectmerchant.merId, //已开通商户未填写资料
-        });
-        return;
-      } else if (selectmerchant.merId > 0 && selectmerchant.status == 0) {
-        uni.redirectTo({
-          url: "/openmerchant/shopentry/processaudit?submitCode=" + 3, //已开通商户待审核
-        });
-        return;
-      } else if (selectmerchant.merId > 0 && selectmerchant.status == 2) {
-        uni.redirectTo({
-          url: "/openmerchant/shopentry/processaudit?submitCode=" + 2, //已开通商户审核拒绝
-        });
-        return;
-      }
+  async onShow() {
+    uni.showLoading({
+      title: "加载中",
+    });
+    try {
+      await this.getGoodsTabNum();
+      await this.getSupplyChainTabData();
+    } finally {
+      uni.hideLoading();
+      uni.hideToast();
     }
   },
   methods: {
-	//商品列表
-	businessHandleClick(item,index){
-		const obj = {
-			tabIndex: index,
-			type: item.type,
-		}
+    async getGoodsTabNum() {
+      try {
+        const res = await getGoodsTab();
+        if (res.data.status === 200) {
+          let data = JSON.parse(JSON.stringify(this.dataBuss));
+          this.dataBuss = data.map((item, index) => {
+            return {
+              ...item,
+              count: res.data.data[index] ? res.data.data[index].count : 0,
+            };
+          });
+        }
+      } catch (error) {}
+    },
+
+    async getSupplyChainTabData() {
+      try {
+        const res = await getSupplyChainTab();
+        if(res.data.status === 200) {
+          let data = JSON.parse(JSON.stringify(this.onlineData));
+          this.onlineData = data.map((item, index) => {
+            return {
+              ...item,
+              count: res.data.data[index] ? res.data.data[index].count : 0,
+            };
+          });
+        
+        }
+      } catch (error) {}
+    },
+
+    //点击事件
+    businessHandleClick(item, index) {
+      const obj = {
+        tabIndex: index,
+        type: item.type,
+      };
+      uni.redirectTo({
+        url: `./productManagement?${toQueryString(obj)}`,
+      });
+    },
+
+    //商品列表
+    businessHandleClick(item, index) {
+      const obj = {
+        tabIndex: index,
+        type: item.type,
+      };
       uni.redirectTo({
-        url:`./productManagement?${toQueryString(obj)}` ,
+        url: `./productManagement?${toQueryString(obj)}`,
       });
-	},
-    jinru(n, p) {
-      let name = p;
-      let page = n;
-      if (name == "分润设置") {
-        let authorization = uni.getStorageSync("authorization");
+    },
+    getUrlAuthorization() {
+       let authorization = uni.getStorageSync("authorization");
         let userinfo = uni.getStorageSync("userinfo");
         let selectmerchant = uni.getStorageSync("selectmerchant");
         let uid = userinfo.uid;
-        if (authorization && uid) {
+          if (authorization && uid) {
           if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
             uni.redirectTo({
               url: "/openmerchant/guide/index", //有或者没有商户 没有金额支付and激活码支付
@@ -290,30 +298,42 @@ return
           });
           return;
         }
-      } else if (name == "锁定用户") {
-        uni.redirectTo({
-          url: page,
-        });
-      } else {
-        uni.redirectTo({
-          url: page,
-        });
-      }
     },
+    // jinru(n, p) {
+    //   let name = p;
+    //   let page = n;
+    //   if (name == "分润设置") {
+       
+      
+    //   } else if (name == "锁定用户") {
+    //     uni.redirectTo({
+    //       url: page,
+    //     });
+    //   } else {
+    //     uni.redirectTo({
+    //       url: page,
+    //     });
+    //   }
+    // },
     //商品评价
-    onHandlePingJia(){
-      console.log('商品评价')
+    onHandlePingJia() {
+      console.log("商品评价");
       uni.redirectTo({
-        url: "./productevaluation",
+        url: "/shop/productManagementModule/productevaluation",
       });
     },
     //供应链
-    onGongyingliang(item,index){
+    onGongyingliang(item, index) {
       // console.log('供应链',item,index)
+       const obj = {
+        tabIndex: index,
+        indexs:index,
+        type: item.type,
+      };
       uni.redirectTo({
-        url: `/pages/supplychainon/supplychainon?indexs=${index}`
-      })
-    }
+        url: `/pages/supplychainon/supplychainon?${toQueryString(obj)}`,
+      });
+    },
   },
 };
 </script>