fix：产品对接

commit/product.js

@@ -83,7 +83,7 @@ export function postchangeshow(data) {
 
 
 
-/**商品列表    */
+/**商品模块    */
 
 // 商品列表tab
 
@@ -96,6 +96,20 @@ export function getGoodsTab(data) {
     })
 }
 
+
+/**商品列表  
+ * 
+ * page = 1 & limit = 20 & mer_cate_id = & cate_id = & keyword = & type = 1 & is_gift_bag = & p_type =
+  */
+
+export function getProductList(data) {
+    return myRequestPhp({
+        url: `${pre}mer/store/product/lst`,
+        method: 'GET',
+        data,
+        apiType
+    })
+}
 // 平台商品分类
 export function getGoodsClassCategory(data) {
     return myRequestPhp({
@@ -106,3 +120,48 @@ export function getGoodsClassCategory(data) {
     })
 }
 
+
+
+
+
+
+// 商品评价
+
+/**
+ * is_reply:
+     nickname:
+     keyword:
+     order_sn:
+     status:
+     date:
+     page: 1
+ limit: 20
+ *  */
+export function getGoodsEvaluate(data) {
+    return myRequestPhp({
+        url: `${pre}mer/store/reply/lst`,
+        method: 'GET',
+        data,
+        apiType
+    })
+}
+
+
+// 商品评价回复获取规则
+export function reviewGoodsEvaluateReply(id) {
+    return myRequestPhp({
+        url: `${pre}mer/store/reply/form/${id}`,
+        method: 'GET',
+        apiType
+    })
+}
+
+//商品评价回复
+export function reviewGoodsReplyApi(id,data) {
+    return myRequestPhp({
+        url: `${pre}mer/store/reply/reply/${id}.html`,
+        method: 'POST',
+        data,
+        apiType
+    })
+}

commit/requestPhp.js

@@ -3,7 +3,7 @@
 import {getPhpToken} from "../utils/readAppInfo"
 let baseURL = 'http://testshop.hxxfb.com/'
 // 请求超出时间
-const timeout = 5000
+const timeout = 50000
 
 // 需要修改token，和根据实际修改请求头
 export function myRequestPhp(options) {

commit/user.js

@@ -0,0 +1,25 @@
+
+import {
+    myRequestPhp
+} from './requestPhp.js'
+
+
+
+
+
+
+const pre = ""
+const apiType = "php"
+
+/**
+ * 
+ * @returns 获取用户信息
+ */
+export function getBaseInfo() {
+  return myRequestPhp({
+         url: `${pre}mer/info`,
+          method: 'GET',
+              data,
+              apiType
+     })
+}

pages/supplychainon/price-edit-modal.vue

@@ -47,6 +47,7 @@
 </template>
 
 <script>
+import {getBaseInfo} from "@/commit/user.js"
 export default {
   props: {
     minPrice: { type: Number, default: 8.75 },

shop/productManagementModule/components/productEvaluation/ProductEvaluationItem.vue

@@ -2,49 +2,60 @@
   <view class="comment-card">
     <!-- 差评标签和评分 -->
     <view class="top-info">
-      <text class="bad-comment">差评</text>
-      <text class="score">商品评分{{ score }}★</text>
+      <!-- <text class="bad-comment">差评</text> -->
+      <view class="score">产品评分 {{ item.product_score }} ★</view>
+      <view class="score">服务评分 {{ item.service_score }} ★</view>
+      <view class="score">物流评分 {{ item.postage_score }} ★</view>
     </view>
     <!-- 遍历展示每条差评内容 -->
-    <view
-      class="comment-content"
-      v-for="(subComment, index) in commentList"
-      :key="index"
-    >
-      <text>{{ subComment }}</text>
+    <view class="comment-content">
+      <text>{{ item.comment || "" }}</text>
     </view>
     <!-- 图片展示，这里假设图片数组为imgList -->
-    <view class="img-list">
+    <view class="img-list" v-if="item.pics.length > 0">
       <image
-        v-for="(img, index) in imgList"
+        v-for="(img, index) in item.pics"
         :key="index"
         :src="img"
-        mode="aspectFill"
+        mode="scaleToFill"
       ></image>
     </view>
     <!-- 遍历展示产品信息数组 -->
     <view class="product-info-content">
-      <view
-        class="product-info-list"
-        v-for="(product, index) in productList"
-        :key="index"
-      >
-        <image class="product-img" :src="product.img" mode="aspectFill"></image>
+      <view class="product-info-list">
+        <image
+          class="product-img"
+          :src="item.image"
+          mode="aspectFill"
+          @error="handleError"
+          v-if="item.image && !isError"
+        ></image>
+        <image
+          class="product-img"
+          v-else
+          src="/static/images/new_ui/kongtu.png"
+          mode="scaleToFill"
+        />
         <view class="product-detail">
-          <text>{{ product.detail }}</text>
+          <text>{{ item.store_name }}</text>
         </view>
       </view>
     </view>
+    <view class="comment-content" v-if="item.merchant_reply_content">
+      <text style="padding-right: 10rpx">回复内容：</text>
+      <text>{{ item.merchant_reply_content || "" }}</text>
+    </view>
     <!-- 操作按钮 -->
     <view class="action-buttons">
       <!-- <button class="order-btn">查看订单</button> -->
-      <button class="reply-btn" @click="replyHandler">回复评论</button>
+      <button class="reply-btn" @click="replyHandler(false)">回复评论</button>
     </view>
-    <ReplyModal ref="ReplyRefs"></ReplyModal>
+    <ReplyModal ref="ReplyRefs" @close="close" @submit="submit"></ReplyModal>
   </view>
 </template>
 <script>
 import ReplyModal from "./ReplyModal.vue";
+import { reviewGoodsEvaluateReply } from "@/commit/product.js";
 export default {
   components: { ReplyModal },
   props: {
@@ -59,32 +70,45 @@ export default {
   },
   data() {
     return {
-      score: 1, // 假设差评情况下的评分，可根据实际逻辑调整
-      commentList: ["包装破损", "物流速度极慢", "与描述不符"], // 差评信息数组，可从后端获取
-      imgList: [
-        "/static/images/new_ui/delivery_man_dialog.png",
-        "/static/images/new_ui/delivery_man_dialog.png",
-      ], // 图片地址数组，需替换为实际地址
-      productList: [
-        {
-          img: "/static/images/new_ui/qcode.png",
-          detail:
-            "【直播现装】DIY配件多种夜光款DIY配件多种夜光款DIY配件多种夜光款DIY配件多种夜光款DIY配件多种夜光款",
-        },
-        {
-          img: "/static/logo.png",
-          detail:
-            "小瓶子混装DIY 女孩玩具夜光大白DIY配件多种夜光款DIY配件多种夜光款DIY配件多种夜光款DIY配件多种夜光款",
-        },
-      ], // 产品信息数组，包含图片和详细信息
+      isError: false,
     };
   },
   methods: {
-    replyHandler() {
-        this.$emit('handleReply',{
-
-        })
-        this.$refs.ReplyRefs.open();
+    handleError(e) {
+      this.isError = true;
+    },
+    close() {
+      this.$refs.ReplyRefs.close();
+      this.$emit("handleReply", {
+        isClose: true,
+        type: "close",
+      });
+    },
+    submit() {
+       this.$refs.ReplyRefs.close();
+      this.$emit("handleReply", {
+        isClose: true,
+        type: "submit",
+      });
+    },
+    async replyHandler() {
+      this.$emit("handleReply", {
+        isClose: false,
+        type: "open",
+      });
+      uni.showLoading({
+        title: "正在打开中...",
+        mask: true,
+      });
+      try {
+        const res = await reviewGoodsEvaluateReply(this.item.reply_id);
+        if (res.data.status == 200) {
+          this.$refs.ReplyRefs.open(this.item, res.data.data);
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
     },
   },
 };
@@ -102,7 +126,8 @@ export default {
 
 .top-info {
   display: flex;
-  align-items: center;
+  flex-direction: column;
+  gap: 20rpx;
   margin-bottom: 10rpx;
 }
 
@@ -121,6 +146,7 @@ export default {
   margin-bottom: 10rpx;
   font-size: 28rpx;
   word-break: break-all;
+  padding: 15rpx 0;
 }
 
 .img-list {

shop/productManagementModule/components/productEvaluation/ReplyModal.vue

@@ -1,66 +1,115 @@
 <!-- components/ReplyModal.vue -->
 <template>
-  <uni-popup ref="popup" :animation="true" :is-mask-click="false">
-   <view class="content">
-     <view class="popup_data__headers">
-      <view class="popup_data__headers--title">回复评论</view>
-      <uni-icons
-        type="closeempty"
-        class="custom_icons"
-        size="30"
-      
-
-        @click="handleClose"
-      ></uni-icons>
-    </view>
-    <view class="reply-modal">
-      <textarea v-model="replyContent" placeholder="输入回复内容"   :maxlength="-1" :focus="true" cursor-color="#007aff"/>
-      <button @click="submit">提交</button>
+  <uni-popup
+    ref="popup"
+    :animation="true"
+    adjust-position="false"
+    :is-mask-click="false"
+  >
+    <view class="content">
+      <view class="popup_data__headers">
+        <view class="popup_data__headers--title">回复评论</view>
+        <uni-icons
+          type="closeempty"
+          class="custom_icons"
+          size="30"
+          @click="handleClose"
+        ></uni-icons>
+      </view>
+      <view class="reply-modal">
+        <textarea
+          adjust-position="false"
+          v-model="replyContent"
+          placeholder="输入回复内容"
+          :maxlength="-1"
+          :focus="true"
+          cursor-color="#007aff"
+        />
+        <button @click="submit">提交</button>
+      </view>
     </view>
-   </view>
   </uni-popup>
 </template>
 
 <script>
+import { reviewGoodsReplyApi } from "@/commit/product.js";
 export default {
   data() {
     return {
       replyContent: "",
+      keyboardHeight: "",
+      popupStyle: "",
+      isPopupShow: false,
+      paramsData: {},
+      resData: {},
     };
   },
+  mounted() {
+    // 监听键盘高度变化
+    uni.onKeyboardHeightChange((res) => {
+      this.keyboardHeight = res.height;
+      // 动态调整弹窗底部内边距
+      this.popupStyle = `padding-bottom: ${res.height}px`;
+    });
+  },
   methods: {
     handleClose() {
-      this. close()
+      this.$emit("close");
+      this.close();
     },
-    open() {
-       uni.stopPullDownRefresh();
+    open(data, item) {
+      this.paramsData = data;
+      this.resData = item;
       this.$refs.popup.open();
     },
     close() {
       this.replyContent = "";
       this.$refs.popup.close();
     },
-    submit() {
-      if(!this.replyContent) {
+    //TODO: 提交回复
+
+    async submit() {
+      console.log(this.paramsData, "this.paramsData");
+      console.log(this.resData, "this.resData");
+      if (!this.replyContent) {
         uni.showToast({
-          title: '请输入回复内容',
-          icon: 'none'
-        })
-        return
+          title: "请输入回复内容",
+          icon: "none",
+        });
+        return;
+      }
+      uni.showLoading({
+        title: "回复中...",
+        mask: true,
+      });
+      try {
+        const res = await reviewGoodsReplyApi(this.paramsData.reply_id, {
+          content: this.replyContent,
+        });
+        if (res.data.status == 200) {
+          uni.showToast({
+            title: "回复成功",
+            icon: "none",
+          });
+          this.$emit("submit");
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+        uni.hideToast();
       }
       // this.$emit('submit', {
       //   content: this.replyContent,
       //   index: this.index,
       //   item: this.item
       // })
-      // this.$refs.popup.close();
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.content{
+.content {
   // width: 680rpx;
   width: 600rpx;
   background: #fff;
@@ -68,8 +117,6 @@ export default {
   padding: 30rpx 40rpx 40rpx;
 }
 .reply-modal {
-
-
   textarea {
     width: calc(100% - 48rpx);
     min-height: 240rpx;
@@ -99,25 +146,25 @@ export default {
   justify-content: center;
 }
 .popup_data__headers {
-    // height: 40rpx;
-    display: flex;
+  // height: 40rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  // border-bottom: 2rpx solid #e5e5e5;
+  padding-bottom: 20rpx;
+  &--title {
+    flex: 1;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    overflow: hidden;
     justify-content: space-between;
-    align-items: center;
-    // border-bottom: 2rpx solid #e5e5e5;
-    padding-bottom: 20rpx;
-    &--title {
-      flex: 1;
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-      -webkit-line-clamp: 1;
-      overflow: hidden;
-      justify-content: space-between;
-      padding-right: 60rpx;
-      font-size: 32rpx;
-      font-weight: 600;
-    }
-    .custom_icons {
-      flex-shrink: 0;
-    }
+    padding-right: 60rpx;
+    font-size: 32rpx;
+    font-weight: 600;
+  }
+  .custom_icons {
+    flex-shrink: 0;
   }
+}
 </style>

shop/productManagementModule/productManagement.vue

@@ -13,20 +13,24 @@
         </view>
       </view>
       <view class="product-manger-content--tab">
-        <tabsVue :category="dataList" :currentActive="currentActive"/>
+        <tabsVue :category="dataList" :currentActive="currentActive" @tabs="tabsHandleClick"/>
       </view>
     </view>
     <view class="product-manger-content--list">
-      <view class="list-card" v-for="(item, index) in dataList" :key="index">
+       <template v-if="list.length > 0">
+      <view class="list-card" v-for="(item, index) in list" :key="index">
         <view class="list-card-top">
           <view class="list-card-top--left">
-             <image
-                src="/static/images/new_ui/tianjiachanpin.png"
-                mode="scaleToFill"
-              />
+            <image
+              src="/static/images/new_ui/tianjiachanpin.png"
+              mode="scaleToFill"
+              @error="imgError"
+            />
           </view>
           <view class="list-card-top--right">
-            <view class="list-card-top--right-title">此处显示商品名称最多一行，显示不下此处显示商品名称最多一行，显示不下</view>
+            <view class="list-card-top--right-title"
+              >此处显示商品名称最多一行，显示不下此处显示商品名称最多一行，显示不下</view
+            >
             <view class="list-card-top--right-description">
               <view class="list-card-top--right-description--left">
                 <text class="title">销量</text>
@@ -53,78 +57,63 @@
             <view class="list-card-bottom-btn-list--item">下架</view>
             <view class="list-card-bottom-btn-list--item">删除草稿</view>
           </view>
-
-          </view>
-
         </view>
-              <view
+      </view>
+       </template>
+       <template v-else>
+        <emptyDataVue style="top:0"/>
+      </template>
+      <view
         class=""
-        v-if="tihsi == 0"
+        v-if="tihsi == 0 && list.length > 0"
         style="margin: 60rpx 0 30rpx 0; color: #999999; font-size: 26rpx"
       >
         —— 已经到最底部了哦 ——
       </view>
-      </view>
     </view>
+  </view>
 </template>
 
 <script>
 import headersVue from "../components/headers/headers.vue";
 import searchVue from "./components/search/search.vue";
 import tabsVue from "./components/tablist.vue";
+import emptyDataVue from "../components/emptyData/emptyData.vue";
+import { getProductList, getGoodsTab } from "@/commit/product.js";
 //商品列表
 export default {
   components: {
     headersVue,
     searchVue,
     tabsVue,
+    emptyDataVue
   },
-  	onPullDownRefresh() {
-			uni.showLoading({
-				title: '加载中',
-			});
-			this.page = 1
-			this.is_panudn = true
-			this.list = []
-			// this.orderList();
-		},
-		onReachBottom() {
-      console.log('onReachBottom')
-			// if (this.is_panudn == true) {
-			// 	this.page++;
-			// 	this.orderList();
-			// } else {
-			// 	return
-			// }
-		},
-  methods: {
-    	
-    headerJump() {
-      uni.switchTab({ url: "/shop/productManagementModule/index" });
-    },
-    onHandleAddProduct() {
-      uni.redirectTo({
-        url: `./addProduct`,
-      });
-    },
-  },
-  onLoad(options) {
-    this.currentActive = options.tabIndex || "0";
-  },
+
   data() {
     return {
-      currentActive:'0',
-      tihsi: 0,
+      currentActive: "0",
+      list: [],
+      tihsi: "",
+      is_panudn: true,
+      page: 1,
+      limit: 10,
+      mer_cate_id: "",
+      cate_id: "",
+      keyword: "",
+      type: 1,
+      is_gift_bag: "",
+      p_type: "",
+      isError:false,
       dataList: [
         {
           type: 1,
           name: "出售中商品",
-          count: 10,
+          count: 0,
         },
         {
           type: 2,
           name: "仓库中商品",
-          count: 31,
+          count: 0,
         },
         {
           type: 3,
@@ -154,6 +143,97 @@ export default {
       ],
     };
   },
+  async onLoad(options) {
+    this.currentActive = options.tabIndex || "0";
+    this.type = options.type || 1;
+
+    await this.getGoodsTabData();
+    await this.getProductListData();
+  },
+  async onPullDownRefresh() {
+    uni.showLoading({
+      title: "加载中",
+    });
+    this.page = 1;
+    this.is_panudn = true;
+    this.list = [];
+    await this.getProductListData();
+  },
+  onReachBottom() {
+    console.log("onReachBottom");
+    if (this.is_panudn == true) {
+      this.page++;
+      this.getProductListData();
+    } else {
+      return;
+    }
+  },
+  methods: {
+    imgError(){
+      this.isError = true
+    },
+    headerJump() {
+      uni.switchTab({ url: "/shop/productManagementModule/index" });
+    },
+    onHandleAddProduct() {
+      uni.redirectTo({
+        url: `./addProduct`,
+      });
+    },
+    async getGoodsTabData() {
+      try {
+        const res = await getGoodsTab();
+        if (res.data.status == 200) {
+          this.dataList = res.data.data;
+        }
+      } catch (error) {
+      } finally {
+      }
+    },
+    async getProductListData() {
+      const params = {
+        page: this.page,
+        limit: this.limit,
+        mer_cate_id: this.mer_cate_id,
+        cate_id: this.cate_id,
+        keyword: this.keyword,
+        type: this.type,
+        is_gift_bag: this.is_gift_bag,
+        p_type: this.p_type,
+      };
+
+      try {
+        uni.showLoading({
+          title: "加载中",
+        });
+        const res = await getProductList(params);
+        if (res.data.status == 200) {
+          this.tihsi = res.data.data.list.length;
+          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;
+          }
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
+      async tabsHandleClick(obj) {
+      this.currentActive = obj.index;
+      this.type = obj.item?.type || 1;
+
+      await this.getProductListData();
+    },
+  },
 };
 </script>
 <style>
@@ -164,7 +244,6 @@ page {
 <style lang="scss" scoped>
 .product-manger-wrapper {
   // margin-top: 96rpx;
- 
 
   .product-manger-content {
     background: #fff;

shop/productManagementModule/productevaluation.vue

@@ -12,7 +12,8 @@
     </view>
 
     <view class="product-pingjia-content--list">
-      <ProductEvaluationItem
+    <template v-if="listReplyData.length > 0">
+        <ProductEvaluationItem
         @handleReply="ReplyHandler"
         v-for="(item, index) in listReplyData"
         :index="index"
@@ -20,15 +21,18 @@
         :key="index + '_index_'"
         class="mb-26"
       />
+    </template>
+      <template v-else>
+        <emptyDataVue style="top: initial"/>
+      </template>
       <view
         class=""
-        v-if="tihsi == 0"
+        v-if="tihsi == 0 && listReplyData.length > 0"
         style="margin: 60rpx 0 30rpx 0; color: #999999; font-size: 26rpx"
       >
         —— 已经到最底部了哦 ——
       </view>
     </view>
-   
   </view>
 </template>
 
@@ -36,43 +40,113 @@
 //评价
 import headersVue from "../components/headers/headers.vue";
 import searchVue from "./components/search/search.vue";
-
+import emptyDataVue from "../../shop/components/emptyData/emptyData.vue";
 import ProductEvaluationItem from "./components/productEvaluation/ProductEvaluationItem.vue";
+
+import { getGoodsEvaluate } from "@/commit/product.js";
 export default {
   components: {
     headersVue,
     searchVue,
     ProductEvaluationItem,
+    emptyDataVue
   },
   data() {
     return {
       tihsi: "",
-      listReplyData: [{}, {}, {}, {}],
-      isFullResh:true
+      listReplyData: [],
+      isPopupShow:false,
+      keyword: "",
+      page: 1,
+      limit: 10,
+      is_panudn: true,
     };
   },
+  async onLoad(options) {
+    await this.getGoodsEvaluateData();
+  },
   onPullDownRefresh() {
- console.log(this.isFullResh,"this.isFullResh")
-   
+    if(this.isPopupShow) return ;
+    uni.showLoading({
+      title: "加载中",
+    });
+    this.page = 1;
+    this.is_panudn = true;
+    this.listReplyData = [];
+    this.getGoodsEvaluateData();
   },
   onReachBottom() {
-    console.log("onReachBottom");
-    // if (this.is_panudn == true) {
-    // 	this.page++;
-    // 	this.orderList();
-    // } else {
-    // 	return
-    // }
+    if (this.is_panudn == true) {
+      this.page++;
+      this.getGoodsEvaluateData();
+    } else {
+      return;
+    }
   },
   methods: {
-    search(val) {},
-
+        // 打开弹窗时
+disableRefresh() {
+  uni.startPullDownRefresh(); // 强制启动刷新
+  uni.stopPullDownRefresh();  // 立即停止（制造禁用效果）
+  this.isPopupShow = true;
+},
+// 关闭弹窗时恢复
+enableRefresh() {
+  this.isPopupShow = false;
+  uni.startPullDownRefresh({ success: () => {} }); // 重启原生支持
+},
+    async search(val) {
+      this.keyword = val;
+      await this.getGoodsEvaluateData();
+    },
+    async getGoodsEvaluateData() {
+      uni.showLoading({
+        title: "加载中",
+      });
+      try {
+        const res = await getGoodsEvaluate({
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keyword,
+          is_reply: "",
+          nickname: "",
+          order_sn: "",
+          status: "",
+          date: "",
+        });
+        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.listReplyData = res.data.data.list;
+            } else {
+              this.listReplyData = this.listReplyData.concat(
+                res.data.data.list
+              );
+            }
+          } else {
+            if (this.page == 1) {
+              this.listReplyData = [];
+            }
+            this.is_panudn = false;
+          }
+          uni.hideLoading();
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
     ReplyHandler(item) {
-        console.log(item);
-     uni.stopPullDownRefresh()
+      if(item.type=='submit'){
+        this.getGoodsEvaluateData();
+      
+      }
     },
-    headerJump(){
-        uni.switchTab({ url: './index' })
+    headerJump() {
+      uni.switchTab({ url: "./index" });
     },
   },
 };
@@ -122,7 +196,8 @@ page {
     width: calc(100% - 52rpx);
     // border: 2rpx solid #f00;
     margin: 225rpx 26rpx 26rpx;
-    overflow: auto;
+    // height: calc(100% - 256rpx);
+    // overflow: auto;
   }
 }
 .mb-26 {