diff --git a/api/model/index.js b/api/model/index.js index ba86ddc..784fdaa 100644 --- a/api/model/index.js +++ b/api/model/index.js @@ -5,78 +5,78 @@ const api = { // 获取首页轮播图 getRiceBanner: { - url: '/rice_index/getRiceBanner', - method: 'GET', - }, - // 获取首页常规产品 - getRiceCommonProductList: { - url: '/rice_index/getRiceCommonProductList', + url: '/index_common/getRiceBanner', method: 'GET', }, + // 获取首页常规产品【废弃】 + // getRiceCommonProductList: { + // url: '/index_common/getRiceCommonProductList', + // method: 'GET', + // }, // 获取首页跳转图标 getRiceIconList: { - url: '/rice_index/getRiceIconList', + url: '/index_common/getRiceIconList', method: 'GET', }, // 获取首页新闻详情 getRiceNewsDetail: { - url: '/rice_index/getCommonNewsDetail', + url: '/index_common/getCommonNewsDetail', method: 'GET', }, // 获取首页新闻列表 getRiceNewsList: { - url: '/rice_index/getRiceNewsList', + url: '/index_common/getRiceNewsList', method: 'GET', }, // 获取首页公告列表 getRiceNoticeList: { - url: '/rice_index/getRiceNoticeList', + url: '/index_common/getRiceNoticeList', method: 'GET', }, // 获取首页商品详情 getRiceProductDetail: { - url: '/rice_index/getRiceProductDetail', + url: '/index_common/getRiceProductDetail', method: 'GET', }, // 获取首页体验产品 getRiceProductList: { - url: '/rice_index/getRiceProductList', + url: '/index_common/getRiceProductList', method: 'GET', }, // 查询分类接口 getCategoryList: { - url: '/rice_index/getCategoryList', + url: '/index_common/getCategoryList', method: 'GET', }, // 获取分类分页商品列表接口 getClassShopPageList: { - url: '/rice_index/getClassShopPageList', + url: '/index_common/getClassShopPageList', method: 'GET', }, // 加入购物车 addCart: { - url: '/rice_index/addCart', + url: '/index_common/addCart', method: 'GET', auth : true, showLoading : true, }, // 删除购物车信息 deleteCart: { - url: '/rice_index/deleteCart', + url: '/index_common/deleteCart', method: 'DELETE', auth : true, showLoading : true, }, // 修改购物车信息数量 updateCartNum: { - url: '/rice_index/updateCartNum', + url: '/index_common/updateCartNum', method: 'POST', auth : true, debounce : 300, }, // 创建订单 createOrder: { - url: '/rice_index/createOrder', + url: '/index_common/createOrder', method: 'GET', auth : true, limit : 1000, @@ -84,7 +84,7 @@ const api = { }, // 创建订单-再次支付 createOrderTwo: { - url: '/rice_index/createOrderTwo', + url: '/index_common/createOrderTwo', method: 'GET', auth : true, limit : 1000, @@ -92,7 +92,7 @@ const api = { }, // 多商品创建订单 createSumOrder: { - url: '/rice_index/createSumOrder', + url: '/index_common/createSumOrder', method: 'POST', auth : true, limit : 1000, @@ -100,7 +100,7 @@ const api = { }, // 多商品订单再次支付 createSumOrderAgain: { - url: '/rice_index/createSumOrderAgain', + url: '/index_common/createSumOrderAgain', method: 'POST', auth : true, limit : 1000, @@ -108,7 +108,7 @@ const api = { }, // 确认收货 confirmOrder: { - url: '/rice_index/confirmOrder', + url: '/index_common/confirmOrder', method: 'GET', auth : true, limit : 1000, diff --git a/api/model/info.js b/api/model/info.js index 26c4365..6ffb32b 100644 --- a/api/model/info.js +++ b/api/model/info.js @@ -4,7 +4,7 @@ const api = { // 充值 recharge: { - url: '/rice_info/recharge', + url: '/info_common/recharge', method: 'GET', auth : true, limit : 1000, @@ -12,7 +12,7 @@ const api = { }, // 提现 withdraw: { - url: '/rice_info/withdraw', + url: '/info_common/withdraw', method: 'GET', auth : true, limit : 1000, @@ -20,13 +20,13 @@ const api = { }, // 获取地址列表带分页 getAddressPageList: { - url: '/rice_info/getAddressPageList', + url: '/info_common/getAddressPageList', method: 'GET', auth : true, }, // 增加或修改地址信息 addOrUpdateAddress: { - url: '/rice_info/addOrUpdateAddress', + url: '/info_common/addOrUpdateAddress', method: 'POST', limit : 500, auth : true, @@ -34,7 +34,7 @@ const api = { }, // 删除地址 deleteAddress: { - url: '/rice_info/deleteAddress', + url: '/info_common/deleteAddress', method: 'GET', limit : 500, auth : true, @@ -42,71 +42,71 @@ const api = { }, // 修改默认地址 updateDefaultAddress: { - url: '/rice_info/updateDefaultAddress', + url: '/info_common/updateDefaultAddress', method: 'GET', auth : true, limit : 1000, }, // 获取粉丝列表带分页 getFansPageList: { - url: '/rice_info/getFansPageList', + url: '/info_common/getFansPageList', method: 'GET', auth : true, }, // 获取相关介绍 getInfoIntroduce: { - url: '/rice_info/getInfoIntroduce', + url: '/info_common/getInfoIntroduce', method: 'GET', auth : true, }, // 获取个人邀请码 getInviteCode: { - url: '/rice_info/getInviteCode', + url: '/info_common/getInviteCode', method: 'GET', auth : true, }, // 获取订单列表带分页 getOrderPageList: { - url: '/rice_info/getOrderPageList', + url: '/info_common/getOrderPageList', method: 'GET', auth : true, }, // 获取订单详情 getOrderDetail: { - url: '/rice_info/getOrderDetail', + url: '/info_common/getOrderDetail', method: 'GET', auth : true, }, // 获取流水记录带分页 getWaterPageList: { - url: '/rice_info/getWaterPageList', + url: '/info_common/getWaterPageList', method: 'GET', auth : true, }, // 获取相关介绍 getInfoIntroduce: { - url: '/rice_info/getInfoIntroduce', + url: '/info_common/getInfoIntroduce', method: 'GET', }, // 获取相关介绍详情 getInfoIntroduceDetail: { - url: '/rice_info/getRiceNewsDetail', + url: '/info_common/getRiceNewsDetail', method: 'GET', }, // 查询个人信息相关 getRiceInfo: { - url: '/rice_info/getRiceInfo', + url: '/info_common/getRiceInfo', method: 'GET', limit : 500, }, // 获取购物车信息列表带分页 getCartPageList: { - url: '/rice_info/getCartPageList', + url: '/info_common/getCartPageList', method: 'GET', }, // 增加或者修改渠道申请信息 addOrUpdateCommonUser: { - url: '/rice_info/addOrUpdateCommonUser', + url: '/info_common/addOrUpdateCommonUser', method: 'POST', limit : 500, auth : true, @@ -114,7 +114,7 @@ const api = { }, // 查询渠道申请信息 getCommonUser: { - url: '/rice_info/getCommonUser', + url: '/info_common/getCommonUser', method: 'GET', limit : 500, auth : true, diff --git a/manifest.json b/manifest.json index 4c34af0..99308e9 100644 --- a/manifest.json +++ b/manifest.json @@ -52,7 +52,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx28679cb649907e7e", + "appid" : "wx0839bc52e7849c13", "setting" : { "urlCheck" : false }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 3661f09..9fb15c5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -139,7 +139,7 @@ this.getBanner() this.getRiceNoticeList() this.getRiceIconList() - this.getRiceCommonProductList() + // this.getRiceCommonProductList() }, onPullDownRefresh() { this.getBanner() @@ -172,15 +172,15 @@ }) }, - // 获取常规产品 - getRiceCommonProductList() { - this.$api('getRiceCommonProductList', res => { - uni.stopPullDownRefresh() - if (res.code == 200) { - this.commonProductList = res.result - } - }) - }, + // 获取常规产品【废弃】 + // getRiceCommonProductList() { + // this.$api('getRiceCommonProductList', res => { + // uni.stopPullDownRefresh() + // if (res.code == 200) { + // this.commonProductList = res.result + // } + // }) + // }, // 获取首页体验产品 getRiceProductList() { diff --git a/pages/index/order.vue b/pages/index/order.vue index bddc581..286c116 100644 --- a/pages/index/order.vue +++ b/pages/index/order.vue @@ -8,8 +8,8 @@ />