From 0f1316027c8a590784cfe28ba8e27843065bb638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=92=BB=E9=A3=8E?= <1090115880@qq.com>
Date: Tue, 16 Mar 2021 16:24:12 +0800
Subject: [PATCH] 3.0
---
App.vue | 168 ++++++++++++--------------
commit.csv | 19 +++
components/goodsList.vue | 4 +-
pages/mine/mine.vue | 16 +--
pages/ranking/ranking.vue | 7 +-
pages/totalEarnings/totalEarnings.vue | 85 +++++++------
plugins/filters.js | 43 +++----
store/index.js | 122 +++++++++----------
8 files changed, 230 insertions(+), 234 deletions(-)
create mode 100644 commit.csv
diff --git a/App.vue b/App.vue
index 986c0ee..b58d51c 100644
--- a/App.vue
+++ b/App.vue
@@ -1,89 +1,81 @@
-
-
-
diff --git a/commit.csv b/commit.csv
new file mode 100644
index 0000000..e5a32ab
--- /dev/null
+++ b/commit.csv
@@ -0,0 +1,19 @@
+2021-03-12,17:31:40,3-12,333,261
+2021-03-11,19:58:02,3-11,747,324
+2021-03-10,19:58:44,3-10,1464,81
+2021-03-09,19:59:45,3-9,730,173
+2021-03-08,20:27:44,3-8,1017,556
+2021-03-05,17:56:46,3-6,file,1
+2021-03-05,17:55:37,3-5,463,32
+2021-03-04,20:33:02,3-4,622,275
+2021-03-03,19:40:50,3-3,972,5184
+2021-03-03,09:23:04,3-3,5502,663
+2021-03-01,20:30:00,3-1,46,27
+2021-03-01,19:32:50,gra3-1,9,10
+2021-03-01,19:27:40,Gray3-1,48,21
+2021-03-01,15:14:14,01,42,11
+2021-02-07,18:09:44,2.7,12,9
+2021-02-05,18:30:18,2.5,284,40
+2021-02-04,18:01:05,2.4,16,3
+2021-02-02,18:05:40,last,232,85
+2021-02-01,17:57:05,01,502,429
diff --git a/components/goodsList.vue b/components/goodsList.vue
index ad1a2cb..3411ed8 100644
--- a/components/goodsList.vue
+++ b/components/goodsList.vue
@@ -3,8 +3,7 @@
-
-
+
@@ -13,6 +12,7 @@
+
- 取消
+ 取消
@@ -68,11 +68,8 @@
this.isShow = true
this.onShareData = data
},
- // http://testh5.reecook.cn/#/goods/detail/8111/R7M1V9
copyLink(){
- // http://testh5.reecook.cn/#/goods/detail/
- // let url = `/pages/goodsDetail/goodsDetail?id=${this.onShareData.id}`
- let url = `http://testh5.reecook.cn/#/goods/detail/${this.onShareData.id}/${this.$store.state.invitationNo}`
+ let url = `/pages/goodsDetail/goodsDetail?id=${this.onShareData.id}`
uni.setClipboardData({
data: url,
success: function () {
diff --git a/pages/totalEarnings/totalEarnings.vue b/pages/totalEarnings/totalEarnings.vue
index 3a83013..76e09d5 100644
--- a/pages/totalEarnings/totalEarnings.vue
+++ b/pages/totalEarnings/totalEarnings.vue
@@ -8,41 +8,47 @@
收益汇总(瑞币)
-
+
-
-
+
+
-
- 累计收益
-
-
- {{accumulateIncome.all}}
+ 累计收益
+
+ 18832.00
-
-
+
+
+ 累计收益
- 自购收益
- {{accumulateIncome.selfShopping}}
+ 18832.00
+
+
+ 累计收益
+
+ 18832.00
+
+
+
+ 累计收益
+
+ 18832.00
+
- 自购收益
- {{accumulateIncome.selfShopping}}
-
-
- 团队收益
- {{accumulateIncome.team}}
-
-
- 推荐收益
- {{accumulateIncome.team}}
+ 累计收益
+
+ 18832.00
+
- 平台奖励
- {{accumulateIncome.team}}
+ 累计收益
+
+ 18832.00
+
@@ -141,8 +147,7 @@
// console.log(e.detail.value)
this.time = e.detail.value
this.getData()
- },
-
+ },
getData() {
this.$u.post('/api/v1/shop/shop_addup_income', {
userId: uni.getStorageSync("userInfo").id,
@@ -192,6 +197,12 @@
.total-box {
margin: 30rpx;
position: relative;
+ // .total-box-con {
+ // width: 100%;
+ // height: 100%;
+ // position: relative;
+ // border-radius: 15rpx;
+ // overflow: hidden;
.con-box {
position: absolute;
@@ -202,22 +213,16 @@
padding: 30rpx;
border-radius: 10rpx;
overflow: hidden;
-
- .con-item {
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
-
- .text {
- font-size: 28rpx;
- color: rgba(58,57,67,0.5);
-
- }
- .num {
- font-size: 40rpx;
- color: #333333;
- }
+ .text {
+ color: #aaa;
+ font-size: 24rpx;
+ margin-bottom: 15rpx;
}
+ .num {
+ color: #000;
+ font-size: 32rpx;
+ }
}
// }
diff --git a/plugins/filters.js b/plugins/filters.js
index 6547ed5..236f311 100644
--- a/plugins/filters.js
+++ b/plugins/filters.js
@@ -1,13 +1,4 @@
-/**
- * Diamond1Level = 100 钻一店铺
- * Diamond2Level = 130 钻二店铺
- * Diamond3Level = 160 钻三店铺
- * GoldLevel = 200 黄金店铺
- * SilverLevel = 300 白银店铺
- * MasterLevel = 400 店主
- * VipLevel = 500 会员
- * */
-export function roleFilter(roleLevel, format) {
+export function roleFilter(roleLevel,format) {
let roleText, badge, mineBg, otherBg
switch (roleLevel) {
case 500:
@@ -47,21 +38,21 @@ export function roleFilter(roleLevel, format) {
default:
break;
}
- switch (format) {
- case 'txt':
- return roleText
- break;
- case 'mineBg':
- return mineBg
- break;
- case 'badge':
- return badge
- break;
- case 'otherBg':
- return otherBg
- break;
- default:
- break;
- }
+ switch(format){
+ case 'txt':
+ return roleText
+ break;
+ case 'mineBg':
+ return mineBg
+ break;
+ case 'badge':
+ return badge
+ break;
+ case 'otherBg':
+ return otherBg
+ break;
+ default:
+ break;
+ }
}
diff --git a/store/index.js b/store/index.js
index b63f6eb..90221b6 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,66 +1,58 @@
-import Vue from "vue" //引入vue
-import Vuex from "vuex" // 引入vuex
-Vue.use(Vuex) // 让vue使用vuex
-const store = new Vuex.Store({
- state: {
- selectCity: "", //城市信息
- preOrderMsg: {}, //预购订单信息
- returnGoodsMsg: {}, //售后商品信息
- logisticsDetail: [], //物流信息
- userInfo: {}, //邀请人的信息
- videoDetail: {}, //小视频详情
- invitationNo: '', // 本人邀请码
- invite: '', // 别人的邀请码
- url: null, // 跳转到登录页面时原地址
- roleLevel: 500, //用户等级默认设置会员
- isLogin: false,
- },
- mutations: {
- setIsLogin(state) {
- if (uni.getStorageSync("auth").token) {
- state.isLogin = true
- } else {
- state.isLogin = false
- }
- },
- setRoleLevel(state, val) {
- state.roleLevel = val
- },
- changeCity(state, name) {
- state.selectCity = name
- },
- updatePreOrderMsg(state, obj) {
- let newObj = Object.assign({}, obj)
- state.preOrderMsg = newObj
- },
- setReturnGoodsMsg(state, obj) {
- let newObj = Object.assign({}, obj)
- state.returnGoodsMsg = newObj
- },
- setLogisticsDetail(state, arr) {
- let newArr = arr
- state.logisticsDetail = newArr
- },
- setUserInfo(state, obj) {
- let newObj = Object.assign({}, obj)
- state.userInfo = newObj
- },
- setVideoDetail(state, obj) {
- let newObj = Object.assign({}, obj)
- state.videoDetail = newObj
- },
- setinvitationNo(state, val) {
- state.invitationNo = val
- },
- setinvite(state, val) {
- state.invite = val
- },
- setUrl(state, val) {
- state.url = val
- },
- removeUrl(state) {
- state.url = null
- }
- }
-})
+import Vue from "vue" //引入vue
+import Vuex from "vuex" // 引入vuex
+Vue.use(Vuex) // 让vue使用vuex
+const store = new Vuex.Store({
+ state: {
+ selectCity:"",//城市信息
+ preOrderMsg: {},//预购订单信息
+ returnGoodsMsg:{},//售后商品信息
+ logisticsDetail:[],//物流信息
+ userInfo:{},//邀请人的信息
+ videoDetail:{},//小视频详情
+ invitationNo: '' ,// 本人邀请码
+ roleLevel:500,//用户等级默认设置会员
+ invite: '' ,// 别人的邀请码
+ url: null, // 跳转到登录页面时原地址
+ },
+ mutations: {
+ setRoleLevel(state, val){
+ state.roleLevel = val
+ },
+ changeCity(state, name) {
+ state.selectCity = name
+ },
+ updatePreOrderMsg(state, obj) {
+ let newObj = Object.assign({}, obj)
+ state.preOrderMsg = newObj
+ },
+ setReturnGoodsMsg(state,obj){
+ let newObj = Object.assign({}, obj)
+ state.returnGoodsMsg = newObj
+ },
+ setLogisticsDetail(state,arr){
+ let newArr = arr
+ state.logisticsDetail = newArr
+ },
+ setUserInfo(state,obj){
+ let newObj = Object.assign({}, obj)
+ state.userInfo = newObj
+ },
+ setVideoDetail(state,obj){
+ let newObj = Object.assign({}, obj)
+ state.videoDetail = newObj
+ },
+ setinvitationNo(state,val){
+ state.invitationNo = val
+ },
+ setinvite(state,val){
+ state.invite = val
+ },
+ setUrl(state, val) {
+ state.url = val
+ },
+ removeUrl(state) {
+ state.url = null
+ }
+ }
+})
export default store