This commit is contained in:
Gao xiaosong
2020-03-16 01:40:52 +08:00
parent 397082cdaf
commit e215701560
216 changed files with 11659 additions and 13905 deletions

View File

@ -76,23 +76,23 @@ export default {
step: 1
})
.then(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
});
that.$yrouter.replace({
path: "/pages/user/PersonalData/main"
path: "/pages/user/PersonalData/index"
});
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
});
that.$yrouter.replace({
path: "/pages/user/PersonalData/main"
path: "/pages/user/PersonalData/index"
});
});
}
@ -101,29 +101,29 @@ export default {
txt: "取消",
color: false,
callback: () => {
wx.showToast({
uni.showToast({
title: "已取消绑定",
icon: "none",
duration: 2000
});
that.$yrouter.replace({
path: "/pages/user/PersonalData/main"
path: "/pages/user/PersonalData/index"
});
}
}
]
});
} else {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
});
that.$yrouter.replace({ path: "/pages/user/PersonalData/main" });
that.$yrouter.replace({ path: "/pages/user/PersonalData/index" });
}
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -148,7 +148,7 @@ export default {
registerVerify({ phone: phone })
.then(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -156,7 +156,7 @@ export default {
that.sendCode();
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000

View File

@ -84,7 +84,7 @@ export default {
} catch (e) {
return validatorDefaultCatch(e);
}
if (password !== password2) return wx.showToast({
if (password !== password2) return uni.showToast({
title: '两次密码不一致',
icon: "none",
duration: 2000
@ -95,7 +95,7 @@ export default {
password: that.password
})
.then(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -104,7 +104,7 @@ export default {
// that.$yrouter.push({ path: "/pages/user/Login/index" });
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -129,7 +129,7 @@ export default {
registerVerify({ phone: yphone })
.then(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -137,7 +137,7 @@ export default {
that.sendCode();
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000

View File

@ -4,7 +4,7 @@
class="item acea-row row-between-wrapper"
v-for="item in list"
:key="item.id"
@click="$yrouter.push({path:'/pages/user/CustomerService/index',query:{id:item.uid}})"
@click="goCustomerService(item)"
>
<div class="pictrue">
<img :src="item.avatar" />
@ -24,6 +24,12 @@ export default {
};
},
methods: {
goCustomerService(item) {
this.$yrouter.push({
path: "/pages/user/CustomerService/index",
query: { id: item.uid }
});
},
getList() {
serviceList().then(res => {
this.list = res.data;

View File

@ -76,41 +76,13 @@
<input type="text" v-else value="未绑定" disabled class="id" />
</div>
</div>
<!--<div v-if="!userInfo.phone">-->
<!--<div-->
<!--@click="$yrouter.push('/pages/user/BindingPhone/index')"-->
<!--class="item acea-row row-between-wrapper"-->
<!--&gt;-->
<!--<div>绑定手机号</div>-->
<!--<div class="input">-->
<!--点击绑定手机号<span class="iconfont icon-xiangyou"></span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="item acea-row row-between-wrapper" v-else-if="userInfo.phone">-->
<!--<div>手机号码</div>-->
<!--<div class="input acea-row row-between-wrapper">-->
<!--<div class="input acea-row row-between-wrapper">-->
<!--<input-->
<!--type="text"-->
<!--:value="userInfo.phone"-->
<!--disabled-->
<!--class="id"-->
<!--/><span class="iconfont icon-suozi"></span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div v-if="userInfo.phone && userInfo.user_type === 'h5'">-->
<!--<div-->
<!--@click="$yrouter.push('/pages/user/ChangePassword/index')"-->
<!--class="item acea-row row-between-wrapper"-->
<!--&gt;-->
<!--<div>密码</div>-->
<!--<div class="input">-->
<!--点击修改密码<span class="iconfont icon-xiangyou"></span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="item acea-row row-between-wrapper" @click="goChangePassword()">
<div>密码</div>
<div class="input acea-row row-between-wrapper">
<span>点击修改密码</span>
<span class="iconfont icon-suozi"></span>
</div>
</div>
</div>
<!--<div class="modifyBnt bg-color-red" @click="submit">保存修改</div>-->
<!-- <div
@ -161,6 +133,9 @@ export default {
this.getUserInfo();
},
methods: {
goChangePassword() {
this.$yrouter.push("/pages/user/ChangePassword/index");
},
switchAccounts: function(index) {
let that = this;
this.userIndex = index;
@ -171,19 +146,19 @@ export default {
if (userInfo.user_type === "h5") {
switchH5Login()
.then(({ data }) => {
wx.hideLoading();
uni.hideLoading();
const expires_time = dayjs(data.expires_time);
store.commit("LOGIN", data.token, expires_time);
that.$emit("changeswitch", false);
location.reload();
})
.catch(err => {
wx.hideLoading();
uni.hideLoading();
return that.$dialog.toast({ mes: err });
});
} else {
cookie.set("loginType", "wechat", 60);
wx.hideLoading();
uni.hideLoading();
this.$store.commit("LOGOUT");
this.$emit("changeswitch", false);
}
@ -219,7 +194,7 @@ export default {
}).then(
res => {
this.$store.dispatch("USERINFO", true);
this.$wx.showToast({ title: res.msg, icon: "none", duration: 2000 });
this.$uni.showToast({ title: res.msg, icon: "none", duration: 2000 });
this.$yrouter.back();
},
error => {

View File

@ -11,7 +11,7 @@
<div class="item">
<div>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-phone_"></use>
<use xlink:href="#icon-phone_" />
</svg>
<input type="text" placeholder="输入手机号码" />
</div>
@ -19,7 +19,7 @@
<div class="item">
<div class="align-left">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_1"></use>
<use xlink:href="#icon-code_1" />
</svg>
<input type="text" placeholder="填写验证码" class="codeIput" />
<button
@ -27,15 +27,13 @@
:disabled="disabled"
:class="disabled === true ? 'on' : ''"
@click="code"
>
{{ text }}
</button>
>{{ text }}</button>
</div>
</div>
<div class="item">
<div>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_"></use>
<use xlink:href="#icon-code_" />
</svg>
<input type="text" placeholder="填写您的登录密码" />
</div>
@ -44,9 +42,7 @@
<div class="logon">注册</div>
<div class="tip">
已有账号?
<span @click="$yrouter.push({ name: 'Login' })" class="font-color-red"
>立即登录</span
>
<span @click="goLogin()" class="font-color-red">立即登录</span>
</div>
</div>
<div class="bottom"></div>
@ -62,6 +58,9 @@ export default {
methods: {
code: function() {
this.sendCode();
},
goLogin() {
this.$yrouter.push({ path: "/pages/user/Login/index" });
}
}
};

View File

@ -11,7 +11,7 @@
<div class="item">
<div>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-phone_"></use>
<use xlink:href="#icon-phone_" />
</svg>
<input type="text" placeholder="输入手机号码" v-model="account" />
</div>
@ -19,42 +19,29 @@
<div class="item">
<div class="align-left">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_1"></use>
<use xlink:href="#icon-code_1" />
</svg>
<input
type="text"
placeholder="填写验证码"
class="codeIput"
v-model="captcha"
/>
<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
<button
class="code"
:disabled="disabled"
:class="disabled === true ? 'on' : ''"
@click="code"
>
{{ text }}
</button>
>{{ text }}</button>
</div>
</div>
<div class="item">
<div>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_"></use>
<use xlink:href="#icon-code_" />
</svg>
<input
type="password"
placeholder="填写您的登录密码"
v-model="password"
/>
<input type="password" placeholder="填写您的登录密码" v-model="password" />
</div>
</div>
</div>
<div class="logon" @click="registerReset">确认</div>
<div class="tip">
<span @click="$yrouter.push({ name: 'Login' })" class="font-color-red"
>立即登录</span
>
<span @click="goLogin()" class="font-color-red">立即登录</span>
</div>
</div>
<div class="bottom"></div>
@ -78,6 +65,9 @@ export default {
},
mixins: [sendVerifyCode],
methods: {
goLogin() {
this.$yrouter.push({ path: "/pages/user/Login/index" });
},
async registerReset() {
var that = this;
const { account, captcha, password } = that;

View File

@ -13,13 +13,8 @@
{{ userInfo.vipName }}
</div>
</div>
<div
@click="$yrouter.push('/pages/user/PersonalData/index')"
class="id"
v-if="userInfo.phone"
>
ID{{ userInfo.uid || 0
}}
<div @click="goPersonalData()" class="id" v-if="userInfo.phone">
ID{{ userInfo.uid || 0}}
<span class="iconfont icon-bianji1"></span>
</div>
<button
@ -32,30 +27,27 @@
</button>
</div>
</div>
<span
class="iconfont icon-shezhi"
@click="$yrouter.push({ path: '/pages/user/PersonalData/index' })"
></span>
<span class="iconfont icon-shezhi" @click="goPersonalData()"></span>
</div>
<div class="wrapper">
<div class="nav acea-row row-middle">
<div @click="$yrouter.push({ path: '/pages/user/UserAccount/index' })" class="item">
<div @click="goUserAccount()" class="item">
<div>我的余额</div>
<div class="num">{{ userInfo.nowMoney || 0 }}</div>
</div>
<div
@click="$yrouter.push('/pages/user/promotion/UserPromotion/index')"
@click="goUserPromotion()"
class="item"
v-if="userInfo.isPromoter === 1 || userInfo.statu === 2"
>
<div>当前佣金</div>
<div class="num">{{ userInfo.brokeragePrice || 0 }}</div>
</div>
<div @click="$yrouter.push('/pages/user/signIn/Integral/index')" class="item" v-else>
<div @click="goIntegral()" class="item" v-else>
<div>当前积分</div>
<div class="num">{{ userInfo.integral || 0 }}</div>
</div>
<div @click="$yrouter.push('/pages/user/coupon/UserCoupon/index')" class="item">
<div @click="goUserCoupon()" class="item">
<div>优惠券</div>
<div class="num">{{ userInfo.couponCount || 0 }}</div>
</div>
@ -63,16 +55,13 @@
<div class="myOrder">
<div class="title acea-row row-between-wrapper">
<div>我的订单</div>
<div @click="$yrouter.push('/pages/order/MyOrder/index')" class="allOrder">
<div @click="goMyOrder()" class="allOrder">
全部订单
<span class="iconfont icon-jiantou"></span>
</div>
</div>
<div class="orderState acea-row row-middle">
<div
@click="$yrouter.push({ path: '/pages/order/MyOrder/index',query:{type:0}})"
class="item"
>
<div @click="goMyOrder(0)" class="item">
<div class="pictrue">
<img :src="$VUE_APP_RESOURCES_URL + '/images/dfk.png'" />
<span
@ -82,10 +71,7 @@
</div>
<div>待付款</div>
</div>
<div
@click="$yrouter.push({ path: '/pages/order/MyOrder/index',query:{type:1} })"
class="item"
>
<div @click="goMyOrder(1)" class="item">
<div class="pictrue">
<img :src="$VUE_APP_RESOURCES_URL+'/images/dfh.png'" />
<span
@ -95,10 +81,7 @@
</div>
<div>待发货</div>
</div>
<div
@click="$yrouter.push({ path: '/pages/order/MyOrder/index',query:{type:2}})"
class="item"
>
<div @click="goMyOrder(2)" class="item">
<div class="pictrue">
<img :src="$VUE_APP_RESOURCES_URL+'/images/dsh.png'" />
<span
@ -108,10 +91,7 @@
</div>
<div>待收货</div>
</div>
<div
@click="$yrouter.push({ path: '/pages/order/MyOrder/index',query:{type:3} })"
class="item"
>
<div @click="goMyOrder(3)" class="item">
<div class="pictrue">
<img :src="$VUE_APP_RESOURCES_URL+'/images/dpj.png'" />
<span
@ -121,7 +101,7 @@
</div>
<div>待评价</div>
</div>
<div @click="$yrouter.push('/pages/order/ReturnList/index')" class="item">
<div @click="goReturnList()" class="item">
<div class="pictrue">
<img :src="$VUE_APP_RESOURCES_URL+'/images/sh.png'" />
<span
@ -194,16 +174,40 @@ export default {
}
},
mounted: function() {
console.log('这个是个人中心')
console.log("这个是个人中心");
this.User();
this.MenuUser();
this.isWeixin = isWeixin();
},
methods: {
goReturnList() {
this.$yrouter.push("/pages/order/ReturnList/index");
},
goMyOrder(type) {
this.$yrouter.push({
path: "/pages/order/MyOrder/index",
query: { type }
});
},
goUserCoupon() {
this.$yrouter.push("/pages/user/coupon/UserCoupon/index");
},
goIntegral() {
this.$yrouter.push("/pages/user/signIn/Integral/index");
},
goUserPromotion() {
this.$yrouter.push("/pages/user/promotion/UserPromotion/index");
},
goUserAccount() {
this.$yrouter.push({ path: "/pages/user/UserAccount/index" });
},
goPersonalData() {
this.$yrouter.push("/pages/user/PersonalData/index");
},
getPhoneNumber: function(e) {
console.log(e.mp.detail);
if (e.mp.detail.errMsg == "getPhoneNumber:ok") {
wx.showLoading({ title: "绑定中" });
uni.showLoading({ title: "绑定中" });
wx.login({
success: loginRes => {
bindingPhone({
@ -213,15 +217,15 @@ export default {
})
.then(res => {
this.User();
wx.hideLoading();
wx.showToast({
uni.hideLoading();
uni.showToast({
title: res.msg,
icon: "success",
duration: 2000
});
})
.catch(error => {
wx.showToast({
uni.showToast({
title: error.msg || error.response.data.msg,
icon: "none",
duration: 2000
@ -230,7 +234,7 @@ export default {
}
});
} else {
wx.showToast({
uni.showToast({
title: "已拒绝授权",
icon: "none",
duration: 2000
@ -254,9 +258,9 @@ export default {
});
},
goPages: function(index) {
let url = this.MyMenus[index].wxapp_url;
let url = this.MyMenus[index].uniapp_url;
if (
url === "/pages/user/promotion/UserPromotion/main" &&
url === "/pages/user/promotion/UserPromotion/index" &&
this.userInfo.statu === 1
) {
if (!this.userInfo.isPromoter)
@ -264,13 +268,13 @@ export default {
}
if (
url === "/pages/orderAdmin/OrderIndex/main" &&
url === "/pages/orderAdmin/OrderIndex/index" &&
!this.userInfo.adminid
) {
return this.$dialog.toast({ mes: "您还不是管理员!!" });
}
this.$yrouter.push({ path: this.MyMenus[index].wxapp_url });
this.$yrouter.push({ path: this.MyMenus[index].uniapp_url });
}
},
onShow() {
@ -282,7 +286,6 @@ export default {
</script>
<style>
.footer-line-height {
height: 1rem;
}

View File

@ -18,13 +18,13 @@
</div>
</div>
<div class="nav acea-row row-middle">
<div class="item" @click="$yrouter.push({path:'/pages/user/UserBill/index',query:{id:0}})">
<div class="item" @click="goUserBill(0)">
<div class="pictrue">
<img :src="$VUE_APP_RESOURCES_URL+'/images/record1.png'" />
</div>
<div>账单记录</div>
</div>
<div class="item" @click="$yrouter.push({path:'/pages/user/UserBill/index',query:{id:1}})">
<div class="item" @click="goUserBill(1)">
<div class="pictrue">
<img :src="$VUE_APP_RESOURCES_URL+'/images/record2.png'" />
</div>
@ -62,6 +62,9 @@ export default {
this.getActivity();
},
methods: {
goUserBill(id) {
this.$yrouter.push({ path: "/pages/user/UserBill/index", query: { id } });
},
getIndex: function() {
let that = this;
getBalance().then(

View File

@ -140,7 +140,7 @@ export default {
*/
editAddress: function(index) {
this.$yrouter.push({
path: "/pages/user/address/AddAddress/main",
path: "/pages/user/address/AddAddress/index",
query: { id: this.addressList[index].id }
});
},
@ -167,7 +167,7 @@ export default {
radioChange: function(id) {
getAddressDefaultSet(id).then(res => {
this.refresh();
wx.showToast({ title: res.msg, icon: "none", duration: 2000 });
uni.showToast({ title: res.msg, icon: "none", duration: 2000 });
});
},
/**
@ -175,12 +175,12 @@ export default {
*/
addAddress: function() {
this.$yrouter.push({
path: "/pages/user/address/AddAddress/main"
path: "/pages/user/address/AddAddress/index"
});
},
getAddress() {
// openAddress().then(userInfo => {
// wx.showLoading({ title: "加载中" });
// uni.showLoading({ title: "加载中" });
// postAddress({
// real_name: userInfo.userName,
// phone: userInfo.telNumber,
@ -199,11 +199,11 @@ export default {
// this.loadend = false;
// this.addressList = [];
// this.AddressList();
// wx.hideLoading();
// uni.hideLoading();
// this.$dialog.toast({ mes: "添加成功" });
// })
// .catch(err => {
// wx.hideLoading();
// uni.hideLoading();
// this.$dialog.error(err.msg || "添加失败");
// });
// });

View File

@ -1,14 +1,11 @@
<template>
<div class="cash-audit">
<div class="pictrue"><img :src="$VUE_APP_RESOURCES_URL+'/images/examine.png'" /></div>
<div class="pictrue">
<img :src="$VUE_APP_RESOURCES_URL+'/images/examine.png'" />
</div>
<div class="tip">提现申请已提交等待人工审核</div>
<div class="time">{{ time }}</div>
<div
class="bnt bg-color-red"
@click="$yrouter.push({ path: '/pages/user/promotion/UserPromotion/index' })"
>
好的
</div>
<div class="bnt bg-color-red" @click="goUserPromotion()">好的</div>
</div>
</template>
<script>
@ -25,6 +22,10 @@ export default {
let myData = new Date();
this.time = myData.toLocaleString();
},
methods: {}
methods: {
goUserPromotion() {
this.$yrouter.push({ path: "/pages/user/promotion/UserPromotion/index" });
}
}
};
</script>

View File

@ -91,7 +91,7 @@ export default {
var downloadUrl = imgsrc;
if (!wx.saveImageToPhotosAlbum) {
wx.showModal({
uni.showModal({
title: "提示",
content:
"当前微信版本过低,无法使用该功能,请升级到最新微信版本后重试。"

View File

@ -3,7 +3,7 @@
<div class="header">
<div class="name acea-row row-center-wrapper">
<div>当前佣金</div>
<div class="record" @click="$yrouter.push('/pages/user/promotion/CashRecord/index')">
<div class="record" @click="goCashRecord()">
提现记录
<span class="iconfont icon-xiangyou"></span>
</div>
@ -22,31 +22,19 @@
</div>
<div class="bnt bg-color-red" @click="toCash">立即提现</div>
<div class="list acea-row row-between-wrapper">
<div
class="item acea-row row-center-wrapper row-column"
@click="$yrouter.push('/pages/user/promotion/Poster/index')"
>
<div class="item acea-row row-center-wrapper row-column" @click="goPoster()">
<span class="iconfont icon-erweima"></span>
<div>推广名片</div>
</div>
<div
class="item acea-row row-center-wrapper row-column"
@click="$yrouter.push('/pages/user/promotion/PromoterList/index')"
>
<div class="item acea-row row-center-wrapper row-column" @click="goPromoterList()">
<span class="iconfont icon-tongji"></span>
<div>推广人统计</div>
</div>
<div
class="item acea-row row-center-wrapper row-column"
@click="$yrouter.push('/pages/user/promotion/CommissionDetails/index')"
>
<div class="item acea-row row-center-wrapper row-column" @click="goCommissionDetails()">
<span class="iconfont icon-qiandai"></span>
<div>佣金明细</div>
</div>
<div
class="item acea-row row-center-wrapper row-column"
@click="$yrouter.push('/pages/user/promotion/PromoterOrder/index')"
>
<div class="item acea-row row-center-wrapper row-column" @click="goPromoterOrder()">
<span class="iconfont icon-dingdan"></span>
<div>推广人订单</div>
</div>
@ -73,6 +61,21 @@ export default {
this.getInfo();
},
methods: {
goPoster() {
this.$yrouter.push("/pages/user/promotion/Poster/index");
},
goCashRecord() {
this.$yrouter.push("/pages/user/promotion/CashRecord/index");
},
goPromoterList() {
this.$yrouter.push("/pages/user/promotion/PromoterList/index");
},
goCommissionDetails() {
this.$yrouter.push("/pages/user/promotion/CommissionDetails/index");
},
goPromoterOrder() {
this.$yrouter.push("/pages/user/promotion/PromoterOrder/index");
},
getInfo: function() {
let that = this;
getSpreadInfo().then(
@ -85,7 +88,7 @@ export default {
);
},
toCash: function() {
this.$yrouter.push({ path: "/pages/user/promotion/UserCash/main" });
this.$yrouter.push({ path: "/pages/user/promotion/UserCash/index" });
}
}
};
@ -93,5 +96,4 @@ export default {
<style>
</style>

View File

@ -5,18 +5,18 @@
<div>{{ info.integral }}</div>
<div class="line"></div>
<!--<div class="nav acea-row">-->
<!--<div class="item">-->
<!--<div class="num">{{ info.sum_integral }}</div>-->
<!--<div>累计积分</div>-->
<!--</div>-->
<!--<div class="item">-->
<!--<div class="num">{{ info.deduction_integral }}</div>-->
<!--<div>累计消费</div>-->
<!--</div>-->
<!--<div class="item">-->
<!--<div class="num">{{ info.today_integral }}</div>-->
<!--<div>今日获得</div>-->
<!--</div>-->
<!--<div class="item">-->
<!--<div class="num">{{ info.sum_integral }}</div>-->
<!--<div>累计积分</div>-->
<!--</div>-->
<!--<div class="item">-->
<!--<div class="num">{{ info.deduction_integral }}</div>-->
<!--<div>累计消费</div>-->
<!--</div>-->
<!--<div class="item">-->
<!--<div class="num">{{ info.today_integral }}</div>-->
<!--<div>今日获得</div>-->
<!--</div>-->
<!--</div>-->
</div>
<div class="wrapper">
@ -28,13 +28,14 @@
:key="navListIndex"
@click="nav(navListIndex)"
>
<span class="iconfont" :class="item.icon"></span>{{ item.name }}
<span class="iconfont" :class="item.icon"></span>
{{ item.name }}
</div>
</div>
<div class="list" :hidden="current !== 0">
<!--<div class="tip acea-row row-middle">-->
<!--<span class="iconfont icon-shuoming"></span-->
<!--&gt;提示:积分数值的高低会直接影响您的会员等级-->
<!--<span class="iconfont icon-shuoming"></span-->
<!--&gt;提示:积分数值的高低会直接影响您的会员等级-->
<!--</div>-->
<div
class="item acea-row row-between-wrapper"
@ -43,28 +44,28 @@
>
<div>
<div class="state">{{ item.title }}</div>
<div><data-format :data="item.addTime"></data-format></div>
<div>
<data-format :data="item.addTime"></data-format>
</div>
</div>
<div class="num" v-if="item.pm == 1">+{{ item.number }}</div>
<div class="num font-color-red" v-if="item.pm == 0">
-{{ item.number }}
</div>
<div class="num font-color-red" v-if="item.pm == 0">-{{ item.number }}</div>
</div>
</div>
<!--<div class="list2" :hidden="current !== 1">-->
<!--<div class="item acea-row row-between-wrapper" @click="$yrouter.switchTab('/pages/home/index')">-->
<!--<div class="pictrue"><img :src="$VUE_APP_RESOURCES_URL+'/images/score.png'" /></div>-->
<!--<div class="name">购买商品可获得积分奖励</div>-->
<!--<div class="earn">赚积分</div>-->
<!--</div>-->
<!--<div-->
<!--class="item acea-row row-between-wrapper"-->
<!--@click="$yrouter.push('/pages/user/signIn/Sign/index')"-->
<!--&gt;-->
<!--<div class="pictrue"><img :src="$VUE_APP_RESOURCES_URL+'/images/score.png'" /></div>-->
<!--<div class="name">每日签到可获得积分奖励</div>-->
<!--<div class="earn">赚积分</div>-->
<!--</div>-->
<!--<div class="item acea-row row-between-wrapper" @click="goHome()">-->
<!--<div class="pictrue"><img :src="$VUE_APP_RESOURCES_URL+'/images/score.png'" /></div>-->
<!--<div class="name">购买商品可获得积分奖励</div>-->
<!--<div class="earn">赚积分</div>-->
<!--</div>-->
<!--<div-->
<!--class="item acea-row row-between-wrapper"-->
<!--@click="goSignIn()"-->
<!--&gt;-->
<!--<div class="pictrue"><img :src="$VUE_APP_RESOURCES_URL+'/images/score.png'" /></div>-->
<!--<div class="name">每日签到可获得积分奖励</div>-->
<!--<div class="earn">赚积分</div>-->
<!--</div>-->
<!--</div>-->
</div>
<Loading :loaded="loaded" :loading="loading"></Loading>
@ -107,10 +108,16 @@ export default {
this.getIntegral();
this.getInfo();
},
onReachBottom() {
onReachBottom() {
!this.loading && this.getInfo();
},
methods: {
goSignIn() {
this.$yrouter.push("/pages/user/signIn/Sign/index");
},
goHome() {
this.$yrouter.switchTab("/pages/home/index");
},
nav: function(index) {
this.current = index;
},
@ -146,7 +153,6 @@ export default {
};
</script>
<style>
.list{
}
.list {
}
</style>

View File

@ -13,10 +13,7 @@
</div>
</div>
</div>
<div
@click="$yrouter.push('/pages/user/signIn/SignRecord/index')"
class="right acea-row row-middle"
>
<div @click="goSignRecord()" class="right acea-row row-middle">
<div class="iconfont icon-caidan"></div>
<div>明细</div>
</div>
@ -78,7 +75,7 @@
<div class="num font-color-red">+{{ item.number }}</div>
</div>
<div
@click="$yrouter.push('/pages/user/signIn/SignRecord/index')"
@click="goSignRecord()"
class="Loads acea-row row-center-wrapper"
v-if="signList.length > 0"
>
@ -139,6 +136,9 @@ export default {
this.getSignList();
},
methods: {
goSignRecord() {
this.$yrouter.push("/pages/user/signIn/SignRecord/index");
},
// js给数字补0num需要补0的数字length长度补到多少位
PrefixInteger: function(num, length) {
return (Array(length).join("0") + num).slice(-length).split("");