diff --git a/apis/index.js b/apis/index.js
index 79c1f8c..6b91af7 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -68,7 +68,7 @@ const request = (parameter, hideLoding = true) => {
},
fail(err) {
uni.showToast({
- title: err.errMsg,
+ title: '网络错误，请检查您设备网络状态',
icon : 'none'
})
}
diff --git a/apis/interfaces/account.js b/apis/interfaces/account.js
index 939dd0e..508f32a 100644
--- a/apis/interfaces/account.js
+++ b/apis/interfaces/account.js
@@ -10,7 +10,6 @@ import { request } from '../index'
// dt账户
const dt = (data) =>{
- console.log(data)
return request({
url: "user/account/dt_logs",
data
diff --git a/manifest.json b/manifest.json
index 29f3a55..49f6264 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "共力生态",
"appid" : "__UNI__DE7B0E6",
"description" : "共力生态",
- "versionName" : "1.0.22",
+ "versionName" : "1.0.27",
"versionCode" : 100,
"transformPx" : false,
/* 5+App特有相关 */
diff --git a/pages.json b/pages.json
index 3cf12d4..79c4fd3 100644
--- a/pages.json
+++ b/pages.json
@@ -1,85 +1,85 @@
{
- "pages": [{
- "path": "pages/auth/auth",
- "name": "Auth",
- "style": {
- "navigationBarTitleText": "登录",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/auth/role",
- "name": "AuthRole",
- "style": {
- "navigationBarTitleText": "角色创建",
- "navigationBarBackgroundColor": "#FFF",
- "app-plus": {
- "titleNView": {
- "buttons": [{
- "text": "退出登录",
- "fontSize": "14",
- "width": "80px",
- "color": "#34CE98"
- }]
- }
- }
- }
- }, {
- "path": "pages/life/life",
- "name": "Life",
- "style": {
- "navigationBarTitleText": "共力人生",
- "navigationStyle": "custom",
- "app-plus": {
- "titleNView": {
- "type": "transparent"
- }
- }
- }
- },
- {
- "path": "pages/store/index",
- "name": "Store",
- "style": {
- "navigationBarTitleText": "DT商城",
- "enablePullDownRefresh": true,
- "app-plus": {
- "titleNView": {
- "backgroundColor": "#fff",
- "buttons": [{
- "float": "right",
- "text": "\ue603",
- "fontSrc": "/static/iconfont.ttf",
- "color": "#000",
- "fontSize": "20px"
- }]
- }
- }
- }
- },
- {
- "path": "pages/user/index",
- "name": "User",
- "style": {
- "navigationBarTitleText": "我的",
- "navigationBarTextStyle": "white",
- "app-plus": {
- "titleNView": {
- "backgroundColor": "#34CE98",
- "type": "transparent"
- }
- }
- }
- },
- {
- "path": "pages/setting/setting",
- "name": "Setting",
- "style": {
- "navigationBarTitleText": "设置中心",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
+ "pages": [{
+ "path": "pages/auth/auth",
+ "name": "Auth",
+ "style": {
+ "navigationBarTitleText": "登录",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/auth/role",
+ "name": "AuthRole",
+ "style": {
+ "navigationBarTitleText": "角色创建",
+ "navigationBarBackgroundColor": "#FFF",
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "退出登录",
+ "fontSize": "14",
+ "width": "80px",
+ "color": "#34CE98"
+ }]
+ }
+ }
+ }
+ }, {
+ "path": "pages/life/life",
+ "name": "Life",
+ "style": {
+ "navigationBarTitleText": "共力人生",
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": {
+ "type": "transparent"
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/store/index",
+ "name": "Store",
+ "style": {
+ "navigationBarTitleText": "DT商城",
+ "enablePullDownRefresh": true,
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#fff",
+ "buttons": [{
+ "float": "right",
+ "text": "\ue603",
+ "fontSrc": "/static/iconfont.ttf",
+ "color": "#000",
+ "fontSize": "20px"
+ }]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/user/index",
+ "name": "User",
+ "style": {
+ "navigationBarTitleText": "我的",
+ "navigationBarTextStyle": "white",
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#34CE98",
+ "type": "transparent"
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/setting/setting",
+ "name": "Setting",
+ "style": {
+ "navigationBarTitleText": "设置中心",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
{
"path": "pages/store/goods",
"name": "StoreGoods",
@@ -294,7 +294,7 @@
}, {
"path": "pages/vip/agreement",
"style": {
- "navigationBarTitleText": "共力会员协议",
+ "navigationBarTitleText": "共力会员协议",
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
@@ -392,10 +392,20 @@
}, {
"path": "pages/vip/growth",
"style": {
- "navigationBarTitleText": "成长体系",
+ "navigationBarTitleText": "成长体系",
"navigationBarBackgroundColor": "#FFFFFF",
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/supplier/supplier",
+ "name": "Supplier",
+ "style": {
+ "navigationBarTitleText": "供应商入驻",
+ "enablePullDownRefresh": false,
+ "backgroundColorTop": "#201f48",
+ "navigationBarBackgroundColor": "#201f48",
+ "navigationBarTextStyle": "white"
+ }
}
],
"tabBar": {
diff --git a/pages/auth/auth.vue b/pages/auth/auth.vue
index 6437a3c..af96f97 100644
--- a/pages/auth/auth.vue
+++ b/pages/auth/auth.vue
@@ -14,7 +14,7 @@
-
+
@@ -49,7 +49,11 @@
},
methods: {
// 获取验证码
- getPhoneCode() {
+ getPhoneCode() {
+ uni.showLoading({
+ title : '加载中...',
+ mask :true
+ })
let outTime;
let smsTime = 60;
getSms({
diff --git a/pages/feedback/feedback.vue b/pages/feedback/feedback.vue
index 7867a56..fb262ad 100644
--- a/pages/feedback/feedback.vue
+++ b/pages/feedback/feedback.vue
@@ -12,7 +12,19 @@
- 问题说明*
+ 上传应用截图({{feedbackImg.length}}/8)
+ 上传出现问题的应用图片；长按图片可删除
+
+
+
+
+
+
+
+
+
+
+ 问题说明
请对您所遇到的问题进行尽可能详细的描述
@@ -32,13 +44,15 @@
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 8c4509b..e51833e 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -103,7 +103,6 @@
state: this.tabs[this.index].type,
page: this.page
}).then(res => {
- console.log(res);
if (res.page.current === 1) {
this.array = []
}
diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue
new file mode 100644
index 0000000..e531e5a
--- /dev/null
+++ b/pages/supplier/supplier.vue
@@ -0,0 +1,92 @@
+
+
+
+
+ 入驻共力生态
+ 共商 | 共建 | 共享 | 共赢
+ 邀请码：{{invite}}
+ 前往电脑使用浏览器打开申请入驻
+ 复制链接
+
+
+
+
+
+
+
+
diff --git a/pages/team/index.vue b/pages/team/index.vue
index ae27c5c..f3498f4 100644
--- a/pages/team/index.vue
+++ b/pages/team/index.vue
@@ -39,11 +39,11 @@
-
+
{{item.nickname}}
{{item.username}}
- {{item.created_at}}
+ {{tabsType === 'supplier' ? item.performance : item.created_at}}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index a08d644..baa3814 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -21,11 +21,10 @@
-
-
-
+
+
{{serial === '' ? '共力会员': 'NO:' + serial}}
@@ -34,18 +33,21 @@
{{userInfo.isOpenVip ? '开通': '续费'}}
-
-
+
-
+
共力分
{{account.glz}}
-
+
DT积分
{{account.dt}}
-
+
+
+
+
+
@@ -73,13 +75,25 @@
退换货
-
+
+
+
+
+ 共力分钱包
+
+
+
+
+ DT积分钱包
+
+
+
+
+ 导出助记词
+
+
+
-
-
- 导出助记词
-
-
地址管理
@@ -89,7 +103,12 @@
分享邀请
-
+
+
+
+ 供应商入驻
+
+
@@ -130,7 +149,7 @@
+ placeholder="输入支付密码" />
@@ -178,10 +197,14 @@
serial : '',
hasPassword : false,
showIv : false,
- iv : ''
+ iv : '',
+ // 是否显示钱包
+ isWallet : false,
+ walletNum : 0
};
- },
- onShow() {
+ },
+ onShow() {
+ // if(uni.getStorageSync('isWalleNum') != '' && uni.getStorageSync('isWalleNum') === 1) this.isWallet = true
this.getInfo();
},
methods: {
@@ -191,7 +214,8 @@
info().then(res => {
uni.setNavigationBarTitle({
title: res.nickname
- });
+ });
+ this.order = res.order
this.cardText = res.identity_array
this.userInfo = {
nickname : res.nickname,
@@ -258,6 +282,7 @@
// 退出登录
logOut() {
uni.removeStorageSync('isnew')
+ // uni.removeStorageSync('isWalleNum')
this.$store.commit('setToken', '');
this.$Router.replaceAll({name: 'Auth'})
},
@@ -275,6 +300,25 @@
}
});
},
+ // 连续点击
+ onNum(){
+ if(this.isWallet){
+ return
+ }
+ this.walletNum++
+ this.$refs.onTimeCount.reset();
+ this.$refs.onTimeCount.start();
+ if(this.walletNum >= 7){
+ uni.showToast({
+ title: '已开启共力钱包',
+ icon : 'none'
+ })
+ this.isWallet = true
+ this.walletNum = 0
+ this.$refs.onTimeCount.pause();
+ // uni.setStorageSync('isWalleNum', 1)
+ }
+ },
// 复制助记词
copyWord() {
uni.setClipboardData({
@@ -289,6 +333,7 @@
}
});
},
+ // 检查版本更新
updateApp(){
uni.showLoading({
title: '检查更新'
@@ -358,7 +403,11 @@
};
-