From 75579ba418466ebe8ca0378f5d5fddbf17d71664 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Sat, 18 Mar 2023 21:26:05 +0800 Subject: [PATCH] 2023-3-18 --- mallplusui-uniapp-app/App.vue | 7 +++- mallplusui-uniapp-app/common/api.js | 6 ++-- mallplusui-uniapp-app/manifest.json | 4 +-- mallplusui-uniapp-app/pages.json | 2 +- mallplusui-uniapp-app/pages/index/index.vue | 4 ++- .../pages/index/messageDetail.vue | 2 +- .../pages/index/messageList.vue | 34 ++++++++++++------- .../pages/order/createOrder.vue | 9 ++++- .../pages/order/createStoreOrder.vue | 5 ++- 9 files changed, 49 insertions(+), 24 deletions(-) diff --git a/mallplusui-uniapp-app/App.vue b/mallplusui-uniapp-app/App.vue index c5fc4f2..5a51bb5 100644 --- a/mallplusui-uniapp-app/App.vue +++ b/mallplusui-uniapp-app/App.vue @@ -97,7 +97,7 @@ } else { // 非系统消息 - if (that.hasLogin) { + if (index.state.hasLogin) { // 登录状态 console.log("登录状态>>>>>>>>>>", message.payload.code) that.goToMessageDetail(message.payload) @@ -175,6 +175,11 @@ console.log('hasLogin>>>', index.state.hasLogin) } + + if(userInfo){ + index.state.hasVip = userInfo.memberLevelId == 1 ? false : true; + } + let isWeiXin = this.$common.isWeiXinBrowser() if (isWeiXin) { diff --git a/mallplusui-uniapp-app/common/api.js b/mallplusui-uniapp-app/common/api.js index 7deb4ad..fda3a12 100644 --- a/mallplusui-uniapp-app/common/api.js +++ b/mallplusui-uniapp-app/common/api.js @@ -1,8 +1,8 @@ import store from '../store/index'; export default { // qq 237524947 wx15d4269d3210863d - BASEURI: 'http://192.168.3.9:8083/api/', - // BASEURI: 'http://mall.yyundong.com/portalapi/api/', + // BASEURI: 'http://je4r5e.natappfree.cc/api/', + BASEURI: 'http://mall.yyundong.com/portalapi/api/', // BASEURI: 'http://192.168.3.116:8083/api/', ADMINURI: 'http://mall.yyundong.com/adminapi/', ESURI: 'http://www.yyundong.com:8081/', @@ -63,7 +63,7 @@ export default { getInviteData: 'single/user/getInviteData', inviteUser: 'single/user/inviteUser', inviteMoney: 'single/user/inviteMoney', - currentMember: 'single/user/currentMember', + currentMember: 'single/user/currentMember', updateMember: 'single/user/updateMember', resetPassword: 'single/user/resetPassword', schoolList: 'single/user/school/list', // 查询学校列表 diff --git a/mallplusui-uniapp-app/manifest.json b/mallplusui-uniapp-app/manifest.json index ce2b21c..080fa62 100644 --- a/mallplusui-uniapp-app/manifest.json +++ b/mallplusui-uniapp-app/manifest.json @@ -2,8 +2,8 @@ "name" : "汇融云链", "appid" : "__UNI__FB2C9C4", "description" : "", - "versionName" : "1.0.1.1", - "versionCode" : 1011, + "versionName" : "1.0.1.2", + "versionCode" : 1012, "transformPx" : false, "app-plus" : { "usingComponents" : true, diff --git a/mallplusui-uniapp-app/pages.json b/mallplusui-uniapp-app/pages.json index 83665a6..9f94f89 100644 --- a/mallplusui-uniapp-app/pages.json +++ b/mallplusui-uniapp-app/pages.json @@ -42,7 +42,7 @@ }, { "path": "pages/index/messageList", "style": { - // "enablePullDownRefresh": true, + "enablePullDownRefresh": true, "navigationBarTitleText": "消息列表" } diff --git a/mallplusui-uniapp-app/pages/index/index.vue b/mallplusui-uniapp-app/pages/index/index.vue index 854a882..df88993 100644 --- a/mallplusui-uniapp-app/pages/index/index.vue +++ b/mallplusui-uniapp-app/pages/index/index.vue @@ -326,7 +326,7 @@ setTimeout(function() { uni.stopPullDownRefresh(); }, 2000); - + }, onShareAppMessage() {}, onLoad(ops) { @@ -650,6 +650,8 @@ let list = await Api.apiCall('get', Api.goods.goodsList, params); + console.log("list>>>>", list) + let goodsList = list.records; if (type === 'refresh') { diff --git a/mallplusui-uniapp-app/pages/index/messageDetail.vue b/mallplusui-uniapp-app/pages/index/messageDetail.vue index b28d5f4..cc35ac9 100644 --- a/mallplusui-uniapp-app/pages/index/messageDetail.vue +++ b/mallplusui-uniapp-app/pages/index/messageDetail.vue @@ -5,7 +5,7 @@ {{ info.code }} - {{ info.ctime | formatCreateTime }} + {{ info.cdate}} diff --git a/mallplusui-uniapp-app/pages/index/messageList.vue b/mallplusui-uniapp-app/pages/index/messageList.vue index e2ace4b..0caab99 100644 --- a/mallplusui-uniapp-app/pages/index/messageList.vue +++ b/mallplusui-uniapp-app/pages/index/messageList.vue @@ -8,15 +8,15 @@ - {{item.code}} - {{item.ctime | formatCreateTime }} + {{item.params}} + {{item.cdate}} - {{item.params}} + {{item.content}} - + @@ -31,6 +31,7 @@ data() { return { pageNum: 1, + loadingType: 'more', //加载更多状态 pic1: "http://mall.yyundong.com/wl.png", pic2: "http://mall.yyundong.com/tx.png", pic3: "http://mall.yyundong.com/tz.png", @@ -59,6 +60,8 @@ // this.loadData(); }, onShow() { + this.pageNum = 1; + this.goodsList = []; this.loadData(); }, onPageScroll(e) { @@ -73,6 +76,10 @@ onPullDownRefresh() { this.pageNum = 1; this.loadData('refresh'); + setTimeout(function() { + uni.stopPullDownRefresh(); + }, 2000); + }, //加载更多 onReachBottom() { @@ -105,21 +112,21 @@ } else { this.loadingType = 'more'; } + let params = { - // pageNum: this.pageNum + pageNum: this.pageNum }; - - + console.log("pageNum>>>>>", this.pageNum) let list = await Api.apiCall('get', Api.member.mesList, params); console.log("消息列表", list) - this.goodsList = list; + // this.goodsList = list; // let goodsList = await this.$api.json('goodsList'); - // if (type === 'refresh') { - // this.goodsList = []; - // } - - // this.goodsList = this.goodsList.concat(goodsList); + if (type === 'refresh') { + this.goodsList = []; + } + this.goodsList = this.goodsList.concat(list.records); + console.log("消息列表>>>>>", this.goodsList.length) //判断是否还有下一页，有是more 没有是nomore(测试数据判断大于20就没有了) this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more'; if (type === 'refresh') { @@ -208,6 +215,7 @@ .text2 { color: #999; + margin-right: 10px; font-size: 18px; } diff --git a/mallplusui-uniapp-app/pages/order/createOrder.vue b/mallplusui-uniapp-app/pages/order/createOrder.vue index d104912..6b6c55c 100644 --- a/mallplusui-uniapp-app/pages/order/createOrder.vue +++ b/mallplusui-uniapp-app/pages/order/createOrder.vue @@ -309,7 +309,11 @@ this.couponList = data.couponHistoryDetailList; if (this.couponList.length > 0) { + this.coupon = this.couponList[0].coupon + this.couponId = this.couponList[0].couponId; + this.memberCouponId = this.couponList[0].id; + } this.memberReceiveAddressList = data.memberReceiveAddressListaddress; @@ -357,7 +361,7 @@ this.payType = type; }, async submit() { - console.log('dubmit') + console.log('submit') let data; if (!this.addressId) { this.$api.msg('请选择收货地址'); @@ -414,6 +418,9 @@ }; } params.source = this.getSource(); + + console.log('params',params) + data = await Api.apiCall('post', Api.order.bookOrder, params); } // 购物车 diff --git a/mallplusui-uniapp-app/pages/order/createStoreOrder.vue b/mallplusui-uniapp-app/pages/order/createStoreOrder.vue index 47800f8..968ad9a 100644 --- a/mallplusui-uniapp-app/pages/order/createStoreOrder.vue +++ b/mallplusui-uniapp-app/pages/order/createStoreOrder.vue @@ -444,6 +444,7 @@ page { background: $page-color-base; padding-bottom: 100upx; + height: auto; } .address-section { @@ -504,7 +505,8 @@ .goods-section { margin-top: 16upx; background: #fff; - padding-bottom: 150px; + padding-bottom: 1px; + margin-bottom: 350px; .g-header { display: flex; @@ -546,6 +548,7 @@ } .title { + margin-top: 10px; font-size: 30upx; color: $font-color-dark; }