智能体

components/GPT/index.vue

@@ -408,6 +408,7 @@ export default {
       this.scrollToBottom(1000)
       await this.socketObj.init()
       this.$ClientData = new ClientData()
+	  console.log(this.$ClientData,'ClientData')
       this.$ClientData.init()
       this.$ClientData.setAttr({ socketObj: this.socketObj })
       this.robotObj = this.socketObj.robotObj

components/GPT/utils/ClientData.js

@@ -1,4 +1,3 @@
-import Vue from "vue";
 import { MESSAGE_TYPE } from "./chat_constant";
 import { getQueryVariable, generateRequestId, arrayUnique } from "./util";
 import { v4 as uuidv4 } from "uuid";

pages/agent/index.vue

@@ -13,17 +13,19 @@ export default {
 
 	data() {
 		return {
-		agentId:1
+		agentId:''
 		}
 	},
 	onLoad(option) {
+		if(option){
+			this.agentId = option.id
+			console.log('>>>>>>接受的ID',this.agentId)
+		}
 		wx.hideShareMenu()
 		const app = getApp();
 		const bgMusic = app.globalData.bgMusic;
 		 bgMusic.pause();
-		if(option){
+		
-			this.agentId = option.id
-		}
 	},
 	onLaunch: options => {
 		this.options = options

pages/index/timeShopBank.vue

@@ -76,7 +76,7 @@
         />
       </view>
     </view>
-    <view class="fab-container">
+    <view class="fab-container" v-if="canPublish">
       <image
         @click="goToPublish"
         :src="showImg('/uploads/20250825/7ea7864b8abb89c3dd7834f025e49b3f.png')"
@@ -130,8 +130,24 @@ export default {
       loading: false,
       hasMore: true,
       autoAddEnabled: false,
+      whiteListUsers: [], // 发布功能白名单用户ID列表
     };
   },
+  computed: {
+    // 判断用户是否有发布权限
+    canPublish() {
+      // 如果白名单为空，则所有用户都可以发布
+      if (!this.whiteListUsers || this.whiteListUsers.length === 0) {
+        return true;
+      }
+      // 如果用户未登录，则不显示发布按钮
+      if (!this.userInfo || !this.userInfo.id) {
+        return false;
+      }
+      // 检查用户ID是否在白名单中
+      return this.whiteListUsers.includes(this.userInfo.id.toString());
+    },
+  },
   onLoad() {
     this.userInfo =
       (uni.getStorageSync("userInfo") &&
@@ -147,6 +163,7 @@ export default {
   onShow() {
     if (this.userInfo && this.userInfo.id) {
       this.getUserInfo();
+      this.getWhiteListConfig(); // 获取白名单配置
     }
   },
 
@@ -177,6 +194,21 @@ export default {
       });
     },
 
+    // 获取白名单配置
+    getWhiteListConfig() {
+      this.Post({}, `/system/config/configKey/note_white_user`, "DES")
+        .then((res) => {
+          if (res.code === 200) {
+            // 将逗号分隔的字符串转换为数组
+            this.whiteListUsers = res.msg.split(",").map((item) => item.trim());
+            console.log("白名单用户列表:", this.whiteListUsers);
+          }
+        })
+        .catch((err) => {
+          console.error("获取白名单配置失败:", err);
+        });
+    },
+
     // 切换到关注标签时刷新关注列表
     refreshFollowList() {
       // 获取FollowTab组件实例并调用其刷新方法
@@ -272,6 +304,20 @@ export default {
         });
         return;
       }
+
+      // 检查当前用户是否在白名单中
+      const userId = this.userInfo.id.toString();
+      if (
+        this.whiteListUsers.length > 0 &&
+        !this.whiteListUsers.includes(userId)
+      ) {
+        uni.showToast({
+          title: "暂无发布权限",
+          icon: "none",
+        });
+        return;
+      }
+
       uni.navigateTo({
         url: "/pages/notes/publish",
       });

subPackages/haveFeeling/list.vue

@@ -30,11 +30,21 @@
         <!-- 订单头部 - 供应商信息 -->
         <view class="order-header">
           <view class="supplier-info">
-            <view class="supplier-name" v-if="order.status==0||order.status==-1">有感商品订单</view>
+            <view
-			<view class="supplier-name" v-else>{{
+              class="supplier-name"
-			  order.supplierName || "默认供应商"
+              v-if="order.status == 0 || order.status == -1"
-			}}</view>
+              >有感商品订单</view
-            <view class="order-number">订单号：{{ ( order.status==0||order.status==-1)?order.parentOrderNo:order.orderNo }}</view>
+            >
+            <view class="supplier-name" v-else>{{
+              order.supplierName || "默认供应商"
+            }}</view>
+            <view class="order-number"
+              >订单号：{{
+                order.status == 0 || order.status == -1
+                  ? order.parentOrderNo
+                  : order.orderNo
+              }}</view
+            >
           </view>
           <view class="order-status-wrapper">
             <text class="status-name" :class="[getStatusClass(order.status)]">{{
@@ -77,11 +87,27 @@
 
         <!-- 订单底部 -->
         <view class="order-footer">
-          <view class="order-info" >
+          <view class="order-info">
             <view class="order-total-section">
               <!-- <text class="total-label">{{(order.status==0)?'':'实付'}}</text> -->
-              <text class="order-total" v-if="order.orders&&order.orders.length==1">¥{{ order.orders[0].payAmount || 0 }}</text>
+              <view
-			  <text class="order-total" v-else>¥{{ order.payAmount || 0 }}</text>
+                class="order-total"
+                v-if="order.orders && order.orders.length == 1"
+                >¥{{ order.orders[0].payAmount || 0 }}
+                <span
+                  class="freight-text"
+                  v-if="Number(order.orders[0].shippingFee) != 0"
+                  >含运费{{ order.orders[0].shippingFee || 0 }}</span
+                >
+              </view>
+              <view class="order-total" v-else
+                >¥{{ order.payAmount || 0
+                }}<span
+                  class="freight-text"
+                  v-if="Number(order.shippingFee) != 0"
+                  >含运费{{ order.shippingFee || 0 }}</span
+                >
+              </view>
             </view>
             <view class="order-time">{{ order.createTime }}</view>
           </view>
@@ -222,12 +248,12 @@ export default {
           pageSize: this.pageSize,
           status: this.tabs[this.currentTab].status,
         };
-		let url = ''
+        let url = "";
-		if(this.currentTab==0||this.currentTab==1){
+        if (this.currentTab == 0 || this.currentTab == 1) {
-			url = "/framework/ygOrder/parent/pageList"
+          url = "/framework/ygOrder/parent/pageList";
-		}else{
+        } else {
-			url = "/framework/ygOrder/pageList"
+          url = "/framework/ygOrder/pageList";
-		}
+        }
         this.Post(
           {
             ...params,
@@ -236,15 +262,15 @@ export default {
           "DES"
         ).then((res) => {
           if (res.code == 200) {
-			  if(this.currentTab==0||this.currentTab==1){
+            if (this.currentTab == 0 || this.currentTab == 1) {
-				  let orderItems = []
+              let orderItems = [];
-				  res.rows.forEach(item =>{
+              res.rows.forEach((item) => {
-					  item.orderItems = []
+                item.orderItems = [];
-					  item.orders.forEach(_item =>{
+                item.orders.forEach((_item) => {
-						  item.orderItems.push(..._item.orderItems)
+                  item.orderItems.push(..._item.orderItems);
-					  })
+                });
-				  })
+              });
-			  }
+            }
             this.orderList.push(...res.rows);
             console.log(this.orderList);
             this.hasMore = res.rows.length === this.pageSize;
@@ -440,17 +466,16 @@ export default {
 
     // 跳转到订单详情页面
     goToOrderDetail(order) {
-		console.log(order)
+      console.log(order);
-		if(order.status==-1||order.status==0){
+      if (order.status == -1 || order.status == 0) {
-			uni.navigateTo({
+        uni.navigateTo({
-			  url: `/subPackages/haveFeeling/detailAll?id=${order.orderNo}`,
+          url: `/subPackages/haveFeeling/detailAll?id=${order.orderNo}`,
-			});
+        });
-		}else{
+      } else {
-			uni.navigateTo({
+        uni.navigateTo({
-			  url: `/subPackages/haveFeeling/detail?id=${order.orderNo}`,
+          url: `/subPackages/haveFeeling/detail?id=${order.orderNo}`,
-			});
+        });
-		}
+      }
-     
     },
   },
 };
@@ -749,6 +774,13 @@ $bg-light: #f7fafc;
   font-weight: 600;
   font-family: -apple-system, BlinkMacSystemFont, "PingFang SC",
     "Helvetica Neue", STHeiti, "Microsoft Yahei", Tahoma, Simsun, sans-serif;
+
+  .freight-text {
+    font-size: 22rpx;
+    color: $text-muted;
+    font-weight: 400;
+    margin-left: 8rpx;
+  }
 }
 
 .order-time {

subPackages/techan/order.vue

@@ -96,8 +96,7 @@
                   </view>
                 </view>
                 <view class="commodity-info">
-                  <view class="text-overflowRows"
+                  <view class="text-overflowRows" style="width: 90%"
-				  style="width: 90%;"
                     >{{ sku.specValueOne }}-{{ sku.specValueTwo }}</view
                   >
                   <view class="commodity-num"> x{{ sku.quantity }} </view>
@@ -170,7 +169,9 @@
         </view>
         <view class="price-detail">
           <view class="text">运费:</view>
-          <view class="price">包邮</view>
+          <view class="price">{{
+            post > 0 ? "¥" + post.toFixed(2) : "包邮"
+          }}</view>
         </view>
         <view class="price-detail" v-if="usePoints > 0">
           <view class="text">积分抵扣:</view>
@@ -475,7 +476,7 @@ export default {
     // 获取总积分
     async getTotalPoints() {
       try {
-		  if(!uni.getStorageSync("userInfo") )return
+        if (!uni.getStorageSync("userInfo")) return;
         this.Post({}, "/framework/points/getLastBalance", "DES").then((res) => {
           if (res.code === 200) {
             this.userPoints = res.data.balance || 0;
@@ -598,32 +599,9 @@ export default {
       if (this.info.is_post == 0 || !this.contacts) {
         return;
       }
-      this.flag = false;
-
-      let param = [];
-      this.info.goods.forEach((v) => {
-        param.push({
-          specifications_id: v.skuInfo.id,
-          num: v.skuInfo.quantity,
-          consignee_id: this.contacts.id,
-        });
-      });
 
-      let data = JSON.stringify(param);
+      // 调用新的运费计算方法
-      // console.log(data);
+      this.calculateFreight();
-      this.Post({ data: data }, "/api/order/getNewPost")
-        .then((res) => {
-          if (res) {
-            for (let i = 0; i < this.info.goods.length; i++) {
-              this.info.goods[i].post = res.data[i].post_money;
-            }
-            this.flag = true;
-          }
-        })
-        .catch((err) => {
-          // console.log(err, "aaaaaaa");
-          this.flag = true;
-        });
     },
 
     plus(sku) {
@@ -800,10 +778,56 @@ export default {
       return "¥" + allPriceYuan.toFixed(2);
     },
 
-    // 获取总运费（单位：分）
+    // 获取总运费（单位：元）
     getTotalPost() {
-      // 运费暂时设为0
+      // 如果有计算的运费，则返回运费，否则返回0
-      return 0;
+      return this.post ? this.post : 0;
+    },
+
+    // 计算运费
+    calculateFreight() {
+      if (!this.contacts) {
+        return;
+      }
+
+      this.flag = false;
+
+      // 构建商品数组信息，不根据供应商区分
+      let shoppingCartBoList = [];
+      this.info.forEach((sku) => {
+        shoppingCartBoList.push({
+          goodsId: sku.goodsId,
+          specId: sku.specId,
+          quantity: sku.quantity,
+        });
+      });
+
+      // 调用运费计算接口
+      this.Post(
+        {
+          shoppingCartBoList: this.info,
+          userContactId: this.contacts.id,
+          method: "POST",
+        },
+        "/framework/ygOrder/calculateMultiSpecFreight",
+        "DES"
+      )
+        .then((res) => {
+          if (res && res.code === 200) {
+            this.post = Number(res.data.total) || 0;
+            this.flag = true;
+          } else {
+            uni.showToast({
+              title: res.msg || "运费计算失败",
+              icon: "none",
+            });
+            this.flag = true;
+          }
+        })
+        .catch((err) => {
+          console.error("运费计算错误:", err);
+          this.flag = true;
+        });
     },
 
     // 获取当前订单最大可用积分
@@ -946,7 +970,7 @@ export default {
         expectedAmount: this.allprice,
         usePoints: this.usePoints ? 0 : 1, // 是否使用积分
         pointsQuantity: parseInt(this.usePoints) || 0, // 使用的积分数量
-        shippingFee: 0,
+        shippingFee: this.post || 0, // 使用计算出的运费
       };
 
       this.Post(
@@ -965,13 +989,13 @@ export default {
               interval: 2000,
               onSuccess: (data) => {
                 this.isOrderLoading = false; // 结束加载
-				this.getTotalPoints();
+                this.getTotalPoints();
                 // 处理成功逻辑
                 // uni.showToast({
                 //   title: "订单创建成功",
                 //   icon: "success",
                 // });
-				this.orderPay(res.msg)
+                this.orderPay(res.msg);
               },
               onFailure: (data) => {
                 this.isOrderLoading = false; // 结束加载
@@ -1006,36 +1030,36 @@ export default {
           });
         });
     },
-	orderPay(token){
+    orderPay(token) {
-		this.Post(
+      this.Post(
-		  {
+        {
-		    method: "POST",
+          method: "POST",
-		    orderNo:token,
+          orderNo: token,
-			fromType:1,
+          fromType: 1,
-			payAmount:this.allprice,
+          payAmount: this.allprice,
-		  },
+        },
-		  "/framework/wxPay/submitShopPurOrder",
+        "/framework/wxPay/submitShopPurOrder",
-		  "DES"
+        "DES"
-		).then(res =>{
+      ).then((res) => {
-			uni.requestPayment({
+        uni.requestPayment({
-				nonceStr: res.data.wxInfo.nonceStr,
+          nonceStr: res.data.wxInfo.nonceStr,
-				package: res.data.wxInfo.package,
+          package: res.data.wxInfo.package,
-				paySign: res.data.wxInfo.paySign,
+          paySign: res.data.wxInfo.paySign,
-				signType: res.data.wxInfo.signType,
+          signType: res.data.wxInfo.signType,
-				timeStamp: res.data.wxInfo.timeStamp,
+          timeStamp: res.data.wxInfo.timeStamp,
-				success: () => {
+          success: () => {
-					uni.redirectTo({
+            uni.redirectTo({
-						url:'/subPackages/haveFeeling/list'
+              url: "/subPackages/haveFeeling/list",
-					})
+            });
-				},
+          },
-				fail() {
+          fail() {
-					uni.redirectTo({
+            uni.redirectTo({
-						url:'/subPackages/haveFeeling/list'
+              url: "/subPackages/haveFeeling/list",
-					})
+            });
-				}
+          },
-			});
+        });
-		})
+      });
-	},
+    },
 
     // ---------------自提-----------------------
     changPopShow(e) {