From 791480ee67c0a32732c22d9d109c2310102ea659 Mon Sep 17 00:00:00 2001 From: initwithout Date: Fri, 21 Apr 2023 13:14:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=B5=81=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cart/cart.js | 1 + pages/category/category.js | 1 + pages/login/login.js | 9 ++-- pages/order/pay.js | 6 +-- pages/product/detail.js | 1 + pages/store/store.js | 1 + utils/server.js | 90 +++++++++++++++++++------------------- 7 files changed, 58 insertions(+), 51 deletions(-) diff --git a/pages/cart/cart.js b/pages/cart/cart.js index 636b843..d6cf20b 100644 --- a/pages/cart/cart.js +++ b/pages/cart/cart.js @@ -390,6 +390,7 @@ Page({ WXAPI.cartIndex({ accessId: app.globalData.accessId, storeId: 239, + storeType: 1, page: 1 }).then(res => { if (res.code == 200) { diff --git a/pages/category/category.js b/pages/category/category.js index 9eb26a2..400330a 100644 --- a/pages/category/category.js +++ b/pages/category/category.js @@ -24,6 +24,7 @@ Page({ WXAPI.searchIndex({ accessId: app.globalData.accessId, storeId: 239, + storeType: 1, }).then(res => { if (res.code == 200) { var data = res.data; diff --git a/pages/login/login.js b/pages/login/login.js index 84e0e52..a1b7756 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -84,11 +84,12 @@ Page({ code: code, }) WXAPI.getWXTemplates({ - code: code, storeId: 239, + storeType: 1, }).then(res => { if (res.code == 200) { - wx.setStorageSync('tmplIds', res.data.templates) + var data = res.data + wx.setStorageSync('logmsgId', [data.delivery]) } }) } @@ -99,6 +100,7 @@ Page({ // WXAPI.wxLogin({ // code: that.data.code, // storeId: 239, + // storeType: 1, // }).then(res => { // if (res.code == 200) { // var data = res.data @@ -137,6 +139,7 @@ Page({ WXAPI.wxLogin({ code: that.data.code, storeId: 239, + storeType: 1, }).then(res => { if (res.code == 200) { var data = res.data @@ -175,6 +178,7 @@ Page({ var that = this; WXAPI.login({ storeId: 239, + storeType: 1, phone: that.data.account, password: that.data.password, }).then(res => { @@ -210,7 +214,6 @@ Page({ app.getUserInfo('', '', res, function (){ let userInfo = res; var user = app.globalData.userInfo; - app.globalData.userInfo['avatarUrl'] = userInfo.avatarUrl; // 头像 app.globalData.userInfo['nickName'] = userInfo.nickName; // 昵称 app.globalData.userInfo['gender'] = userInfo.gender; // 性别 diff --git a/pages/order/pay.js b/pages/order/pay.js index 5a65e7c..1363c70 100644 --- a/pages/order/pay.js +++ b/pages/order/pay.js @@ -162,6 +162,7 @@ Page({ WXAPI.settlement({ accessId: app.globalData.accessId, storeId: 239, + storeType: 1, cart_id: that.data.cartId, coupon_id: 0, vipSource: 0, @@ -422,10 +423,9 @@ Page({ }, // 订阅消息 subscribeMessage() { - var tmplIds = wx.getStorageSync('tmplIds') - console.log(tmplIds) + var logmsgId = wx.getStorageSync('logmsgId') wx.requestSubscribeMessage({ - tmplIds: tmplIds, + tmplIds: logmsgId, success (res) { console.log(res); } diff --git a/pages/product/detail.js b/pages/product/detail.js index 5f78537..a3ca3da 100644 --- a/pages/product/detail.js +++ b/pages/product/detail.js @@ -156,6 +156,7 @@ Page({ WXAPI.productIndex({ accessId: app.globalData.accessId, storeId: 239, + storeType: 1, pro_id: that.data.productId, vipSource: 0 }).then(res => { diff --git a/pages/store/store.js b/pages/store/store.js index 7b785b0..5b19c1b 100644 --- a/pages/store/store.js +++ b/pages/store/store.js @@ -123,6 +123,7 @@ Page({ WXAPI.productIndex({ accessId: app.globalData.accessId, storeId: 239, + storeType: 1, pro_id: productId, vipSource: 0 }).then(res => { diff --git a/utils/server.js b/utils/server.js index c2fdd2d..3149730 100644 --- a/utils/server.js +++ b/utils/server.js @@ -1,5 +1,5 @@ //小程序开发api接口 -const API_BASE_URL = 'https://mall.gylservice.com/gw?module=app' +const API_BASE_URL = 'https://mall.gylservice.com/gw?api=' const requestServer = (url, method, data) => { let _url = API_BASE_URL + url @@ -57,140 +57,140 @@ module.exports = { requestServer, /* 登录 */ login: (data) => { //登录 - return requestServer('&action=login&app=login', 'post', data) + return requestServer('app.login.login', 'post', data) }, wxLogin: (data) => { //微信一键登录 - return requestServer('&action=login&app=user', 'post', data) + return requestServer('app.login.user', 'post', data) }, logout: (data) => { //退出登录 - return requestServer('&action=login&app=quit', 'post', data) + return requestServer('app.login.quit', 'post', data) }, getWXTemplates: (data) => { //获取订阅消息模板 - return requestServer('&action=message&app=getWXTemplates', 'post', data) + return requestServer('app.message.getWxTemplates', 'post', data) }, /* 首页 */ homeIndex: (data) => { //首页 - return requestServer('&action=index&app=index', 'post', data) + return requestServer('app.index.index', 'post', data) }, newArrival: (data) => { //新品上市 - return requestServer('&action=index&app=new_arrival', 'post', data) + return requestServer('app.index.new_arrival', 'post', data) }, recommend: (data) => { //好物优选 - return requestServer('&action=index&app=recommend', 'post', data) + return requestServer('app.index.recommend', 'post', data) }, productIndex: (data) => { //商品详情 - return requestServer('&action=product&app=index', 'post', data) + return requestServer('app.product.index', 'post', data) }, /* 分类 */ searchIndex: (data) => { //分类页 - return requestServer('&action=search&app=index', 'post', data) + return requestServer('app.search.index', 'post', data) }, listdetail: (data) => { //分类详情 - return requestServer('&action=search&app=listdetail', 'post', data) + return requestServer('app.search.listdetail', 'post', data) }, searchList: (data) => { //分类搜索 - return requestServer('&action=search&app=search', 'post', data) + return requestServer('app.search.search', 'post', data) }, /* 购物车 */ appCart: (data) => { // - return requestServer('&action=app&app=cart', 'post', data) + return requestServer('app.app.cart', 'post', data) }, cartIndex: (data) => { //购物车 - return requestServer('&action=cart&app=index', 'post', data) + return requestServer('app.cart.index', 'post', data) }, productAddCart: (data) => { //加入购物车 - return requestServer('&action=product&app=add_cart', 'post', data) + return requestServer('app.product.add_cart', 'post', data) }, productUpNum: (data) => { //购物车商品添加数量 - return requestServer('&action=cart&app=up_cart', 'post', data) + return requestServer('app.cart.up_cart', 'post', data) }, productDelcart: (data) => { //删除购物车 - return requestServer('&action=cart&app=delcart', 'post', data) + return requestServer('app.cart.delcart', 'post', data) }, productDelAllCart: (data) => { //清空购物车 - return requestServer('&action=cart&app=delAll_cart', 'post', data) + return requestServer('app.cart.delAll_cart', 'post', data) }, /* 我的 */ userIndex: (data) => { //个人中心 - return requestServer('&action=user&app=index', 'post', data) + return requestServer('app.user.index', 'post', data) }, mchClass: (data) => { //店铺分类 - return requestServer('&action=index&app=mchClass', 'post', data) + return requestServer('app.index.mchClass', 'post', data) }, shopList: (data) => { //店铺分类 - return requestServer('&action=index&app=recommend_stores', 'post', data) + return requestServer('app.index.recommend_stores', 'post', data) }, settlement: (data) => { //确认订单信息 - return requestServer('&action=order&app=Settlement', 'post', data) + return requestServer('app.order.Settlement', 'post', data) }, orderPayment: (data) => { //确认订单 payment - return requestServer('&action=order&app=payment', 'post', data) + return requestServer('app.order.payment', 'post', data) }, leaveSettlement: (data) => { - return requestServer('&action=order&app=leave_Settlement', 'post', data) + return requestServer('app.order.leave_Settlement', 'post', data) }, addressIndex: (data) => { //地址管理列表 - return requestServer('&action=address&app=index', 'post', data) + return requestServer('app.address.index', 'post', data) }, saveAddress: (data) => { //添加地址 - return requestServer('&action=address&app=SaveAddress', 'post', data) + return requestServer('app.address.SaveAddress', 'post', data) }, addressDelAdds: (data) => { //删除地址 - return requestServer('&action=address&app=del_adds', 'post', data) + return requestServer('app.address.del_adds', 'post', data) }, addressUpAdds: (data) => { //修改地址 - return requestServer('&action=address&app=up_adds', 'post', data) + return requestServer('app.address.up_adds', 'post', data) }, getLocation: (data) => { //获取地址信息 - return requestServer('&action=index&app=get_location', 'post', data) + return requestServer('app.index.get_location', 'post', data) }, orderList: (data) => { //订单列表 - return requestServer('&action=order&app=index', 'post', data) + return requestServer('app.order.index', 'post', data) }, orderDetails: (data) => { //订单详情 - return requestServer('&action=order&app=order_details', 'post', data) + return requestServer('app.order.order_details', 'post', data) }, logisticsDetails: (data) => { //物流详情 - return requestServer('&action=order&app=logistics', 'post', data) + return requestServer('app.order.logistics', 'post', data) }, removeOrder: (data) => { //取消订单 - return requestServer('&action=order&app=removeOrder', 'post', data) + return requestServer('app.order.removeOrder', 'post', data) }, orderRemind: (data) => { //提醒发货 - return requestServer('&action=order&app=delivery_delivery', 'post', data) + return requestServer('app.order.delivery_delivery', 'post', data) }, confirmOrder: (data) => { //确认收货 - return requestServer('&action=order&app=ok_Order', 'post', data) + return requestServer('app.order.ok_Order', 'post', data) }, deleteOrder: (data) => { //删除订单 - return requestServer('&action=order&app=del_order', 'post', data) + return requestServer('app.order.del_order', 'post', data) }, returnDataList: (data) => { //售后 - return requestServer('&action=order&app=ReturnDataList', 'post', data) + return requestServer('app.order.ReturnDataList', 'post', data) }, footprint: (data) => { //历史足迹 - return requestServer('&action=footprint&app=index', 'post', data) + return requestServer('app.footprint.index', 'post', data) }, favorites: (data) => { //我的收藏 - return requestServer('&action=addFavorites&app=collection', 'post', data) + return requestServer('app.addFavorites.collection', 'post', data) }, addFavoritesIndex: (data) => { //添加收藏 - return requestServer('&action=addFavorites&app=index', 'post', data) + return requestServer('app.addFavorites.index', 'post', data) }, removeFavorites: (data) => { //取消收藏 - return requestServer('&action=addFavorites&app=removeFavorites', 'post', data) + return requestServer('app.addFavorites.removeFavorites', 'post', data) }, delallFavorites: (data) => { //清空收藏 - return requestServer('&action=addFavorites&app=alldel', 'post', data) + return requestServer('app.addFavorites.alldel', 'post', data) }, storeHome: (data) => { //店铺主页 - return requestServer('&action=mch&app=store_homepage', 'post', data) + return requestServer('app.mch.store_homepage', 'post', data) }, seemystore: (data) => { //查看店铺信息 - return requestServer('&action=mch&app=see_my_store', 'post', data) + return requestServer('app.mch.see_my_store', 'post', data) }, messageList: (data) => { //查看店铺信息 - return requestServer('&action=message&app=index', 'post', data) + return requestServer('app.message.index', 'post', data) }, /* -------------------- */