diff --git a/src/App.vue b/src/App.vue
index 5335f6f..541ee89 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,9 +3,8 @@
import util from './utils/util';
export default {
onLaunch: function() {
- // #ifndef H5
+ // this.$store.commit('setLoginState', { loginState: false });
this.updateManager();
- // #endif
},
methods: {
isLogin(){
diff --git a/src/components/period_select.vue b/src/components/period_select.vue
new file mode 100644
index 0000000..9220387
--- /dev/null
+++ b/src/components/period_select.vue
@@ -0,0 +1,138 @@
+
+
+
+ false">
+ 日期范围
+
+
+ 开始时间
+
+
+
+
+
+
+
+
+ 截止时间
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/js/api.js b/src/js/api.js
index 550179d..7762a45 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -167,5 +167,10 @@ API['party'] = {
bindingOpenId: `${ORIGIN}/assistant/bindingOpenId`, //改为小程序端绑定openid
}
+API['mine'] = {
+ userCurrent:`${ORIGIN}/user/current`, //获取账户信息, (不要传品牌id)
+ unbindAssistant:`${ORIGIN}/admin/user/unbindAssistant`, // 解绑退出
+}
+
export default { ORIGIN, API };
diff --git a/src/js/server.js b/src/js/server.js
index c671b75..dc191c7 100644
--- a/src/js/server.js
+++ b/src/js/server.js
@@ -1,5 +1,6 @@
import util from '../utils/util';
// import { app as vm } from '../main';
+import { app as vm } from '../main';
const islog = true;
@@ -27,6 +28,9 @@ export class Server {
method: method,
data: res,
})
+
+ handleUserExceptions({ res });
+
if(isDefaultGet){
if(failMsg == '')throw Error('默认回调,失败提示不能为空 key -> failMsg');
defaultGet({
@@ -70,6 +74,14 @@ export class Server {
reject({url,res,data});
}
}
+ // 用户信息异常
+ function handleUserExceptions({ res }){
+ if(res?.data?.code === 401&&res?.data?.message?.indexOf('用户') !== -1){
+ console.log('用户信息异常,请重新登录');
+ const _store = vm.$store;
+ _store.commit('setLoginState', { loginState: false });
+ }
+ }
}
get({url,data={},header={},isDefaultGet=true,failMsg=''}){
return this.request(url,data,'GET',header,isDefaultGet,failMsg);
diff --git a/src/main.js b/src/main.js
index 38f2407..049f478 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,8 +6,9 @@ Vue.config.productionTip = false
App.mpType = 'app'
-const app = new Vue({
+export const app = new Vue({
...App,
store
})
app.$mount()
+
diff --git a/src/manifest.json b/src/manifest.json
index d409cc9..7ac6737 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -76,7 +76,9 @@
"appid" : "wx7106e84614cf0060",
"setting" : {
"urlCheck" : false,
- "minified" : true
+ "minified" : true,
+ "ignoreDevUnusedFiles": false,
+ "ignoreUploadUnusedFiles": false
},
"usingComponents" : true,
"optimization": {
diff --git a/src/pages.json b/src/pages.json
index 6b6ba06..653a2a4 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,12 +1,47 @@
{
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-
{
"path": "pages/index/index",
"style": {
+ "componentPlaceholder": {
+ "bottom-logo": "view",
+ "authorization-login": "view"
+ }
+ }
+ },
+ {
+ "path": "pages/menu/second",
+ "style": {
+ "navigationBarTitleText": "推广营销",
+ "componentPlaceholder": {
+ "bottom-logo": "view"
+ }
+ }
+ },
+ {
+ "path": "pages/menu/third",
+ "style": {
+ "navigationBarTitleText": "商家服务",
+ "componentPlaceholder": {
+ "bottom-logo": "view"
+ }
}
},
{
+ "path": "pages/menu/forth",
+ "style": {
+ "navigationBarTitleText": "个人中心",
+ "componentPlaceholder": {
+ "mine-header": "view",
+ "bottom-logo": "view",
+ "line-tab": "view",
+ "authorization-login": "view",
+ "authorization-user": "view"
+ }
+ }
+ },
+
+ {
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "登录"
@@ -171,18 +206,6 @@
}
},
{
- "path": "pages/write_off/mall/list/list",
- "style": {
- "navigationBarTitleText": "商城订单核销"
- }
- },
- {
- "path": "pages/write_off/menu/menu",
- "style": {
- "navigationBarTitleText": "核销订单"
- }
- },
- {
"path": "pages/write_off/ym_card_gated/ym_card_gated",
"style": {
"navigationBarTitleText": "核销订单"
@@ -195,36 +218,12 @@
}
},
{
- "path": "pages/write_off/search_result/search_result",
- "style": {
- "navigationBarTitleText": "核销查询"
- }
- },
- {
- "path": "pages/write_off/operate/operate",
- "style": {
- "navigationBarTitleText": "核销订单"
- }
- },
- {
"path": "pages/write_off/confirm_order/confirm_order",
"style": {
"navigationBarTitleText": "核销订单"
}
},
{
- "path": "pages/write_off/null/null",
- "style": {
- "navigationBarTitleText": "确认订单信息"
- }
- },
- {
- "path": "pages/write_off/douyin/poi_list",
- "style": {
- "navigationBarTitleText": "核销订单"
- }
- },
- {
"path": "pages/employee/review_list/review_list",
"style": {
"navigationBarTitleText": "员工管理"
@@ -759,9 +758,15 @@
}
},
{
+ "path": "pages/index/recharge_record",
+ "style" : {
+ "navigationBarTitleText": "充值记录"
+ }
+ },
+ {
"path": "pages/douyin_withdraw/index",
"style" : {
- "navigationBarTitleText": "抖音提现"
+ "navigationBarTitleText": "平台提现"
}
},
{
@@ -895,10 +900,99 @@
"root": "subpackage/verification",
"pages": [
{
+ "path": "pages/null",
+ "style" : {
+ "navigationBarTitleText": "核销查询"
+ }
+ },
+ {
+ "path": "pages/record_search",
+ "style" : {
+ "navigationBarTitleText": "核销查询"
+ }
+ },
+ {
+ "path": "pages/index",
+ "style" : {
+ "navigationBarTitleText": "核销查询"
+ }
+ },
+ {
"path": "pages/site_people/index",
"style" : {
"navigationBarTitleText": "现场人数"
}
+ },
+ {
+ "path": "pages/record",
+ "style" : {
+ "navigationBarTitleText": "核销记录"
+ }
+ }
+ ]
+ },
+ {
+ "root": "subpackage/message",
+ "pages": [
+ {
+ "path": "pages/complaint/edit",
+ "style" : {
+ "navigationBarTitleText": "投诉建议"
+ }
+ },
+ {
+ "path": "pages/complaint/list",
+ "style" : {
+ "enablePullDownRefresh" : true,
+ "navigationBarTitleText": "投诉建议"
+ }
+ },
+ {
+ "path": "pages/complaint/detail",
+ "style" : {
+ "navigationBarTitleText": "投诉详情"
+ }
+ },
+ {
+ "path": "pages/work_order/list",
+ "style" : {
+ "enablePullDownRefresh" : true,
+ "navigationBarTitleText": "工单列表"
+ }
+ },
+ {
+ "path": "pages/work_order/detail",
+ "style" : {
+ "navigationBarTitleText": "工单详情"
+ }
+ },
+ {
+ "path": "pages/work_order/edit",
+ "style" : {
+ "navigationBarTitleText": "提交工单"
+ }
+ }
+ ]
+ },
+ {
+ "root": "subpackage/menu",
+ "pages": [
+ {
+ "path": "pages/index",
+ "style" : {
+ "navigationBarTitleText": ""
+ }
+ }
+ ]
+ },
+ {
+ "root": "subpackage/authorization",
+ "pages": [
+ {
+ "path": "pages/index",
+ "style" : {
+ "navigationBarTitleText": ""
+ }
}
]
},
@@ -955,5 +1049,36 @@
"navigationBarTitleText": "欧轩智能商家助手",
"navigationBarBackgroundColor": "#009874",
"backgroundColor": "#f2f2f7"
+ },
+ "tabBar": {
+ "color": "#B2B2B2",
+ "selectedColor": "#009874",
+ "backgroundColor": "#FFFFFF",
+ "list": [
+ {
+ "pagePath": "pages/index/index",
+ "text": "工作台",
+ "iconPath": "static/images/tab/tab_1.png",
+ "selectedIconPath": "static/images/tab/ta_1.png"
+ },
+ {
+ "pagePath": "pages/menu/second",
+ "text": "推广营销",
+ "iconPath": "static/images/tab/tab_2.png",
+ "selectedIconPath": "static/images/tab/ta_2.png"
+ },
+ {
+ "pagePath": "pages/menu/third",
+ "text": "商家服务",
+ "iconPath": "static/images/tab/tab_3.png",
+ "selectedIconPath": "static/images/tab/ta_3.png"
+ },
+ {
+ "pagePath": "pages/menu/forth",
+ "text": "我的",
+ "iconPath": "static/images/tab/tab_4.png",
+ "selectedIconPath": "static/images/tab/ta_4.png"
+ }
+ ]
}
}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index a4d1d78..dc4721c 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -2,22 +2,22 @@
-
diff --git a/src/subpackage/wallet/pages/index/modules/recharge_modal.vue b/src/subpackage/wallet/pages/index/modules/recharge_modal.vue
new file mode 100644
index 0000000..784cc5b
--- /dev/null
+++ b/src/subpackage/wallet/pages/index/modules/recharge_modal.vue
@@ -0,0 +1,82 @@
+
+
+
+
+ 钱包余额:
+ {{ balance || 0 }}元
+
+
+
+ 取消
+ 确认
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
index 807e312..7826478 100644
--- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -7,10 +7,10 @@
欧轩内部钱包账户余额
-
+
(用于购买服务使用)
@@ -18,7 +18,7 @@
¥
{{ balance }}
-
+ 充值
@@ -26,8 +26,9 @@
宝付提现
-
- 抖音提现
+
+
+ 平台提现
diff --git a/src/subpackage/wallet/pages/index/recharge_record.vue b/src/subpackage/wallet/pages/index/recharge_record.vue
new file mode 100644
index 0000000..d557240
--- /dev/null
+++ b/src/subpackage/wallet/pages/index/recharge_record.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+ {{ e.amount || 0 }}
+ {{ e.order_no || '-' }}
+ {{ e.pay_time || '-' }}
+ {{ e.pay_type || '-' }}
+ {{ e.trans_no || '-' }}
+
+ {{ e.optsourse || '-' }} ({{ e.optname }})
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/uni.scss b/src/uni.scss
index 7745bde..082358c 100644
--- a/src/uni.scss
+++ b/src/uni.scss
@@ -105,4 +105,16 @@ $mColor: #009874;
padding-bottom: $height;
padding-bottom: calc( $height + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
padding-bottom: calc( $height + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+}
+
+@mixin clearBtn{
+ margin: 0;
+ padding: 0;
+ line-height: 0;
+ background-color: transparent;
+ border-radius: 0;
+ &::after{
+ position: unset !important;
+ border: unset;
+ }
}
\ No newline at end of file
diff --git a/src/utils/util.js b/src/utils/util.js
index cb9c6d4..11d2ae1 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -80,7 +80,9 @@ export function showModal({
confirmColor='#009874',
success,
fail,
- complete
+ complete,
+ editable = false,
+ placeholderText = ''
}){
uni.showModal({
title,
@@ -91,7 +93,9 @@ export function showModal({
confirmText,
success,
fail,
- complete
+ complete,
+ editable,
+ placeholderText,
})
}
@@ -362,7 +366,7 @@ function isProfile(){
return !!uni.getUserProfile
}
-function changeLowerCase(str){
+export function changeLowerCase(str){
return str.toString().toLocaleLowerCase();
}
@@ -371,7 +375,7 @@ function changeLowerCase(str){
// 大数据量跨页/跨组件传参------$_once && $_emit
// 单次监听器
// 到文件src\js\once_name.js,进行命名,防止命名冲突导致错误监听
-function $_once(name, cb){
+export function $_once(name, cb){
uni.$once(name + '',function(data){
cb&&cb(data);
})
@@ -380,7 +384,7 @@ function $_once(name, cb){
}, 50)
}
// 促发单次监听
-function $_emit(name, data){
+export function $_emit(name, data){
uni.$once((name + '')+'1',function(){
uni.$emit(name + '', data);
})