修改渠道

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/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/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/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/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({