packageMemberIntegral/pages/integralIndex/integralIndex.js

@@ -58,7 +58,7 @@ Page({
       url: '/p/score/scoreInfo',
       method: 'GET',
       data: {
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3
       },
       callBack: res => {
         this.setData({
@@ -79,7 +79,7 @@ Page({
       data: {
         current: this.data.current,
         size: 10,
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3
       },
       callBack: (res) => {
         wx.hideLoading()

pages/Review/Review.wxml

@@ -9,11 +9,11 @@
 
           <view class="relative">
             <scroll-view class="goods-list"  scroll-x="true">
-              <image src="{{prod}}" mode="aspectFill"  class="img" wx:for="{{item.orderItems}}" wx:for-item="prod" wx:for-index="d" data-idx="{{d}}" bind:tap="comPicPreView"/>
+              <image src="{{prod.column}}" mode="aspectFill"  class="img" wx:for="{{item.orderItems}}" wx:for-item="prod" wx:for-index="d" data-idx="{{d}}" bind:tap="comPicPreView"/>
             </scroll-view>
               <view class="total-box">
-                <view class="price">￥{{price}}</view>
-                <view class="num">共{{}}件</view>
+                <view class="price">￥{{item.totalPrice}}</view>
+                <view class="num">共{{item.totalCount}}件</view>
               </view>
           </view>
         </view>

pages/basket/basket.js

@@ -198,7 +198,7 @@ Page({
       for (var i = 0; i < shopCartItemDiscounts.length; i++) {
         var cItems = shopCartItemDiscounts[i].shopCartItems;
         for (var j = 0; j < cItems.length; j++) {
-          if(cItems[j].isDelete == 0){
+          if(cItems[j].isDelete == 0&&cItems[j].stock>0){
             cItems[j].checked = allChecked;
           }
         }
@@ -220,6 +220,11 @@ Page({
     var index = e.currentTarget.dataset.index; // 获取data- 传进来的index
     var scindex = e.currentTarget.dataset.scindex;
     var topindex = e.currentTarget.dataset.topindex;
+    var stock = e.currentTarget.dataset.stock;
+    if(stock == 0){
+      return
+    }
+   
 
     var shopCartOrders = this.data.shopCartOrders;
     var shopCartItemDiscounts = shopCartOrders[topindex].shopCartItemDiscounts; // 获取购物车列表
@@ -254,7 +259,9 @@ Page({
     shopCartOrders[topindex].shopCartItemDiscounts.forEach(shopCartItem => {
       var cItems = shopCartItem.shopCartItems;
       for (var j = 0; j < cItems.length; j++) {
-        cItems[j].checked = !checked;
+        if(cItems[j].isDelete == 0&&cItems[j].stock>0){
+          cItems[j].checked = !checked;
+        }
       }
     })
     this.setData({
@@ -380,7 +387,7 @@ Page({
         prodId: shopCartItemDiscounts[scindex].shopCartItems[index].prodId,
         skuId: shopCartItemDiscounts[scindex].shopCartItems[index].skuId,
         shopId: shopCartItemDiscounts[scindex].shopCartItems[index].shopId,
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3
       },
       callBack: function (res) {
         if(res.code == 500){

pages/basket/basket.wxml

@@ -34,7 +34,7 @@
 								<view class='item'>
 									<view class="btn">
 										<label>
-											<checkbox bindtap='onSelectedItem' data-topindex="{{topIndex}}" data-scindex="{{scIndex}}" data-index="{{index}}" value="{{prod.prodId}}" checked="{{prod.checked}}" color="#105c3e" />
+											<checkbox bindtap='onSelectedItem' data-topindex="{{topIndex}}" data-scindex="{{scIndex}}" data-index="{{index}}" data-stock="{{prod.stock}}" value="{{prod.prodId}}" checked="{{prod.checked}}" color="#105c3e" />
 										</label>
 									</view>
 									<view class='prodinfo'>

pages/category/category.js

@@ -140,7 +140,7 @@ Page({
         "prodId": item.prodId,
         "shopId": item.shopId,
         "skuId": item.skuId||item.skuList[0].skuId,
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3
       }
       this.changeCar(data)
       if(type == 'add'){
@@ -185,58 +185,7 @@ Page({
     })
   },
 
-  // 获取点击位置和购物车位置
-  getNodePositions(index) {
-    const query = wx.createSelectorQuery().in(this);
-
-    // 1. 获取"加入购物车"按钮的位置（动画起始点）
-    query.select(`.product-item:nth-child(${index + 1}) .info .price-box .test`).boundingClientRect(btnRect => {
-      if (!btnRect) return; // 容错：防止节点未找到
-      const startX = btnRect.left + btnRect.width / 2 - 20; // 20 = 40rpx/2（图标宽高）
-      const startY = btnRect.top + btnRect.height / 2 - 20;
-
-      // 2. 获取购物车位置（动画结束点）
-      query.select('.bottom-box .left .icon').boundingClientRect(cartRect => {
-        if (!cartRect) return;
-        const endX = cartRect.left + cartRect.width / 2 - 20;
-        const endY = cartRect.top + cartRect.height / 2 - 20;
-
-        // 3. 计算抛物线中间点（控制弧度）
-        const midX = (startX + endX) / 2;
-        const midY = startY - 80; // 向上凸起80px，可调整弧度
-
-        // 4. 创建动画图标
-        this.createAnimationIcon(startX, startY, midX, midY, endX, endY);
-      }).exec();
-    }).exec();
-  },
-
-  // 创建抛物线动画（数据驱动，无DOM操作）
-  createAnimationIcon(startX, startY, midX, midY, endX, endY) {
-    // 生成唯一ID，避免key冲突
-    const iconId = Date.now() + Math.floor(Math.random() * 1000);
-    const newIcon = {
-      id: iconId,
-      startX,
-      startY,
-      midX,
-      midY,
-      endX,
-      endY
-    };
-
-    // 添加动画图标到数组（自动渲染）
-    this.setData({
-      animationIcons: [...this.data.animationIcons, newIcon]
-    });
-
-    // 动画结束后移除图标+更新购物车
-    setTimeout(() => {
-      this.setData({
-        animationIcons: this.data.animationIcons.filter(icon => icon.id !== iconId),
-      });
-    }, 700); // 与动画时长保持一致（0.7s）
-  },
+  
   
   handleAll(){
     this.setData({
@@ -270,7 +219,7 @@ Page({
       data: {
         lat: wx.getStorageSync('LATITUDE'),
         lon: wx.getStorageSync('LONGITUDE'),
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3
       },
       callBack: (res) => {
         // this.get_categoryInfo(res)
@@ -536,8 +485,7 @@ Page({
         orderBy:this.data.paramsObj.orderBy,
         sort:this.data.paramsObj.sort,
         isAllProdType: true,
-        channelId:wx.getStorageSync('channelId'),
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3,
         // lat: wx.getStorageSync('LATITUDE'),
         // lon: wx.getStorageSync('LONGITUDE'),
         // distance: wx.getStorageSync('DISTANCE') || 0
@@ -582,7 +530,7 @@ Page({
         categoryId,
         current: 1,
         size: 999999,
-        channelId:wx.getStorageSync('channelId'),
+        channelId:wx.getStorageSync('channelId')||3,
         shopId:this.data.testShopId||this.data.shopId
       },
       callBack: (res) => {
@@ -732,10 +680,10 @@ Page({
    */
   toProdPage: function (e) {
     var prodid = e.currentTarget.dataset.prodid;
-    console.log(22222222,e);
+    var shopid = e.currentTarget.dataset.shopid;
     if (prodid) {
       wx.navigateTo({
-        url: '/pages/prod/prod?prodid=' + prodid,
+        url: `/pages/prod/prod?prodid=${prodid}&shopid=${shopid}`,
       })
     }
   },

pages/category/category.wxml

@@ -121,7 +121,7 @@
       </view>
       <scroll-view class="right-box"  scroll-y="true" 	enable-passive 	upper-threshold="10" 	lower-threshold="10"  scroll-top="{{topHeight}}" bindscroll="scroll" bindscrolltoupper="scrollTop" bindscrolltolower="scrollBottom">
         <view style="height:20px"></view>
-        <view class="product-item" id="{{'test'+index}}" data-index="{{index}}" wx:for="{{productList}}" data-prodId="{{item.prodId}}" bind:tap="toProdPage">
+        <view class="product-item" id="{{'test'+index}}" data-index="{{index}}" wx:for="{{productList}}" data-prodId="{{item.prodId}}" data-shopId="{{item.shopId}}" bind:tap="toProdPage">
         <view class="pic-box">
           <image class="pic" src="{{item.pic}}" mode="" />
           <view class="sell-out" wx:if="{{item.totalStocks == 0}}">
@@ -129,7 +129,7 @@
           </view>
         </view>
           <view class="info">
-            <view class="title" data-prodId="{{item.prodId}}" bind:tap="toProdPage">{{item.prodName}}</view>
+            <view class="title" data-prodId="{{item.prodId}}"  data-shopId="{{item.shopId}}" bind:tap="toProdPage">{{item.prodName}}</view>
               <view class="salesVolume">已售{{item.salesVolume||0}}</view>
             <view class="price-box">
               <view class="price">￥{{item.price}}</view>

pages/category1/category.js

@@ -140,7 +140,7 @@ Page({
         "prodId": item.prodId,
         "shopId": item.shopId,
         "skuId": item.skuId||item.skuList[0].skuId,
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3
       }
       this.changeCar(data)
       if(type == 'add'){
@@ -270,7 +270,7 @@ Page({
       data: {
         lat: wx.getStorageSync('LATITUDE'),
         lon: wx.getStorageSync('LONGITUDE'),
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3
       },
       callBack: (res) => {
         // this.get_categoryInfo(res)
@@ -536,8 +536,7 @@ Page({
         orderBy:this.data.paramsObj.orderBy,
         sort:this.data.paramsObj.sort,
         isAllProdType: true,
-        channelId:wx.getStorageSync('channelId'),
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3,
         // lat: wx.getStorageSync('LATITUDE'),
         // lon: wx.getStorageSync('LONGITUDE'),
         // distance: wx.getStorageSync('DISTANCE') || 0
@@ -582,7 +581,7 @@ Page({
         categoryId,
         current: 1,
         size: 999999,
-        channelId:wx.getStorageSync('channelId'),
+        channelId:wx.getStorageSync('channelId')||3,
         shopId:this.data.testShopId||this.data.shopId
       },
       callBack: (res) => {
@@ -732,10 +731,11 @@ Page({
    */
   toProdPage: function (e) {
     var prodid = e.currentTarget.dataset.prodid;
+    var shopid = e.currentTarget.dataset.shopid;
     console.log(22222222,e);
     if (prodid) {
       wx.navigateTo({
-        url: '/pages/prod/prod?prodid=' + prodid,
+        url: `/pages/prod/prod?prodid=${prodid}&shopid=${shopid}`,
       })
     }
   },

pages/category1/category.wxml

@@ -121,7 +121,7 @@
       </view>
       <scroll-view class="right-box"  scroll-y="true" 	enable-passive 	upper-threshold="10" 	lower-threshold="10"  scroll-top="{{topHeight}}" bindscroll="scroll" bindscrolltoupper="scrollTop" bindscrolltolower="scrollBottom">
         <view style="height:20px"></view>
-        <view class="product-item" id="{{'test'+index}}" data-index="{{index}}" wx:for="{{productList}}" data-prodId="{{item.prodId}}" bind:tap="toProdPage">
+        <view class="product-item" id="{{'test'+index}}" data-index="{{index}}" wx:for="{{productList}}" data-prodId="{{item.prodId}}" data-shopId="{{item.shopId}}" bind:tap="toProdPage">
         <view class="pic-box">
           <image class="pic" src="{{item.pic}}" mode="" />
           <view class="sell-out" wx:if="{{item.totalStocks == 0}}">
@@ -129,7 +129,7 @@
           </view>
         </view>
           <view class="info">
-            <view class="title" data-prodId="{{item.prodId}}" bind:tap="toProdPage">{{item.prodName}}</view>
+            <view class="title" data-prodId="{{item.prodId}}" data-shopId="{{item.shopId}}" bind:tap="toProdPage">{{item.prodName}}</view>
               <view class="salesVolume">已售{{item.salesVolume||0}}</view>
             <view class="price-box">
               <view class="price">￥{{item.price}}</view>

pages/groupConfirmOrder/groupConfirmOrder.js

@@ -37,7 +37,7 @@ Page({
         groupSkuId: groupOrderItem.groupSkuId,
         groupTeamId: groupOrderItem.groupTeamId,
         prodCount: groupOrderItem.prodCount,
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3
       },
       callBack: res => {
         console.log(res)

pages/index/index.js

@@ -640,7 +640,7 @@ Page({
       data: {
         lat: wx.getStorageSync('LATITUDE'),
         lon: wx.getStorageSync('LONGITUDE'),
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3
       },
       callBack: (res) => {
         if(typeof res == 'number'){
@@ -905,8 +905,7 @@ Page({
         lon: wx.getStorageSync('LONGITUDE'),
         distance: 9999999||wx.getStorageSync('DISTANCE') || 0,
         shopId: this.data.shop_id,
-        platform:1,
-        channelId:wx.getStorageSync('channelId')
+        channelId:wx.getStorageSync('channelId')||3
       },
       callBack: (res) => {
         var hotSalesList = []

pages/locationAdd/locationAdd.js

@@ -73,7 +73,8 @@ Page({
         addrId:'',
         lat: wx.getStorageSync('LATITUDE'),
         lon: wx.getStorageSync('LONGITUDE'),
-        platform:1},
+        channelId:wx.getStorageSync('channelId')||3
+      },
       callBack: (res) => {
         if(res&&res.length){
           let data = res

pages/login/login.js

@@ -48,7 +48,7 @@ Page({
           img: wx.getStorageSync('userInfo').avatarUrl || '',
           nickName: wx.getStorageSync('userInfo').nickName || '',
           validateType: 2,
-          platform:1,
+          channelId:wx.getStorageSync('channelId')||3,
           registerOrBind:2 // 验证类型 1注册 2绑定
         },
         callBack: res => {

pages/order-detail/order-detail.js

@@ -31,6 +31,7 @@ Page({
     remarks: "",
     actualTotal: 0,
     canRefund:false,
+    shopId:0,
     userAddrDto: null,
     orderNumber: "",
     createTime: "",
@@ -180,6 +181,7 @@ Page({
           orderItemDtos: res.orderItemDtos,
           createTime: res.createTime,
           status: res.status,
+          shopId: res.shopId,
           // status: res.status,//海博订单状态
           productTotalAmount: res.total, //所有商品总额
           transfee: res.transfee, //运费
@@ -350,7 +352,7 @@ Page({
       })
     }else{
       wx.navigateTo({
-        url: '/pages/prod/prod?prodid=' + prodid,
+        url: `/pages/prod/prod?prodid=${prodid}&shopid=${this.data.shopId}`,
       })
     }
   },

pages/prod/prod.js

@@ -35,6 +35,7 @@ Page({
     prodId: 0,
     brief: '',
     halfTitle: '',
+    brandName:'',
     skuId: 0,
     popupShow: false,
     // 是否获取过用户领取过的优惠券id
@@ -64,7 +65,7 @@ Page({
     pages: 0,
     current: 1,
     littleCommPage: [],
-    evaluate: -1,
+    commStatus: -1,
     isCollection: false,
     shareShow: false,
     isDist: false, //是否分销员
@@ -92,6 +93,13 @@ Page({
     videoContext: '', // 视频组件
     isPlaying: false, // 视频是否播放中
     currentSwiper: 0, // 当前轮播index
+    animateInfo:{
+      startX:99999,
+      startY:0,
+      endX:0,
+      endY:0,
+    },
+    move:false
   },
 
   /**
@@ -337,7 +345,7 @@ Page({
       method: "GET",
       data: {
         prodId: this.data.prodId,
-        platform:1,
+        channelId:wx.getStorageSync('channelId')||3,
         shopId:this.data.shopId
         // userType: 0
       },
@@ -360,6 +368,7 @@ Page({
           prodId: res.prodId,
           brief: res.brief,
           halfTitle: res.halfTitle,
+          brandName: res.brandName,
           totalStocks: res.totalStocks,
           // skuId: res.skuId
           skuList: res.skuList,
@@ -435,6 +444,8 @@ Page({
       method: "GET",
       data: {
         prodId: this.data.prodId,
+        channelId:wx.getStorageSync('channelId')||3,
+        shopId:this.data.shopId
       },
       callBack: (res) => {
         this.setData({
@@ -456,7 +467,7 @@ Page({
   // 获取分页获取评论
   getProdCommPage(e) {
     if (e) {
-      if (e.currentTarget.dataset.evaluate === this.data.evaluate) {
+      if (e.currentTarget.dataset.commStatus === this.data.commStatus) {
         return;
       }
       this.setData({
@@ -465,18 +476,23 @@ Page({
           pages: 0,
           records: []
         },
-        evaluate: e.currentTarget.dataset.evaluate
+        commStatus: e.currentTarget.dataset.commstatus
       })
     }
+    let data =  {
+      channelId:wx.getStorageSync('channelId')||3,
+      prodId: this.data.prodId,
+      shopId: this.data.shopId,
+      size: 10,
+      current: this.data.prodCommPage.current + 1,
+    }
+      if(this.data.commStatus !=-1){
+          data.commStatus = this.data.commStatus
+      }
     http.request({
-      url: "/prod/prodCommPageByProd",
+      url: "/p/prodComm/commList",
       method: "GET",
-      data: {
-        prodId: this.data.prodId,
-        size: 10,
-        current: this.data.prodCommPage.current + 1,
-        evaluate: this.data.evaluate
-      },
+      data,
       callBack: (res) => {
         res.records.forEach(item => {
           if (item.pics) {
@@ -585,7 +601,7 @@ Page({
       data: {
         shopId:this.data.shopId,
         prodId:this.data.prodId,
-        channelId:wx.getStorageSync('channelId'),
+        channelId:wx.getStorageSync('channelId')||3,
         userId:wx.getStorageSync('loginResult').userId||'',
         current: 1,
         size: 18,
@@ -611,7 +627,7 @@ Page({
       data: {
         shopId:this.data.shopId,
         prodId:this.data.prodId,
-        channelId:wx.getStorageSync('channelId'),
+        channelId:wx.getStorageSync('channelId')||3,
         userId:wx.getStorageSync('loginResult').userId||'',
         current: 1,
         size: 18,
@@ -659,6 +675,110 @@ Page({
     }
   },
 
+  // 点击购物车内加减按钮
+  handleAdd(e){
+    // 查看是否授权
+    util.checkAuthInfo(()=>{
+      let {num,item,subindex,index,type} = e.currentTarget.dataset
+      let data = {
+        "basketId": item.basketId||0,
+        "count": num,
+        "distributionCardNo": item.distributionCardNo||'',
+        "prodId": item.prodId,
+        "shopId": item.shopId,
+        "skuId": item.skuId||item.skuList[0].skuId,
+        channelId:wx.getStorageSync('channelId')||3
+      }
+      this.changeCar(data,'handleAdd',index,subindex)
+      this.addAnimate(e)
+    })
+  },
+  // 点击购物车内加减按钮
+  handleNum(e){
+    // 查看是否授权
+    util.checkAuthInfo(()=>{
+      let {num,item,type,index} = e.currentTarget.dataset
+      let data = {
+        "basketId": item.basketId||0,
+        "count": num,
+        "distributionCardNo": item.distributionCardNo||'',
+        "prodId": item.prodId,
+        "shopId": item.shopId,
+        "skuId": item.skuId||item.skuList[0].skuId,
+        channelId:wx.getStorageSync('channelId')||3
+      }
+      this.changeCar(data,'handleNum')
+      if(type == 'add'){
+        this.addAnimate(e)
+      }
+    })
+  },
+  addAnimate(e){
+    let startX = e.touches[0].clientX-10
+    let startY = e.touches[0].clientY-10
+    const query = wx.createSelectorQuery().in(this);
+    query.select('.cart-footer .car-box').boundingClientRect(cartRect => {
+      console.log(222222,cartRect);
+      if (!cartRect) return;
+      let animateInfo = {
+        startX,
+        startY,
+        endX:cartRect.left,
+        endY:cartRect.bottom,
+      }
+      this.setData({
+        move:true,
+        animateInfo
+      })
+      console.log(animateInfo);
+    }).exec();
+
+   
+  
+  },
+  endAnimate(){
+    let animateInfo = {
+      startX:9999,
+      startY:0,
+      endX:0,
+      endY:0,
+    }
+    this.setData({
+      move:false,
+      animateInfo
+    })
+  },
+  // 添加修改购物车数量
+  changeCar(data,name,index,subIndex) {
+    var params = {
+      url: "/p/shopCart/changeItem?t="+new Date().getTime(),
+      method: "post",
+      data,
+      callBack: (res) => {
+        if(res.code == 500){
+          wx.showToast({
+            title: res.msg,
+            icon:'none'
+          })
+        }else{
+          if(name == 'handleNum'){//加减 为你推荐
+            this.setData({
+              totalCartNum: this.data.totalCartNum + this.data.prodNum,
+            });
+          }else{//加
+            let list = this.data.list
+            list[index][subIndex].prodCount+=1
+            this.setData({
+              totalCartNum: this.data.totalCartNum + this.data.prodNum,
+              list
+            });
+          }
+        }
+      }
+    };
+    http.request(params);
+  },
+
   /**
    * 团购商品详情信息
    */
@@ -904,7 +1024,7 @@ Page({
       url: "/p/shopCart/prodCount",
       method: "GET",
       dontTrunLogin: true,
-      data: {platform:1},
+      data: {channelId:wx.getStorageSync('channelId')||3},
       callBack: (res) => {
         if (res > 0) {
           // wx.setTabBarBadge({
@@ -1070,14 +1190,20 @@ Page({
         shopName: this.data.shopName,
         skuId: this.data.defaultSku.skuId,
         distributionCardNo: this.data.distributionCardNo,
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3
       },
       callBack: (res) => {
+        wx.hideLoading();
+        if(res.code == 500){
+         return wx.showToast({
+            title: "加入购物车成功",
+            icon: "none"
+          })
+        }
         this.setData({
           totalCartNum: this.data.totalCartNum + this.data.prodNum,
           skuShow: false,
         });
-        wx.hideLoading();
         wx.showToast({
           title: "加入购物车成功",
           icon: "none"
@@ -1192,13 +1318,13 @@ Page({
       var cardno = wx.getStorageSync("distCardNo");
       return {
         title: this.data.prodName,
-        path: '/pages/prod/prod?prodid=' + this.data.prodId + '&cardno=' + cardno + '&type=' + this.data.shareType,
+        path: `/pages/prod/prod?prodid=${this.data.prodId}&shopid=${this.data.shopId}&cardno=${cardno}&type=${this.data.shareType}`,
         imageUrl: this.data.pic,
       }
     } else {
       return {
         title: this.data.prodName,
-        path: '/pages/prod/prod?prodid=' + this.data.prodId
+        path: `/pages/prod/prod?prodid=${this.data.prodId}&shopid=${this.data.shopId}`
       }
     }
   },

pages/prod/prod.wxml

@@ -20,118 +20,46 @@
   <!-- 轮播图end -->
 
   <view class="content">
-
-    <!-- 倒计时栏 -->
-      <!-- 拼团 -->
-    <!-- <view class="countdown-box clearfix" wx-if="{{groupActivityId}}">
-      <text class="second-kill">拼团</text>
-      <view class="countdown-content">
-        <text class="countdown-tips" wx-if="{{groupActivity.activityStatus === 1}}">距开始仅剩</text>
-        <text class="countdown-tips" wx-if="{{groupActivity.activityStatus !== 1}}">距结束仅剩</text>
-        <text class="countdown-time">{{endOfGroupTime.day}} 天 {{endOfGroupTime.hou}} 时 {{endOfGroupTime.min}} 分 {{endOfGroupTime.sec}} 秒
-        </text>
-      </view>
-    </view> -->
     <!-- 普通商品价格 -->
     <view class="prod-price" wx-if="{{!groupActivityId}}">
       <text class="price">￥<text class="price-num">{{wxs.parsePrice(defaultSku.price)[0]}}</text>.{{wxs.parsePrice(defaultSku.price)[1]}}</text>
-      <!-- <text class="sales"></text> -->
     </view>
     <!-- 商品信息 -->
     <view class='prod-info'>
       <view class="tit-wrap">
         <view class="prod-tit">{{prodName}}</view>
-        <view class="col" bindtap='addOrCannelCollection'>
+        <!-- <view class="col" bindtap='addOrCannelCollection'>
           <image wx-if="{{!isCollection}}" src="../../images/icon/prod-col.png"></image>
           <image wx-if="{{isCollection}}" src="../../images/icon/prod-col-red.png"></image>
-          <!-- 收藏 -->
-        </view>
+        </view> -->
       </view>
       <view class="sub-title" wx:if="{{halfTitle}}">{{halfTitle}}</view>
       <view class="sales-p" wx:if="{{brief}}">{{brief}}</view>
-
-      <!-- 拼团商品价格 -->
-      <view class="goods-price" wx-if="{{groupActivityId}}">
-        <view class="current-price">
-          <text class="current-price">
-            <text class="price">￥<text class="price-num">{{wxs.parsePrice(detaultGroupSku.actPrice)[0]}}</text> .{{wxs.parsePrice(detaultGroupSku.actPrice)[1]}}</text>
-            <!-- <text class="sub">￥{{detaultGroupSku.actPrice}}</text> -->
-          </text>
-          <text class="condition">{{groupActivity.groupNumber}}人拼团价</text>
-        </view>
-        <view class="original">
-          原价
-          <text class="original-price">￥{{wxs.toPrice(detaultGroupSku.price)}}</text>
-        </view>
-      </view>
-      <!-- 积分商品价格 -->
-      <!-- <view class="integral-prod-price" wx-if="">100积分</view> -->
     </view>
     <!-- 商品信息end -->
 
-    <!-- 满减折 -->
-    <view class="discount border-radius-box" wx:if="{{prodDiscountList.length}}" bindtap="clickDiscount">
-      <view class="coupon-tit">促销</view>
-      <view class="coupon-con discount-con">
-        <block wx:for="{{prodDiscountList}}" wx:key="discountId" wx:if="{{index<1}}">
-          <view class="discount-item">
-            <view class="discount-tag">{{wxs.parseDiscount(item.discountRule)}}</view>
-            <text class="discount-content">
-              <text wx:if="{{item.discountType}}">每</text> {{item.discountName}}，最高减免{{item.maxReduceAmount}}元
-            </text>
-          </view>
-        </block>
+    <view class="intro-box">
+      <view class="intro-item">
+       <view class="title">{{brandName}}</view>
+       <view class="desc">品牌</view>
       </view>
-      <!-- <view class="num">共{{prodDiscountList.length}}张</view> -->
-      <view class="more">...</view>
-    </view>
-    <!-- 满减折end -->
-
-    <!-- 领券 -->
-    <!-- <view class="coupon border-radius-box" bindtap='showPopup' wx:if="{{couponList.length && !groupActivityId}}">
-      <view class="coupon-tit">领券</view>
-      <view class="coupon-con">
-        <text class="item" wx:for="{{couponList}}" wx:if="{{index<2}}" wx:key="couponId">满{{item.cashCondition}}<block wx:if="{{item.couponType == 1}}">减{{item.reduceAmount}}</block>
-          <block wx:if="{{item.couponType == 2}}">打{{item.couponDiscount}}折</block>
-        </text>
+      <view class="intro-item">
+       <view class="title">{{skuList[0].weight}}克</view>
+       <view class="desc">重量</view>
       </view>
-      <view class="num">共{{couponList.length}}张</view>
-      <view class="more">...</view>
-    </view> -->
-    <!-- 领券end -->
-    <!-- 拼团信息 -->
-    <view class="spell-infor" wx-if="{{joinGroupList.length}}">
-      <view class="spell-infor-title">以下小伙伴正在发起拼团，你可以直接参加</view>
-      <view class="spell-infor-content" wx:for="{{joinGroupList}}" wx:key='groupTeamId'>
-        <!-- 头像 -->
-        <view class="head-img">
-          <image src="{{item.sharePic}}"></image>
-        </view>
-        <!-- 信息 -->
-        <view class="spell-msg">
-          <view class="username">{{item.shareNickName}}</view>
-          <view class="spell-text">
-            还差
-            <text class="red-font">{{item.groupNumber - item.joinNum}}</text> 人成团，剩余 {{item.endOfGroupTime.hou}}时{{item.endOfGroupTime.min}}分{{item.endOfGroupTime.sec}}秒
-          </view>
-        </view>
-        <!-- 凑团按钮 -->
-        <view class="join-group" bindtap="toSpellGroupDetail" data-groupteamid="{{item.groupTeamId}}">
-          去凑团
-        </view>
-      </view>
-      <!-- 详情 -->
-      <view class="rules clearfix">
-        <text class="rules-text01">支付开团邀请{{groupActivity.groupNumber}}人参团，人数不足自动退款</text>
+      <view class="intro-item">
+       <view class="title">{{skuList[0].weightUnit}}</view>
+       <view class="desc">单位</view>
       </view>
+      <image class="more" src="/images/icon/more.png" mode="" />
     </view>
-    <!-- 拼团信息end -->
+
     <!-- 已选规格 -->
-    <view class="sku border-radius-box" bindtap='showSku'>
+    <!-- <view class="sku border-radius-box" bindtap='showSku'>
       <view class="sku-tit">已选</view>
       <view class="sku-con">{{selectedProp.length>1?selectedProp+'，':selectedProp}}{{prodNum}}件</view>
       <view class="more">...</view>
-    </view>
+    </view> -->
     <!-- 已选规格end -->
     <!-- 评价 -->
     <view class='cmt-wrap border-radius-box'>
@@ -185,13 +113,16 @@
         <view class="tab {{tab == 1?'active':''}}" data-tab="1" bind:tap="handleTab">经常一起买</view>
       </view>
       <swiper class="swiper-prod {{list[0].length>3?'h844':''}}"  wx-if="{{list[0].length>0}}" indicator-dots="true" indicator-active-color="#006CE8" >
-        <swiper-item class="swiper-item" wx:for="{{list}}">
+        <swiper-item class="swiper-item" wx:if="{{item.length}}" wx:for="{{list}}">
             <view class="item" wx:for="{{item}}" wx:for-item="i" wx:for-index="d" wx:key="{{d}}" bindtap='toProdPage' data-prodid="{{i.prodId}}" data-shopid="{{i.shopId}}">
               <image lazy-load class="item-img" src="{{i.pic}}" mode="widthFix"></image>
               <view class="item-title">{{i.prodName}}</view>
               <view class="price-box">
-                  <view class="name-price" style="font-size:26rpx;color: #FF4D3A;">￥{{wxs.toPrice(i.price)}}</view>
-                <image style="width:44rpx;height:44rpx;" src="/images/icon/car-btn.png" mode=""/>
+                  <view class="name-price" style="font-size:26rpx;color: #FF4D3A;">￥{{i.channelProdPrice}}</view>
+                  <view style="position: relative;"  data-index="{{index}}" data-subindex="{{d}}" data-num="1" data-item="{{i}}" catch:tap="handleAdd">
+                    <image style="width:44rpx;height:44rpx;" src="/images/icon/car-btn.png" mode=""/>
+                    <view class="num" wx:if="{{i.prodCount}}">{{i.prodCount}}</view>
+                  </view>
               </view>
             </view>
         </swiper-item>
@@ -270,7 +201,13 @@
                     <view class="name-price">
                       <view style="font-size:26rpx;color: #FF4D3A;">￥</view>{{wxs.toPrice(item.price)}}
                     </view>
-                    <image style="width:52rpx;height:52rpx;" src="/images/icon/car-btn.png" mode=""/>
+
+                    <view wx:if="{{item.prodCount}}" class="num-box">
+                      <image class="btn" data-num="-1" data-item="{{item}}" catch:tap="handleNum" src="/images/icon/reduce.png" mode=""/>
+                        <view class="num">{{item.prodCount||0}}</view>
+                      <image class="btn" data-num="1" data-item="{{item}}" data-type="add" catch:tap="handleNum" src="/images/icon/add.png" mode=""/>
+                     </view>
+                    <image wx:else class="test" style="width:52rpx;height:52rpx;" src="/images/icon/car-btn.png" mode="" data-img="/images/icon/car-btn.png" data-type="add" data-num="1" data-item="{{item}}" data-index="{{index}}" catch:tap="handleNum" />
                   </view>
                   <!-- <view class="rank-box">
                     <image src="/images/icon/top-icon.png" mode="" class="icon"/>
@@ -303,7 +240,12 @@
                     <view class="name-price">
                       <view style="font-size:26rpx;color: #FF4D3A;">￥</view>{{wxs.toPrice(item.price)}}
                     </view>
-                    <image style="width:52rpx;height:52rpx;" src="/images/icon/car-btn.png" mode=""/>
+                    <view wx:if="{{item.prodCount}}" class="num-box">
+                      <image class="btn" data-num="-1" data-item="{{item}}" catch:tap="handleNum" src="/images/icon/reduce.png" mode=""/>
+                        <view class="num">{{item.prodCount||0}}</view>
+                      <image class="btn" data-num="1" data-item="{{item}}" data-type="add" catch:tap="handleNum" src="/images/icon/add.png" mode=""/>
+                     </view>
+                    <image wx:else class="test" style="width:52rpx;height:52rpx;" src="/images/icon/car-btn.png" mode="" data-img="/images/icon/car-btn.png" data-type="add" data-num="1" data-item="{{item}}" data-index="{{index}}" catch:tap="handleNum" />
                   </view>
                   <!-- <view class="rank-box">
                     <image src="/images/icon/top-icon.png" mode="" class="icon"/>
@@ -338,7 +280,7 @@
       客服
       <button class="contact-btn" open-type="contact" bindcontact="handleContact" session-from="sessionFrom"></button>
     </view>
-    <view class="btn icon" bindtap='toCartPage'>
+    <view class="btn icon car-box" bindtap='toCartPage'>
       <image src="../../images/tabbar/basket.png"></image>
       购物车
       <view class='badge badge-1' wx:if="{{totalCartNum>0}}">{{totalCartNum}}</view>
@@ -355,72 +297,13 @@
   <!-- <view class="ex-integral-foot">
     <view class="ex-integral-btn">立即兑换</view>
   </view> -->
-  <!-- 【拼团】底部按钮 -->
-  <view class="foot-box" wx-if="{{groupActivityId}}">
-    <view class="footer">
-      <view class="foot-btn" bindtap='toHomePage'>
-        <image src="../../images/tabbar/homepage.png"></image>
-        首页
-      </view>
-      <view catchtap='freeTell' class='foot-btn'>
-        <image src='../../images/icon/shop-customer-service.png'></image>
-        客服
-      </view>
-      <view class="foot-btn" bindtap='toCartPage'>
-        <image src="../../images/tabbar/basket.png"></image>
-        购物车
-        <view class='badge badge-1' wx:if="{{totalCartNum>0}}">{{totalCartNum}}</view>
-      </view>
-      <view class="buy-btn alone-buy cart-radius" bindtap='showSku' data-alonebuy="1">
-        <text>单独购买</text>
-      </view>
-      <view class="buy-btn group-buy cart-radius" bindtap='showGroupSku'>
-        <text>开团</text>
-      </view>
-    </view>
-  </view>
-  <!-- end 底部按钮 -->
+
 </view>
 
 
-<!-- 满减折弹窗 -->
-<view class="popup-hide" wx:if="{{showDiscountPopup}}">
-  <view class="popup-box border-radius-t-r">
-    <view class="popup-tit border-radius-t-r">
-      <text>促销</text>
-      <text class="close" bindtap='clickDiscount'></text>
-    </view>
-    <view class='popup-cnt popup-discount'>
-      <view class="coupon-con discount-con">
-        <block wx:for="{{prodDiscountList}}" wx:key="discountId">
-          <view class="discount-item">
-            <view class="discount-tag">{{wxs.parseDiscount(item.discountRule)}}</view>
-            <text class="discount-content">
-              <text wx:if="{{item.discountType}}">每</text> {{item.discountName}}，最高减免{{item.maxReduceAmount}}元
-            </text>
-          </view>
-        </block>
-      </view>
-    </view>
-  </view>
-</view>
-<!-- 满减折弹窗 end -->
 
-<!-- 优惠券弹窗 -->
-<view class="popup-hide" wx:if="{{popupShow}}">
-  <view class="popup-box border-radius-t-r">
-    <view class="popup-tit border-radius-t-r">
-      <text>优惠券</text>
-      <text class="close" bindtap='closePopup'></text>
-    </view>
-    <view class='popup-cnt'>
-      <block wx:for="{{couponList}}" wx:key='couponId'>
-        <coupon showTimeType="{{1}}" canUse="{{true}}" item="{{item}}"></coupon>
-      </block>
-    </view>
-  </view>
-</view>
-<!-- 优惠券 end -->
+
+
 <!-- 规格弹窗 -->
 <view class="pup-sku" wx:if="{{skuShow}}">
   <view class="pup-sku-main border-radius-t-r">
@@ -486,17 +369,17 @@
   <view class="cmt-tit">
     <view class="cmt-t">
       商品评价
-      <text class="cmt-good">好评度{{prodCommData.goodRate}}%</text>
+      <text class="cmt-good">好评度{{prodCommData.goodRate}}</text>
     </view>
     <text class="close" bindtap='closePopup'></text>
   </view>
   <view class="cmt-cont">
     <view class="cmt-tag">
-      <text bindtap='getProdCommPage' data-evaluate="-1" class="{{evaluate==-1?'selected':''}}">全部({{prodCommData.all}})</text>
-      <text bindtap='getProdCommPage' data-evaluate="0" class="{{evaluate==0?'selected':''}}">好评({{prodCommData.goodCount}})</text>
-      <text bindtap='getProdCommPage' data-evaluate="1" class="{{evaluate==1?'selected':''}}">中评({{prodCommData.middleCount}})</text>
-      <text bindtap='getProdCommPage' data-evaluate="2" class="{{evaluate==2?'selected':''}}">差评({{prodCommData.badCount}})</text>
-      <text bindtap='getProdCommPage' data-evaluate="3" class="{{evaluate==3?'selected':''}}">有图({{prodCommData.picCount}})</text>
+      <text bindtap='getProdCommPage' data-commStatus="-1" class="{{commStatus==-1?'selected':''}}">全部({{prodCommData.all}})</text>
+      <text bindtap='getProdCommPage' data-commStatus="0" class="{{commStatus==0?'selected':''}}">好评({{prodCommData.goodCount}})</text>
+      <text bindtap='getProdCommPage' data-commStatus="1" class="{{commStatus==1?'selected':''}}">中评({{prodCommData.middleCount}})</text>
+      <text bindtap='getProdCommPage' data-commStatus="2" class="{{commStatus==2?'selected':''}}">差评({{prodCommData.badCount}})</text>
+      <text bindtap='getProdCommPage' data-commStatus="3" class="{{commStatus==3?'selected':''}}">有图({{prodCommData.picCount}})</text>
     </view>
     <view class="cmt-items">
       <view class="cmt-item" wx:for="{{prodCommPage.records}}" wx:key="prodCommId">
@@ -587,5 +470,19 @@
     <view class="code-txt" bindtap="downloadImg">保存至相册</view>
   </view>
 </view>
+
+
+
+<!-- 抛物线动画容器（数据驱动渲染） -->
+<view class="animation-wrap" id="animationWrap">
+  <view class="{{move?'move-x':''}}" style="position:absolute;width: 50rpx;height: 50rpx;left:{{animateInfo.startX}}px;top:{{animateInfo.startY}}px;--endX: {{animateInfo.endX-animateInfo.startX}}px;--endY: {{animateInfo.endY-animateInfo.startY}}px;" bind:animationend="endAnimate" >
+    <image 
+      class="{{move?'move-y':''}}"
+      src="/images/icon/car-btn.png"
+      style="width: 40rpx;height: 40rpx;--endX: {{animateInfo.endX-animateInfo.startX}}px; --endY: {{animateInfo.endY-animateInfo.startY}}px;"
+      bind:animationend="endAnimate"
+    ></image>
+  </view>
+</view>
 <!-- 二维码弹窗 end -->
 <wxs module="wxs" src="../../wxs/number.wxs" />

pages/prod/prod.wxss

@@ -410,7 +410,6 @@ image {
 }
 
 .cmt-t {
-  width: 300rpx;
   font-size: 32rpx;
   color: #222222;
   font-weight: bold;
@@ -1863,6 +1862,7 @@ button.btn-type::after {
   overflow: hidden;
   padding: 0 20rpx;
   margin-top: 20rpx;
+  height: 60rpx;
 }
 
 .swiper-prod .item .price-box{
@@ -1874,6 +1874,20 @@ button.btn-type::after {
   padding: 0 20rpx;
 }
 
+.swiper-prod .item .price-box .num{
+  width: 24rpx;
+  height: 24rpx;
+  line-height: 24rpx;
+  text-align: center;
+  background: #FF4D3A;
+  border-radius: 50%;
+  font-size: 20rpx;
+  color: #FFFFFF;
+  position: absolute;
+  top: -12rpx;
+  right: -6rpx;
+}
+
 .swiper-prod .item .price-box .name-price{
   font-weight: bold;
   font-size: 32rpx;
@@ -1930,6 +1944,30 @@ button.btn-type::after {
   color: #FF4D3A;
 }
 
+.prod-content .num-box{
+  display: flex;
+  align-items: center;
+}
+
+.prod-content .num-box .btn{
+  font-size: 20rpx;
+  width: 44rpx;
+  height: 44rpx;
+  text-align: center;
+}
+.prod-content .num-box .num{
+  width: 80rpx;
+  height: 44rpx;
+  background: #FFFFFF;
+  text-align: center;
+  line-height: 40rpx;
+  font-size: 24rpx ;
+  color: #222222;
+  border-bottom: 2rpx solid #F0F0F0;
+  border-top: 2rpx solid #F0F0F0;
+  box-sizing: border-box;
+}
+
 .prod-content .item-img {
   width: 100%;
   vertical-align: bottom;
@@ -1982,4 +2020,86 @@ button.btn-type::after {
 
 .none .van-empty__description{
   margin-top: -30rpx;
+}
+
+
+/* 动画容器：全屏覆盖，不影响下层交互 */
+.animation-wrap {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  pointer-events: none;
+  z-index: 9999;
+}
+
+/* 抛物线小图标样式 */
+.move-x {
+  animation: 
+    moveX .5s linear forwards;  /* X轴匀速 */
+   
+}
+.move-y{
+  animation: moveY .5s cubic-bezier(0.5, -0.5, 1, 1)  forwards; 
+}
+
+/* 核心抛物线动画：贝塞尔曲线轨迹 */
+@keyframes moveX  {
+  from {
+    transform: translateX(0);
+  }
+  to {
+    transform: translateX(var(--endX));
+  }
+}
+
+/* 核心抛物线动画：贝塞尔曲线轨迹 */
+@keyframes moveY  {
+  from {
+    transform: translateY(0);
+    opacity: 1;
+  }
+  to {
+    transform: translateY(var(--endY));
+    opacity: 0;
+  }
+}
+
+
+.intro-box{
+  display: flex;
+  background: #FFFFFF;
+  border-radius: 16rpx 16rpx 16rpx 16rpx;
+  padding: 24rpx 20rpx 24rpx 0;
+  margin-top: 20rpx;
+  position: relative;
+}
+.intro-box .intro-item{
+  flex: 1;
+  border-right: 2rpx solid #F0F0F0;
+  padding-left: 20rpx;
+  /* text-align: center; */
+}
+.intro-box .intro-item:last-child{
+  border-right: none;
+}
+
+.intro-box .intro-item .title{
+  font-weight: 800;
+  font-size: 28rpx;
+  color: #222222;
+}
+.intro-box .more{
+  position: absolute;
+  width: 20rpx;
+  height: 20rpx;
+  top: calc(50% - 10rpx);
+  right: 20rpx;
+}
+
+.intro-box .intro-item .desc{
+  font-size: 24rpx;
+  color: #AAAAAA;
+  margin-top: 16rpx;
 }

pages/search-prod-show/search-prod-show.js

@@ -70,8 +70,7 @@ Page({
       size: this.data.size,
       sort: this.data.sts,
       isAllProdType: true,
-      platform:1,
-      channelId:wx.getStorageSync('channelId'),
+      channelId:wx.getStorageSync('channelId')||3,
       lat: wx.getStorageSync('LATITUDE'),
       lon: wx.getStorageSync('LONGITUDE'),
       distance: 9999999||wx.getStorageSync('DISTANCE') || 0

pages/shopCategory/shopCategory.js

@@ -68,8 +68,7 @@ Page({
         size:10,
         sort:0,
         isAllProdType: true,
-        platform:1,
-        channelId:wx.getStorageSync('channelId'),
+        channelId:wx.getStorageSync('channelId')||3,
 
       },
       callBack:res=>{

pages/shopPage/shopPage.js

@@ -115,8 +115,7 @@ Page({
       method: 'GET',
       data: {
         shopId: this.data.shopId,
-        platform:1,
-        channelId:wx.getStorageSync('channelId'),
+        channelId:wx.getStorageSync('channelId')||3,
         isAllProdType: true
       },
       callBack: (res) => {

pages/shopProds/shopProds.js

@@ -54,8 +54,7 @@ Page({
         sort: this.data.sort,
         current: this.data.current,
         isAllProdType: true,
-        channelId:wx.getStorageSync('channelId'),
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3,
       },
       callBack: (res) => {
         wx.hideLoading()

pages/shopSearchResult/shopSearchResult.js

@@ -81,8 +81,7 @@ Page({
         sort: this.data.sts,
         shopId: this.data.shopId,
         isAllProdType: true,
-        channelId:wx.getStorageSync('channelId'),
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3,
       },
       callBack: function (res) {
         ths.setData({

pages/submit-order/submit-order.js

@@ -133,7 +133,7 @@ Page({
         userChangeCoupon: this.data.userChangeCoupon,
         isScorePay: this.data.isScorePay,
         userUseScore: this.data.userUseScore ? this.data.userUseScore : 0,
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3,
       },
       callBack: res => {
         wx.hideLoading();
@@ -352,10 +352,16 @@ Page({
         // coupons: this.data.platformCoupons,
         coupons: this.data.coupons,
         isScorePay: this.data.isScorePay,
-        platform:1
+        channelId:wx.getStorageSync('channelId')||3,
       },
       callBack: res => {
         wx.hideLoading();
+        if(res.code == 500) {
+          return wx.showToast({
+            title: res.msg,
+            icon:"none"
+          })
+        }
         if(res.nextPay){
           this.calWeixinPay(res.orderNumbers);
         }else{

pages/user/user.js

@@ -463,7 +463,9 @@ Page({
       url:'/p/score/scoreInfo',
       method:'GET',
       dontTrunLogin: true,
-      data:{platform:1},
+      data:{
+        channelId:wx.getStorageSync('channelId')||3,
+      },
       callBack: res => {
         this.setData({
           userLevelInfo: res

utils/config.js

@@ -4,7 +4,7 @@
 
 var domain = "https://shop.api.zswlgz.com"; //统一接口域名，测试环境 
 var wsDomain = "wss://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
-// var domain = "http://89561bkaq794.vicp.fun"; //统一接口域名，正式环境 
+// var domain = "http://47.109.84.152:8112"; //统一接口域名，正式环境 
 // var wsDomain = "wss://shop.haimamart.com/api"; //统一接口域名，正式环境 
 
 // var domain = "http://192.168.1.206:8112"; //统一接口域名，测试环境

utils/http.js

@@ -214,7 +214,7 @@ function getCartCount() {
     url: "/p/shopCart/prodCount",
     method: "GET",
     dontTrunLogin: true,
-    data: {platform:1},
+    data: {channelId:wx.getStorageSync('channelId')||3,},
     callBack: function (res) {
       if (res > 0) {
         wx.setTabBarBadge({