other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

Browse Source
This commit is contained in:
lzh
2023-03-18 21:47:21 +08:00
parent 862b8af3a4 75579ba418
commit 4b73744552
9 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mallplusui-uniapp-app/App.vue
View File

@@ -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) {

6
mallplusui-uniapp-app/common/api.js
View File

@@ -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', // 查询学校列表

4
mallplusui-uniapp-app/manifest.json
View File

@@ -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,

2
mallplusui-uniapp-app/pages.json
View File

@@ -42,7 +42,7 @@
}, {
"path": "pages/index/messageList",
"style": {
// "enablePullDownRefresh": true,
"enablePullDownRefresh": true,
"navigationBarTitleText": "消息列表"
}

4
mallplusui-uniapp-app/pages/index/index.vue
View File

@@ -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') {

2
mallplusui-uniapp-app/pages/index/messageDetail.vue
View File

@@ -5,7 +5,7 @@
<view class="bot-row">
<text>{{ info.code }}</text>
<text>{{ info.ctime | formatCreateTime }}</text>
<text>{{ info.cdate}}</text>
</view>
</view>

34
mallplusui-uniapp-app/pages/index/messageList.vue
View File

@@ -8,15 +8,15 @@
</view>
<view class="listcard-content">
<view class="listcard-content_title">
<text>{{item.code}}</text>
<text class="text2">{{item.ctime | formatCreateTime }}</text>
<text>{{item.params}}</text>
<text class="text2">{{item.cdate}}</text>
</view>
<text class="listcard-content_title_text">{{item.params}}</text>
<text class="listcard-content_title_text">{{item.content}}</text>
</view>
</view>
</view>
</view>
<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
<uni-load-more :status="loadingType"></uni-load-more>
</view>
</template>
@@ -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;
}

9
mallplusui-uniapp-app/pages/order/createOrder.vue
View File

@@ -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);
}
// 购物车

5
mallplusui-uniapp-app/pages/order/createStoreOrder.vue
View File

@@ -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;
}