diff --git a/app.js b/app.js index bd8fb24..f2c4a53 100644 --- a/app.js +++ b/app.js @@ -20,6 +20,31 @@ App({ var logs = wx.getStorageSync('logs') || [] logs.unshift(Date.now()) wx.setStorageSync('logs', logs); + // wx.login({ + // success: function (res) { + // console.log(res.code) + // } + // }); + + //计算导航栏高度 + const { statusBarHeight, platform } = wx.getSystemInfoSync() + const { top, height } = wx.getMenuButtonBoundingClientRect() + // 状态栏高度 + wx.setStorageSync('statusBarHeight', statusBarHeight) + // 胶囊按钮高度 一般是32 如果获取不到就使用32 + wx.setStorageSync('menuBtnHeight', height ? height : 32) + // 判断胶囊按钮信息是否成功获取 + if (top && top !== 0 && height && height !== 0) { + //获取成功进行计算 + const navBarHeight = (top - statusBarHeight) * 2 + height + // 导航栏高度 + wx.setStorageSync('navBarHeight', navBarHeight) + } else { + //获取失败使用默认的高度 + wx.setStorageSync( + 'navBarHeight', platform === 'android' ? 48 : 40 + ) + } }, //控制授权登入 // isLogin: function (page) { diff --git a/images/grbj.png b/images/grbj.png new file mode 100644 index 0000000..129e6f5 Binary files /dev/null and b/images/grbj.png differ diff --git a/images/group/fen.png b/images/group/fen.png deleted file mode 100644 index b8e642e..0000000 Binary files a/images/group/fen.png and /dev/null differ diff --git a/images/group/tuan.png b/images/group/tuan.png deleted file mode 100644 index 74f2eda..0000000 Binary files a/images/group/tuan.png and /dev/null differ diff --git a/images/grsz.png b/images/grsz.png new file mode 100644 index 0000000..c3f5fc5 Binary files /dev/null and b/images/grsz.png differ diff --git a/images/heads.png b/images/heads.png index 2cc8625..8490e11 100644 Binary files a/images/heads.png and b/images/heads.png differ diff --git a/images/icons/1.png b/images/icons/1.png deleted file mode 100644 index 4e88490..0000000 Binary files a/images/icons/1.png and /dev/null differ diff --git a/images/icons/2.png b/images/icons/2.png deleted file mode 100644 index 82d6fae..0000000 Binary files a/images/icons/2.png and /dev/null differ diff --git a/images/icons/3.png b/images/icons/3.png deleted file mode 100644 index be9f098..0000000 Binary files a/images/icons/3.png and /dev/null differ diff --git a/images/icons/4.png b/images/icons/4.png deleted file mode 100644 index 29ad89e..0000000 Binary files a/images/icons/4.png and /dev/null differ diff --git a/images/icons/5.png b/images/icons/5.png deleted file mode 100644 index 9c7d9bd..0000000 Binary files a/images/icons/5.png and /dev/null differ diff --git a/images/icons/grdfh.png b/images/icons/grdfh.png new file mode 100644 index 0000000..8025813 Binary files /dev/null and b/images/icons/grdfh.png differ diff --git a/images/icons/grdfk.png b/images/icons/grdfk.png new file mode 100644 index 0000000..4466cfb Binary files /dev/null and b/images/icons/grdfk.png differ diff --git a/images/icons/grdsh.png b/images/icons/grdsh.png new file mode 100644 index 0000000..0df07f8 Binary files /dev/null and b/images/icons/grdsh.png differ diff --git a/images/icons/my_dpj.png b/images/icons/my_dpj.png new file mode 100644 index 0000000..a010ec0 Binary files /dev/null and b/images/icons/my_dpj.png differ diff --git a/images/icons/tksh.png b/images/icons/tksh.png new file mode 100644 index 0000000..959d58c Binary files /dev/null and b/images/icons/tksh.png differ diff --git a/images/logos.png b/images/logos.png deleted file mode 100644 index b8ae3ab..0000000 Binary files a/images/logos.png and /dev/null differ diff --git a/images/weixin.png b/images/weixin.png new file mode 100644 index 0000000..5dde937 Binary files /dev/null and b/images/weixin.png differ diff --git a/images/wx.png b/images/wx.png deleted file mode 100644 index cdbe194..0000000 Binary files a/images/wx.png and /dev/null differ diff --git a/images/group/xstg_bg.png b/images/xstg_bg.png similarity index 100% rename from images/group/xstg_bg.png rename to images/xstg_bg.png diff --git a/pages/cart/cart.js b/pages/cart/cart.js index ec9ce29..636b843 100644 --- a/pages/cart/cart.js +++ b/pages/cart/cart.js @@ -12,6 +12,7 @@ Page({ remind: '加载中', productData: '', shop: '', + shop_logo: '', }, //页面加载完成函数 remind: '加载中', onReady: function () { @@ -393,12 +394,16 @@ Page({ }).then(res => { if (res.code == 200) { var data = res.data; + // if (data.data == 0) { + // return + // } that.setData({ carts: data.data, selectedAllStatus: false, total: '¥0.00', remind: '', - shop: data.mch_list[0] + shop: data.mch_list[0], + shop_logo: data.mch_list.length>0?'https://cz-hl-shop.oss-cn-shanghai.aliyuncs.com/239/1/20230227/'+data.mch_list[0].logo:'' }); } else { wx.showToast({ diff --git a/pages/cart/cart.wxml b/pages/cart/cart.wxml index aad1aad..93c1ae9 100644 --- a/pages/cart/cart.wxml +++ b/pages/cart/cart.wxml @@ -49,13 +49,13 @@ - + 购物车空空如也 去逛逛 - + {{shop.name}} @@ -102,9 +102,9 @@ {{total}} - 删除 + 删除 - 立即结算 + 立即结算 diff --git a/pages/cart/cart.wxss b/pages/cart/cart.wxss index 5a808f5..b5dc8e4 100644 --- a/pages/cart/cart.wxss +++ b/pages/cart/cart.wxss @@ -3,7 +3,7 @@ background: #fff; display: inline-block; margin:3% 3% 2% 3%; - color: #FF8247; + color: #FB5657; font-size: 14px; width: 94%; } @@ -84,7 +84,7 @@ page{ padding-left: 2%; } .jk_bottom .js_button{ - background: #FF8247; + background: #FB5657; float: right; color: #fff; font-size: 16px; @@ -191,14 +191,14 @@ page{ /*底部按钮*/ .carts-footer { width: 100%; - height: 80rpx; + height: 90rpx; display: flex; flex-direction: row; justify-content: space-between; - position: fixed; - bottom: 0; - background: #ffffff; - z-index:999; + position: fixed; + bottom: 0; + background: #ffffff; + z-index:999; } /*复选框*/ .carts-footer icon { @@ -216,11 +216,11 @@ page{ /*立即结算按钮*/ .carts-footer .button { - line-height: 80rpx; + line-height: 90rpx; text-align: center; - width:220rpx; - height: 80rpx; - background-color: #FF8247; + width:200rpx; + height: 90rpx; + background-color: #FB5657; color: white; font-size: 36rpx; border-radius: 0; @@ -231,28 +231,43 @@ page{ flex-direction: row; justify-content: space-between; align-items: center; - width:48%; + width: 200rpx; float:right; + background-color: #F8F8F8; + border-top: 1px solid #DDD; + border-bottom: 1px solid #DDD; + /* border-radius: 10rpx; */ } +/* .stepper { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + width: 200rpx; + overflow: hidden; + margin-left: 250rpx; + background-color: #F8F8F8; + border-top: 1px solid #DDD; + border-bottom: 1px solid #DDD; + border-radius: 8rpx; +} */ .stepper text { - background-color: #f2f2f2; - margin: 0; - width: 23px; - height: 23px; - line-height: 23px; + border-left: 1px solid #DDD; + border-right: 1px solid #DDD; + width: 25px; + height: 25px; + line-height: 25px; text-align: center; font-weight: 900; - color: #939393; - border-radius:6rpx; - border: 0 } .stepper input { - width: 43px; - /* height: 25px; */ + width: 30px; + height: 25px; text-align: center; - border-radius:6rpx; - border-top: 1px solid #f2f2f2; - border-bottom: 1px solid #f2f2f2 +} +.normal { + /* background-color: #f5f5f5; */ + color: #000; } .cart_number{ diff --git a/pages/collection/collection.wxml b/pages/collection/collection.wxml index f5122db..cc81b33 100644 --- a/pages/collection/collection.wxml +++ b/pages/collection/collection.wxml @@ -45,9 +45,9 @@ - + \ No newline at end of file diff --git a/pages/distribution/detail.wxml b/pages/distribution/detail.wxml index 2357b1a..e5bde81 100644 --- a/pages/distribution/detail.wxml +++ b/pages/distribution/detail.wxml @@ -149,7 +149,7 @@ - - + - {{buynum}} @@ -297,7 +297,7 @@ diff --git a/pages/distribution/detail.wxss b/pages/distribution/detail.wxss index 5cde800..8b17a01 100644 --- a/pages/distribution/detail.wxss +++ b/pages/distribution/detail.wxss @@ -401,27 +401,25 @@ border-radius:10rpx; width: 200rpx; overflow: hidden; margin-left: 250rpx; - background: #FCFCFC + background-color: #F8F8F8; + border-top: 1px solid #DDD; + border-bottom: 1px solid #DDD; + border-radius: 8rpx; } .stepper text { - background-color: #f2f2f2; - border: 1px solid #eee; - width: 26px; - height: 26px; - line-height: 26px; + border-left: 1px solid #DDD; + border-right: 1px solid #DDD; + width: 25px; + height: 25px; + line-height: 25px; text-align: center; font-weight: 900; - color: #939393; } .stepper input { width: 30px; height: 25px; text-align: center; - /*background-color: #f2f2f2;*/ - /*border-top: 1px solid #666; - border-bottom: 1px solid #666;*/ } - /*全部属性的主盒子*/ .commodity_attr_list { background: #fff; diff --git a/pages/group_buy/cantuan.wxml b/pages/group_buy/cantuan.wxml index f053c6e..582c7a9 100644 --- a/pages/group_buy/cantuan.wxml +++ b/pages/group_buy/cantuan.wxml @@ -150,7 +150,7 @@ - + diff --git a/pages/group_buy/detail.wxml b/pages/group_buy/detail.wxml index e432f2e..ccaa7e2 100644 --- a/pages/group_buy/detail.wxml +++ b/pages/group_buy/detail.wxml @@ -262,7 +262,7 @@ - - + - {{num}} @@ -300,7 +300,7 @@ diff --git a/pages/group_buy/detail.wxss b/pages/group_buy/detail.wxss index 40db17d..c7c0fa8 100644 --- a/pages/group_buy/detail.wxss +++ b/pages/group_buy/detail.wxss @@ -319,25 +319,24 @@ border-radius:10rpx; width: 200rpx; overflow: hidden; margin-left: 250rpx; - background: #FCFCFC + background-color: #F8F8F8; + border-top: 1px solid #DDD; + border-bottom: 1px solid #DDD; + border-radius: 8rpx; } .stepper text { - background-color: #f2f2f2; - border: 1px solid #eee; - width: 26px; - height: 26px; - line-height: 26px; + border-left: 1px solid #DDD; + border-right: 1px solid #DDD; + width: 25px; + height: 25px; + line-height: 25px; text-align: center; font-weight: 900; - color: #939393; } .stepper input { width: 30px; height: 25px; text-align: center; - /*background-color: #f2f2f2;*/ - /*border-top: 1px solid #666; - border-bottom: 1px solid #666;*/ } .footc{ display:block; diff --git a/pages/index/index.js b/pages/index/index.js index 1163f5d..13c1c87 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -32,8 +32,8 @@ Page({ zjList_box: false, cart: 0, //购物车数量 region: '', - latitude: 28.23529, - longitude: 112.93134, + latitude: 31.772752, + longitude: 119.946973, }, //下拉事件 onPullDownRefresh: function () { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index f2c777e..abb6bc2 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -214,7 +214,7 @@ - + {{list.product_title}} {{list.s_type_list[0].name}} @@ -227,7 +227,7 @@ {{list.mch_name}} - 找相似 + diff --git a/pages/listdetail/listdetail.js b/pages/listdetail/listdetail.js index c4d20d9..e7a29d7 100644 --- a/pages/listdetail/listdetail.js +++ b/pages/listdetail/listdetail.js @@ -25,7 +25,8 @@ Page({ select: 0,//选中 sort: 0,// 1 asc 升序 0 desc 降序 types: '刷新', // 点击更多、下拉上啦刷新 - bg: '' + bg: '', + attrList: [], }, onPullDownRefresh: function () { console.log(111) diff --git a/pages/listdetail/listdetail.wxml b/pages/listdetail/listdetail.wxml index 0fcaae5..96e3bbd 100644 --- a/pages/listdetail/listdetail.wxml +++ b/pages/listdetail/listdetail.wxml @@ -42,7 +42,6 @@ - diff --git a/pages/listdetail/listdetail.wxss b/pages/listdetail/listdetail.wxss index 07723ee..acaed2b 100644 --- a/pages/listdetail/listdetail.wxss +++ b/pages/listdetail/listdetail.wxss @@ -403,6 +403,201 @@ margin-top:5px !important; bottom: 50rpx; background: rgba(0,0,0,.7); right: 30rpx; - /* */ z-index: 9999; +} +/*全部属性的主盒子*/ +.commodity_attr_list { + background: #fff; + padding: 0 20rpx; + font-size: 26rpx; + overflow: hidden; + width: 100%; +} +/*弹窗*/ +.drawer_screen { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: #000; + opacity: 0.2; + overflow: hidden; + z-index: 1000; + color: #fff; +} + +.drawer_attr_box { + width: 100%; + height: 80%; + border-radius:10px 10px 0 0; + position: fixed; + bottom: 0; + left: 0; + z-index: 2000; + background: #fff; +} + +.close_icon { + width: 60rpx; + height: 60rpx; + line-height: 60rpx; + font-size: 60rpx; + position: absolute; + right: 5rpx; + top:5rpx; + padding: 10rpx; + color: #ccc; + /*border: 1rpx solid #ccc;*/ + border-radius: 50%; + text-align: center; + background: #fff; + z-index: 999; +} + + +.drawer_attr_content { + padding: 20rpx; + height:85%; + /* overflow-y: scroll; */ +} +.text_center{ + width: 97%; + position: absolute; + top: -40px; +} +.mingcheng{ + width: 65%; + font-size:35rpx; + line-height: 50rpx; + float: right; + margin-bottom:20px; +} +.drawer_image { + width: 28%; + height: 200rpx; + border:1px solid #ddd; + border-radius:10rpx; +} + +.drawer_desc{ + font-size:28rpx; + margin:20rpx; + height: 150rpx; + width: 100%; +} +/*每组属性的主盒子*/ +.attr_box { + width: 100%; + overflow: hidden; + border-bottom: 1rpx solid #ececec; +} +/*属性名*/ +.attr_name { + width: 20%; + float: left; + padding: 15rpx 0; + font-size: 30rpx; + margin-top:20rpx; +} +.outStyle { + display: flex; + flex-direction: column; +} + +.outStyleText { + display: flex; + flex-direction: column; + color: #999; +} +.typeStyle { + display: flex; + flex-direction: row; + margin: 10px; +} +.textStyle { + font-size:14px; +} +.buttonPaddingStyle { + padding-left:10px; + padding-right:10px; + padding-top:5px; + padding-bottom:5px; + margin-bottom:5px; +} +/*数量*/ +.dian{ + position: absolute; + right: 30rpx; +} +.shu{ + display: flex; + flex-direction: row; + width: 100%; + margin-top: 30rpx; + height: 100rpx; +} +.stepper { + text-align: right; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + width: 200rpx; + overflow: hidden; + margin-left: 250rpx; + background: #FCFCFC +} +.stepper text { + background-color: #f2f2f2; + border: 1px solid #eee; + width: 26px; + height: 26px; + line-height: 26px; + text-align: center; + font-weight: 900; + color: #939393; +} +.stepper input { + width: 30px; + height: 25px; + text-align: center; + /*background-color: #f2f2f2;*/ + /*border-top: 1px solid #666; + border-bottom: 1px solid #666;*/ +} +.cun{ + /* margin: 5px; */ + font-size:30rpx; + /* padding-left: 20rpx; */ + width: 20% +} +.select { + border-radius: 10px; + margin-right: 10px; + color: #FB5657; +} + +.normal { + border-radius: 10px; + background-color: #f5f5f5; + margin-right: 10px; + color: #000; +} +.footc{ + display:block; + position:fixed; + bottom:0; + left:0; + background:#FB5657; + z-index:100; + width:100%; + font-size:14px; + border-top:1px solid #eee; + line-height:40px; + font-weight:700; + color:snow; + text-align: center; + background:#FB5657; + padding-bottom: env(safe-area-inset-bottom); } \ No newline at end of file diff --git a/pages/login/login.js b/pages/login/login.js index 35159a6..30f2bf5 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -67,47 +67,69 @@ Page({ }) } }, - - - //获取用户信息新接口 - agreeGetUser: function (e) { - let that = this; - wx.showLoading({ - title: '正在登入', - success: 2000 - }); - console.log(e.detail.userInfo) - if (e.detail.errMsg == 'getUserInfo:ok') { - //获取成功设置状态 - app.globalData.isLogin = true; - wx.setStorageSync('isLogin', true); - //设置用户信息本地存储 - try { - wx.setStorageSync('userInfo', e.detail.userInfo); - } catch (e) { - wx.showToast({ - title: '系统提示:网络错误!', - icon: 'warn', - duration: 1500, + wxlogin(){ + wx.login({ + success: function (res) { + WXAPI.wxLogin({ + code: res.code, + storeId: 239, + }).then(res => { + if (res.code == 200) { + var data = res.data + app.globalData.accessId = data.access_id; + wx.setStorageSync('accessId', data.access_id) + wx.setStorageSync('isLogin', true); + wx.setStorageSync('userInfo', data.user); + wx.navigateBack() + } }) } - - that.setData({ - isLogin: false - }) - - that.getOP(e.detail.userInfo) + }); + }, + //授权微信手机号 + bindPhoneNumber: function(e) { + var that = this; + if (e.detail.errMsg == "getPhoneNumber:ok") { + //用户按了确认按钮 + that.tapWeixinLogin(e); } else { - wx.showToast({ - title: '没有授权,不能执行该操作!', - icon: 'none', - duration: 2000 + //用户按了拒绝按钮 + wx.showModal({ + title:'警告', + content:'您点击了拒绝授权,将无法进入小程序,请授权之后再进入!!!', + showCancel:false, + confirmText:'返回授权', + success:function(res){ + if (res.confirm) { + console.log('用户点击了“返回授权”') + } + } }) - //没有授权需要弹框 - that.setData({ - isLogin: true - }); - } + } + }, + //微信一键登录 + tapWeixinLogin : function(e) { + var code = e.detail.code + console.log(code) + wx.showModal({ + title:'警告', + content:code, + showCancel:false, + confirmText:'返回授权', + }) + WXAPI.wxLogin({ + code: code, + storeId: 239, + }).then(res => { + if (res.code == 200) { + var data = res.data + app.globalData.accessId = data.access_id; + wx.setStorageSync('accessId', data.access_id) + wx.setStorageSync('isLogin', true); + wx.setStorageSync('userInfo', data.data); + wx.navigateBack() + } + }) }, accountInput: function(e) { this.setData({ diff --git a/pages/login/login.wxml b/pages/login/login.wxml index eeb865e..ede81f9 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -8,10 +8,10 @@ --> - \ No newline at end of file diff --git a/pages/login/login.wxss b/pages/login/login.wxss index 8abe656..bec3d97 100644 --- a/pages/login/login.wxss +++ b/pages/login/login.wxss @@ -149,3 +149,44 @@ page{ align-items: center; justify-content: center; } +.other-content { + height: 400rpx; + width: 100%; + position: absolute; + bottom: 0; + left: 0; + text-align: center; + display: flex; + flex-direction: column; + align-items: center; +} + +.text3 { + font-size: 24rpx; + color: rgb(153, 153, 153); + margin: 0; +} + +.text4 { + text-align: center; + color: #333333; + font-family: PingFang SC; + font-size: 28rpx; +} + +.weixinBtn { + margin-top: 20rpx; + margin-bottom: 20rpx; + width: 80rpx; + height: 80rpx; + padding: 0; + background-color:transparent; +} +/* button的边框设置,要放在::after里面设置 */ +.weixinBtn::after { + border: none; /* 移除边框 */ +} +.weixinBtn image { + width: 80rpx; + height: 80rpx; +} \ No newline at end of file diff --git a/pages/new/new.wxml b/pages/new/new.wxml index d60d6c8..73ad638 100644 --- a/pages/new/new.wxml +++ b/pages/new/new.wxml @@ -58,7 +58,7 @@ {{item.mch_name}} - 找相似 + diff --git a/pages/notice/index.js b/pages/notice/index.js index 60dd111..cc3f108 100644 --- a/pages/notice/index.js +++ b/pages/notice/index.js @@ -25,19 +25,12 @@ Page({ title: '公告详情', //修改页面标题 }); var that = this; - wx.request({ - url: app.d.ceshiUrl + '&action=notice&m=index', - data: { - id: options.Id - }, - method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT - header: {// 设置请求的 header - 'Content-Type': 'application/x-www-form-urlencoded' - }, - success: function (res) { - // success - var notice = res.data.notice; - var detail = res.data.notice[0].detail; + WXAPI.messageList({ + }).then(res => { + if (res.code == 200) { + var data = res.data + var notice = data.message; + var detail = data.message[0].detail; WxParse.wxParse('detail', 'html', detail, that, 5);//处理规则的富文本框 if (notice == '') { var notice = [] @@ -45,12 +38,6 @@ Page({ that.setData({ notice: notice }) - }, - fail: function () { - wx.showToast({ - title: '网络异常!', - duration: 2000 - }); } }) }, @@ -58,34 +45,19 @@ Page({ // 数据加载 DataonLoad: function () { var that = this; - // 页面初始化 options为页面跳转所带来的参数 - wx.request({ - url: app.d.ceshiUrl + '&action=notice&m=index', - data: { - id: options.Id - }, - method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT - header: {// 设置请求的 header - 'Content-Type': 'application/x-www-form-urlencoded' - }, - success: function (res) { - // success - var notice = res.data.notice; - var detail = res.data.notice[0].detail; + WXAPI.messageList({ + }).then(res => { + if (res.code == 200) { + var data = res.data + var notice = data.message; + var detail = data.message[0].detail; WxParse.wxParse('detail', 'html', detail, that, 5);//处理规则的富文本框 if (notice == '') { var notice = [] } that.setData({ notice: notice - }) - }, - fail: function () { - wx.showToast({ - title: '网络异常!', - duration: 2000 - }); } }) }, diff --git a/pages/notice/notice.js b/pages/notice/notice.js index fdf8ba1..8cc3001 100644 --- a/pages/notice/notice.js +++ b/pages/notice/notice.js @@ -26,17 +26,14 @@ Page({ title: '公告', //修改页面标题 }); var that = this; - wx.request({ - url: app.d.ceshiUrl + '&action=notice&m=index', - data: { - openid: app.globalData.userInfo.openid - }, - method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT - header: {// 设置请求的 header - 'Content-Type': 'application/x-www-form-urlencoded' - }, - success: function (res) { - var notice = res.data.notice; + WXAPI.messageList({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + }).then(res => { + if (res.code == 200) { + var data = res.data + var notice = data.message; if (notice == '') { var notice = [] } @@ -44,12 +41,6 @@ Page({ notice: notice }) - }, - fail: function () { - wx.showToast({ - title: '网络异常!', - duration: 2000 - }); } }) }, @@ -57,18 +48,14 @@ Page({ // 数据加载 DataonLoad: function () { var that = this; - // 页面初始化 options为页面跳转所带来的参数 - wx.request({ - url: app.d.ceshiUrl + '&action=notice&m=index', - data: { - openid: app.globalData.userInfo.openid, - }, - method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT - header: {// 设置请求的 header - 'Content-Type': 'application/x-www-form-urlencoded' - }, - success: function (res) { - var notice = res.data.notice; + WXAPI.messageList({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + }).then(res => { + if (res.code == 200) { + var data = res.data + var notice = data.message; if (notice == '') { var notice = [] } @@ -76,12 +63,6 @@ Page({ notice: notice }) - }, - fail: function () { - wx.showToast({ - title: '网络异常!', - duration: 2000 - }); } }) }, diff --git a/pages/notice/notice.wxml b/pages/notice/notice.wxml index 192f2e6..d200b64 100644 --- a/pages/notice/notice.wxml +++ b/pages/notice/notice.wxml @@ -2,15 +2,15 @@ - + diff --git a/pages/notice/notice.wxss b/pages/notice/notice.wxss index a3a8dcd..7b65147 100644 --- a/pages/notice/notice.wxss +++ b/pages/notice/notice.wxss @@ -1,4 +1,9 @@ /* pages/notice.wxss */ +page{ + width: 100%; + height: 100%; + background:#eee !important; +} .function{ width:95%; margin: 10px auto; @@ -12,30 +17,28 @@ display:flex; justify-content:space-between; background:#fff; - margin:0; + margin:0rpx; padding:0; color:#666; - border:0; + border-bottom:20rpx solid #eee; + height: 150rpx; } .function_left{ - display: flex; + /* display: flex; */ font-size:16px; - margin-left:5px; + margin-left:10px; padding-top: 3px; } .function .iconfont { line-height:27px; } .function_text{ + margin-top:10px; margin-left:5px; } .jiantou{ - width: 10px; - height: 10px; - padding-right:10px; + margin-top:40rpx; + width: 20rpx; + height: 20rpx; + padding-right:20rpx; } -page{ - width: 100%; - height: 100%; - background:#eee !important; -} \ No newline at end of file diff --git a/pages/order/pay.js b/pages/order/pay.js index 9a02826..7248313 100644 --- a/pages/order/pay.js +++ b/pages/order/pay.js @@ -184,7 +184,7 @@ Page({ pays.push({'name':'公对公支付','icon':'/images/公对公.png'}) } // if (data.payment.wallet_pay == 1) { - // pays.push({'name':'余额支付','icon':'/images/wx.png'}) + // pays.push({'name':'余额支付','icon':'/images/weixin.png'}) // } that.setData({ productAry: options.product, diff --git a/pages/product/detail.js b/pages/product/detail.js index 9b69b09..5f78537 100644 --- a/pages/product/detail.js +++ b/pages/product/detail.js @@ -182,11 +182,9 @@ Page({ attrList: data.attrList, skuBeanList: data.skuBeanList, zhekou: data.zhekou != '' ? data.zhekou : false, - }); - // util.getUesrBgplus(that, app, true) - that.setData({ remind: false }); + // util.getUesrBgplus(that, app, true) //默认选中 that.one(); } else if (res.code == 3) { @@ -265,7 +263,6 @@ Page({ } }.bind(this), 200) }, - // 加减 changeNum: function (e) { var that = this; @@ -744,7 +741,6 @@ Page({ delay: 0 }); //定义点击的类型 - var type = e.currentTarget.dataset.type ? e.currentTarget.dataset.type : false; //控制两种不同显示方式 if (type) { diff --git a/pages/product/detail.wxml b/pages/product/detail.wxml index 859e2a2..b241c18 100644 --- a/pages/product/detail.wxml +++ b/pages/product/detail.wxml @@ -61,11 +61,9 @@ - [ - 新品 - 热销 - 推荐 - ] {{itemData.name}} + [ + {{list.s_type_list[0].name}} + ] {{itemData.name}} @@ -108,8 +106,8 @@ - ¥{{itemData.price11}} - ¥ {{itemData.price_yh}} + ¥{{itemData.price11}} + ¥ {{itemData.price_yh}} 库存:{{itemData.num}} @@ -121,20 +119,20 @@ {{item.attrName}} - + {{items.attributeValue}} - + - + 购买数量 - - + - {{buynum}} @@ -297,7 +295,7 @@ - 单独买 ¥ {{itemData.price_yh}} + 单独买 ¥ {{itemData.price_yh}} - + 退出登录 diff --git a/pages/set/set.wxss b/pages/set/set.wxss index 042ebfe..373024e 100644 --- a/pages/set/set.wxss +++ b/pages/set/set.wxss @@ -38,4 +38,14 @@ page{ width: 100%; height: 100%; background:#eee !important; +} +.logoutView{ + margin:70rpx; + height: 80rpx; + text-align: center; + line-height: 80rpx; + font-size: 32rpx; + color: white; + border-radius: 20rpx; + background-color:#fa5151; } \ No newline at end of file diff --git a/pages/shop/shop.js b/pages/shop/shop.js index e58eb7b..2db764a 100644 --- a/pages/shop/shop.js +++ b/pages/shop/shop.js @@ -12,8 +12,8 @@ Page({ mch_arr:[], //店铺分类列表 mch_data:[], //店铺分类总数据 i_showFl:0,//选择的分类 - latitude: 28.23529, - longitude: 112.93134, + latitude: 31.772752, + longitude: 119.946973, index: 0, cid: '' }, diff --git a/pages/store/store.js b/pages/store/store.js index 3a661e2..7b785b0 100644 --- a/pages/store/store.js +++ b/pages/store/store.js @@ -25,6 +25,11 @@ Page({ shop_info: {}, type: 1, shopId: '', + showModalStatus: false, + animationData: '', + buynum: 1, + attrList: [], + sizeid: '', }, switchTab: function(e) { var dataset = e.currentTarget.dataset @@ -45,8 +50,8 @@ Page({ shop_id: shopId, shop_list_id: '', type: that.data.type, - latitude: 28.23529, - longitude: 112.93134, + latitude: 31.772752, + longitude: 119.946973, }).then(res => { if (res.code == 200) { var data = res.data; @@ -65,19 +70,256 @@ Page({ wx.navigateTo({ url: '/pages/store/myStore?shopId='+info.id, }) - }, - shopping_j: function(e) { - }, navToList: function (e) { - console.log(e) + // console.log(e) var that = this var info = e.currentTarget.dataset.info; wx.navigateTo({ url: '/pages/listdetail/listdetail?id='+info.cid+'&title='+info.pname, }) }, - + navToDetail: function(e) { + var info = e.currentTarget.dataset.info; + wx.navigateTo({ + url: '/pages/product/detail?productId='+info.id, + }) + }, + showAttribute: function(e) { + var productId = e.currentTarget.dataset.id; + var that = this; + that.loadProductDetail(productId); + var animation = wx.createAnimation({ + duration: 200, + timingFunction: "linear", + delay: 0 + }); + this.animation = animation + animation.translateY(300).step(); + this.setData({ + // paytype: type, + animationData: animation.export() + }) + if (e.currentTarget.dataset.status == 1) { + this.setData({ + showModalStatus: true + }); + } + setTimeout(function () { + animation.translateY(0).step() + this.setData({ + animationData: animation + }) + if (e.currentTarget.dataset.status == 0) { + this.setData({ + showModalStatus: false + }); + } + }.bind(this), 200); + }, + // 商品详情数据获取 + loadProductDetail: function (productId) { + var that = this; + WXAPI.productIndex({ + accessId: app.globalData.accessId, + storeId: 239, + pro_id: productId, + vipSource: 0 + }).then(res => { + if (res.code == 200) { + var data = res.data; + var pro = data.pro; + that.setData({ + itemData: pro, + attrList: data.attrList, + sizeid: data.attrList[0].attr[0].attrId, + }); + } + }); + }, + // 弹窗 + setModalStatus: function (e) { + var animation = wx.createAnimation({ + duration: 200, + timingFunction: "linear", + delay: 0 + }); + //定义点击的类型 + var type = e.target.dataset.type ? e.target.dataset.type : false; + //控制两种不同显示方式 + if (type) { + this.setData({ + xefl: false, + }) + } else { + this.setData({ + xefl: true, + }) + type = this.data.paytype; + } + this.animation = animation + animation.translateY(300).step(); + this.setData({ + paytype: type, + animationData: animation.export() + }) + if (e.currentTarget.dataset.status == 1) { + this.setData({ + showModalStatus: true + }); + } + setTimeout(function () { + animation.translateY(0).step() + this.setData({ + animationData: animation + }) + if (e.currentTarget.dataset.status == 0) { + this.setData({ + showModalStatus: false + }); + } + }.bind(this), 200) + }, + // 加减 + changeNum: function (e) { + var that = this; + var num = that.data.itemData.num; + if (e.target.dataset.alphaBeta == 0) { + if (this.data.buynum <= 1) { + wx.showToast({ + title: '不能再少了', + icon: 'none', + duration: 1000 + }) + } else { + this.setData({ + buynum: this.data.buynum - 1 + }) + }; + } else { + if (that.data.buynum < num) { + this.setData({ + buynum: this.data.buynum + 1 + }) + } else { + wx.showToast({ + title: '不能再多了', + icon: 'none', + duration: 1000 + }) + } + }; + }, + /** + * 规格属性点击事件 + */ + onChangeShowState: function (event) { + var that = this; + var listItem = this.data.attrList; + var items = listItem[event.currentTarget.dataset.idx]; + var item = items.attr[event.currentTarget.dataset.index]; + if (!item.enable) { + return; + } + var select = !item.select; + for (var i = 0; i < items.attr.length; i++) { + items.attr[i].select = false; + } + item.select = select; + // 获取点击属性列表 + var canGetInfo = []; + for (var skuIndex = 0; skuIndex < listItem.length; skuIndex++) { + for (var skuIndexIn = 0; skuIndexIn < listItem[skuIndex].attr.length; skuIndexIn++) { + if (listItem[skuIndex].attr[skuIndexIn].enable && listItem[skuIndex].attr[skuIndexIn].select) { + canGetInfo.push(listItem[skuIndex].attr[skuIndexIn]); + } + } + } + var canGetInfoLog = ""; + var skuBeanList = this.data.skuBeanList; + var haveSkuBean = []; + // 对应库存清单扫描 + for (var skuBeanIndex = 0; skuBeanIndex < skuBeanList.length; skuBeanIndex++) { + var iListCount = 0; + for (var skuBeanIndexIn = 0; skuBeanIndexIn < skuBeanList[skuBeanIndex].attributes.length; skuBeanIndexIn++) { + if (canGetInfo.length == skuBeanList[skuBeanIndex].attributes.length) { + if (skuBeanList[skuBeanIndex].attributes[skuBeanIndexIn].attributeValId == canGetInfo[skuBeanIndexIn].id) { + iListCount++; + } + } else { + canGetInfoLog = "库存清单不存在此属性" + " "; + } + } + if (iListCount == skuBeanList[skuBeanIndex].attributes.length) { + haveSkuBean.push(skuBeanList[skuBeanIndex]); + } + } + for (var iox = 0; iox < canGetInfo.length; iox++) { + canGetInfoLog += canGetInfo[iox].attributeValue + " "; + } + if (haveSkuBean.length != 0) { + //选中设置 + var itemData = that.data.itemData; + itemData.photo_x = haveSkuBean[0].imgurl; + itemData.price_yh = haveSkuBean[0].price; + itemData.num = haveSkuBean[0].count; + var choujiangid = that.data.choujiangid; + var sizeid = haveSkuBean[0].cid; + that.setData({ + itemData: itemData, + sizeid: sizeid, + choujiangid: choujiangid, + value: canGetInfoLog + }); + } else { + that.setData({ + sizeid: '', + value: '' + }); + } + // 重新赋值 + this.setData({ + attrList: listItem, + infoText: canGetInfoLog, + }) + // 重新sku运算 + this.onData(); + }, + //加入购物车 + addShopCart: function (e) { + // console.log(e.currentTarget.dataset) + var info = e.currentTarget.dataset.info; + //添加到购物车 + var that = this; + WXAPI.productAddCart({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + pro_id: info.pro_id, + attribute_id: that.data.sizeid, + num: that.data.buynum, + type: 'addcart', + }).then(res => { + if (res.code == 200) { + //设置购物车刷新 + app.d.purchase = 1; + wx.showToast({ + title: '已添加到购物车', + icon: 'success', + duration: 2000 + }); + that.setData({ + showModalStatus: false + }); + } else { + wx.showToast({ + icon: 'loading', + title: res.message, + duration: 2000 + }); + } + }); + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/store/store.wxml b/pages/store/store.wxml index d59b120..cfb4cc7 100644 --- a/pages/store/store.wxml +++ b/pages/store/store.wxml @@ -39,7 +39,7 @@ - + 已失效 @@ -50,7 +50,7 @@ ¥{{item.vip_yprice}} - + @@ -62,4 +62,51 @@ + + + + × + + + + + + ¥ {{itemData.price_yh}} + 库存:{{itemData.num}} + + + + + + + + {{item.attrName}} + + + + {{items.attributeValue}} + + + + + + + 购买数量 + + + + - + + {{buynum}} + + + + + + + + + 确定 + + + \ No newline at end of file diff --git a/pages/store/store.wxss b/pages/store/store.wxss index f575457..a196c69 100644 --- a/pages/store/store.wxss +++ b/pages/store/store.wxss @@ -267,4 +267,197 @@ right: 40rpx; width: 25rpx; height: 25rpx; +} +/*全部属性的主盒子*/ +.commodity_attr_list { + background: #fff; + padding: 0 20rpx; + font-size: 26rpx; + overflow: hidden; + width: 100%; +} +/*弹窗*/ +.drawer_screen { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: #000; + opacity: 0.2; + overflow: hidden; + z-index: 1000; + color: #fff; +} + +.drawer_attr_box { + width: 100%; + height: 80%; + border-radius:10px 10px 0 0; + position: fixed; + bottom: 0; + left: 0; + z-index: 2000; + background: #fff; +} + +.close_icon { + width: 60rpx; + height: 60rpx; + line-height: 60rpx; + font-size: 60rpx; + position: absolute; + right: 5rpx; + top:5rpx; + padding: 10rpx; + color: #ccc; + /*border: 1rpx solid #ccc;*/ + border-radius: 50%; + text-align: center; + background: #fff; + z-index: 999; +} + + +.drawer_attr_content { + padding: 20rpx; + height:85%; + /* overflow-y: scroll; */ +} +.text_center{ + width: 97%; + position: absolute; + top: -40px; +} +.mingcheng{ + width: 65%; + font-size:35rpx; + line-height: 50rpx; + float: right; + margin-bottom:20px; +} +.drawer_image { + width: 28%; + height: 200rpx; + border:1px solid #ddd; + border-radius:10rpx; +} + +.drawer_desc{ + font-size:28rpx; + margin:20rpx; + height: 150rpx; + width: 100%; +} +/*每组属性的主盒子*/ +.attr_box { + width: 100%; + overflow: hidden; + border-bottom: 1rpx solid #ececec; +} +/*属性名*/ +.attr_name { + width: 20%; + float: left; + padding: 15rpx 0; + font-size: 30rpx; + margin-top:20rpx; +} +.outStyle { + display: flex; + flex-direction: column; +} + +.outStyleText { + display: flex; + flex-direction: column; + color: #999; +} +.typeStyle { + display: flex; + flex-direction: row; + margin: 10px; +} +.textStyle { + font-size:14px; +} +.buttonPaddingStyle { + padding-left:10px; + padding-right:10px; + padding-top:5px; + padding-bottom:5px; + margin-bottom:5px; +} +/*数量*/ +.dian{ + position: absolute; + right: 30rpx; +} +.shu{ + display: flex; + flex-direction: row; + width: 100%; + margin-top: 30rpx; + height: 100rpx; +} +.stepper { + text-align: right; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + width: 200rpx; + overflow: hidden; + margin-left: 250rpx; + background-color: #F8F8F8; + border-top: 1px solid #DDD; + border-bottom: 1px solid #DDD; + border-radius: 8rpx; +} +.stepper text { + border-left: 1px solid #DDD; + border-right: 1px solid #DDD; + width: 25px; + height: 25px; + line-height: 25px; + text-align: center; + font-weight: 900; +} +.stepper input { + width: 30px; + height: 25px; + text-align: center; +} +.normal { + /* background-color: #f5f5f5; */ + color: #000; +} +.cun{ + /* margin: 5px; */ + font-size:30rpx; + /* padding-left: 20rpx; */ + width: 20% +} +.select { + border-radius: 10px; + background-color: #FB5657; + margin-right: 10px; + color: #fff; +} +.footc{ + display:block; + position:fixed; + bottom:0; + left:0; + background:#FB5657; + z-index:100; + width:100%; + font-size:14px; + border-top:1px solid #eee; + line-height:40px; + font-weight:700; + color:snow; + text-align: center; + background:#FB5657; + padding-bottom: env(safe-area-inset-bottom); } \ No newline at end of file diff --git a/pages/user/user.js b/pages/user/user.js index 627b0d0..b00e00b 100644 --- a/pages/user/user.js +++ b/pages/user/user.js @@ -3,6 +3,12 @@ var app = getApp() var WXAPI = require('../../utils/server.js'); Page({ data: { + // 状态栏高度 + statusBarHeight: wx.getStorageSync('statusBarHeight') + 'px', + // 胶囊按钮高度 + menuBtnHeight: wx.getStorageSync('menuBtnHeight') + 'px', + // 导航栏和状态栏高度 + navBarHeight: wx.getStorageSync('statusBarHeight') + wx.getStorageSync('navBarHeight') + 'px', pop: null, list: [ // { @@ -26,11 +32,6 @@ Page({ url: 'address/index' }, // { - // icon: 'gg.png', - // text: '公告管理', - // url: 'notice/notice' - // }, - // { // icon: 'sz.png', // text: '设置', // url: 'set/set' @@ -159,5 +160,27 @@ Page({ wx.navigateTo({ url: url }) - } + }, + navToNotice() { + var isLogin = wx.getStorageSync('isLogin') + if (!isLogin) { + wx.navigateTo({ + url: '/pages/login/login' + }) + } + wx.navigateTo({ + url: '/pages/notice/notice' + }) + }, + navToSetup() { + var isLogin = wx.getStorageSync('isLogin') + if (!isLogin) { + wx.navigateTo({ + url: '/pages/login/login' + }) + } + wx.navigateTo({ + url: '/pages/set/set' + }) + } }) \ No newline at end of file diff --git a/pages/user/user.json b/pages/user/user.json index 386eaf8..ca62654 100644 --- a/pages/user/user.json +++ b/pages/user/user.json @@ -1,5 +1,6 @@ { "usingComponents": {}, "navigationBarTitleText": "", - "navigationBarBackgroundColor": "#eeeeee" + "navigationBarBackgroundColor": "#F4F5F6", + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/user/user.wxml b/pages/user/user.wxml index 894d39c..cc157f2 100644 --- a/pages/user/user.wxml +++ b/pages/user/user.wxml @@ -1,163 +1,180 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - {{user.user_name}} - 用户ID:{{user.user_id}} - {{tjr}} - - - - - + + + + + + + + + + {{title}} + + + + + + + + + + + + {{user.user_name}} + 用户积分:{{user.score}} + {{tjr}} + + + + + + + + + {{ user.xxnum > 99 ? '99+' : user.xxnum }} + + - - - + + + + + + 我的订单 + + + 查看全部订单 + + + + - - - - 我的订单 - - - 查看全部订单 - + + + + {{dfk_num}} + + + 待付款 - - - - {{dfk_num}} - - - - 待付款 + + + {{dfh_num}} + + - + 待发货 + + - - - {{dfh_num}} - - - - 待发货 + + + {{dsh_num}} + + - + 待收货 + + - - - {{dsh_num}} - - - - 待收货 + + + {{dpj_num}} + + - + 待评价 + + - - - {{dpj_num}} - - - - 待评价 + + + {{th}} + + - + 退货/售后 + + - - - {{th}} - - - - 退货 + + + + + + + + + {{item.subtitle_name}} - - - - - - - - - - - {{item.subtitle_name}} - - - - + + - - - - + + + + + - - - - {{item.text}} - - - - + + + + {{item.text}} + + + + - - - - - - {{item.Article_title}} - - {{item.Article_prompt}} - - + + + + + + {{item.Article_title}} + + {{item.Article_prompt}} - - - - - {{support}} + + + + + + + + {{support}} - - - + + + + \ No newline at end of file diff --git a/pages/user/user.wxss b/pages/user/user.wxss index 775f5e0..358ab56 100644 --- a/pages/user/user.wxss +++ b/pages/user/user.wxss @@ -1,9 +1,37 @@ page{ - background: #eee !important; + background: #F4F5F6!important; width: 100%; height: 100%; } - +.top-message { + /* position: relative; */ + position: absolute; + right: 40rpx; + margin-top: -100rpx; +} +.xxnum { + position: absolute; + left: 20rpx; + bottom: 32rpx; + transform: translate(50%, -50%); + padding: 4rpx 6rpx; + background-color: #f43530; + border-radius: 12rpx; + font-size: 22rpx; + line-height: 16rpx; + color: #FFFFFF; + font-weight: 300; +} +.btnimg{ + width: 56rpx; + height: 56rpx; + margin: 16rpx 548rpx 0 30rpx; +} +.btnimgl{ + width: 56rpx; + height: 56rpx; + /* margin: 16rpx 40rpx 0 auto; */ +} .fgx{ height: 5px; width: 100%; @@ -21,9 +49,11 @@ text{ color: #333333; } .user_name{ - font-size:28px; + font-size:25px; + line-height: 40px; } .user_top{ + margin-top: 10rpx; height:420rpx; } .user_top_two{ @@ -38,17 +68,17 @@ text{ } .user_sz{ display:flex; -justify-content:space-between; -padding-top:8px; -padding-bottom:8px; - + justify-content:space-between; + padding-top:8px; + padding-bottom:8px; } .user_dd{ -position:absolute; -width:90%; -background:#eee !important; -margin-left:19px; -border-radius:5px; + position:absolute; + width:90%; + background:#F4F5F6 !important; + margin-top:10rpx; + margin-left:19px; + border-radius:5px; } .dd_stu{ background:#fff; @@ -56,14 +86,12 @@ margin-bottom:10px; border-radius:5px; } .user_top_image{ - width: 75px; - height: 75px; + width: 125rpx; + height: 125rpx; border-radius:50%; border:1px solid #fff; } - - .user_top_name{ color: #ffffff; @@ -85,7 +113,7 @@ border-radius:5px; justify-content:space-between; padding: 10px; font-size: 16px; - border-bottom:1px solid #eee; + border-bottom:1px solid #F4F5F6; } .order_right{ @@ -123,7 +151,7 @@ border-radius:5px; justify-content:space-between; height:48px; line-height:48px; - border-bottom: 1px solid #EEEEEE; + border-bottom: 1px solid #F4F5F6; } .tishi{ position:absolute; @@ -163,7 +191,7 @@ border-radius:5px; font-size: 12px; color: #666; padding:4% 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #F4F5F6; } .c3{ color: black; @@ -346,7 +374,7 @@ border-radius:5px; } .modelTitle{ line-height:40px; - border-bottom:1px solid #eee; + border-bottom:1px solid #F4F5F6; } .modelBody{ @@ -358,9 +386,10 @@ border-radius:5px; justify-content: center; align-items: center; padding-left: 40rpx; - font-size:30rpx; + font-size:32rpx; font-weight:bold; - color:rgba(255,255,255,1); + columns: #333333; + height: 60rpx; } .text-length { diff --git a/utils/server.js b/utils/server.js index 8a5b03c..af0bdd0 100644 --- a/utils/server.js +++ b/utils/server.js @@ -55,8 +55,12 @@ Promise.prototype.finally = function(callback) { module.exports = { requestServer, - appIndex: (data) => { //获取用户会话密钥 - return requestServer('&action=app&app=index', 'post', data) + /* 登录 */ + login: (data) => { //登录 + return requestServer('&action=login&app=login', 'post', data) + }, + wxLogin: (data) => { //微信一键登录 + return requestServer('&action=login&app=user', 'post', data) }, /* 首页 */ homeIndex: (data) => { //首页 @@ -104,10 +108,6 @@ module.exports = { userIndex: (data) => { //个人中心 return requestServer('&action=user&app=index', 'post', data) }, - /* 登录 */ - login: (data) => { //登录 - return requestServer('&action=login&app=login', 'post', data) - }, mchClass: (data) => { //店铺分类 return requestServer('&action=index&app=mchClass', 'post', data) }, @@ -159,6 +159,9 @@ module.exports = { deleteOrder: (data) => { //删除订单 return requestServer('&action=order&app=del_order', 'post', data) }, + returnDataList: (data) => { //售后 + return requestServer('&action=order&app=ReturnDataList', 'post', data) + }, footprint: (data) => { //历史足迹 return requestServer('&action=footprint&app=index', 'post', data) }, @@ -180,6 +183,9 @@ module.exports = { seemystore: (data) => { //查看店铺信息 return requestServer('&action=mch&app=see_my_store', 'post', data) }, + messageList: (data) => { //查看店铺信息 + return requestServer('&action=message&app=index', 'post', data) + }, /* -------------------- */