From b7097b54c2d1dc22c9f6de7a9b7fa6ad99e2d0b2 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 16 Sep 2020 18:32:17 +0800 Subject: [PATCH] add API --- README.md | 5 +- package-lock.json | 3 +- package.json | 6 +- src/App.vue | 3 + src/components/integral_order/integral_order.vue | 132 +++++++++++++++++ .../membership_order/membership_order.vue | 132 +++++++++++++++++ src/components/order/integral/integral.vue | 132 ----------------- src/components/order/membership/membership.vue | 132 ----------------- src/components/order/reservation/reservation.vue | 151 -------------------- .../reservation_order/reservation_order.vue | 151 ++++++++++++++++++++ src/js/api.js | 10 +- src/js/server.js | 8 +- src/main.js | 4 +- src/pages.json | 6 + src/pages/admin_bind/admin_bind.vue | 156 +++++++++++++++++++++ src/pages/index/index.vue | 140 +++++++++++++++--- src/pages/merchant_info/merchant_info.vue | 36 ++++- src/pages/order_list/order_list.vue | 17 ++- src/pages/store_list/store_list.vue | 61 ++++++-- src/pages/write_off/list/list.vue | 13 +- src/store/actions.js | 5 + src/store/index.js | 16 +++ src/store/mutations.js | 10 ++ src/utils/components.js | 12 -- src/utils/util.js | 14 +- 25 files changed, 870 insertions(+), 485 deletions(-) create mode 100644 src/components/integral_order/integral_order.vue create mode 100644 src/components/membership_order/membership_order.vue delete mode 100644 src/components/order/integral/integral.vue delete mode 100644 src/components/order/membership/membership.vue delete mode 100644 src/components/order/reservation/reservation.vue create mode 100644 src/components/reservation_order/reservation_order.vue create mode 100644 src/pages/admin_bind/admin_bind.vue create mode 100644 src/store/actions.js create mode 100644 src/store/index.js create mode 100644 src/store/mutations.js delete mode 100644 src/utils/components.js diff --git a/README.md b/README.md index c1b9019..baff557 100644 --- a/README.md +++ b/README.md @@ -36,4 +36,7 @@ npm run build:mp-weixin padding-bottom: 0; padding-bottom: calc( 0 + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */ padding-bottom: calc( 0 + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ -``` \ No newline at end of file +``` + +### [蓝湖](https://lanhuapp.com/web/#/item/project/board?pid=9ab56cc5-0b3b-4a9c-8cd0-0cf57751010a) + diff --git a/package-lock.json b/package-lock.json index 3d3b94f..eb835cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14095,7 +14095,8 @@ "vuex": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz", - "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw==" + "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw==", + "dev": true }, "w3c-hr-time": { "version": "1.0.2", diff --git a/package.json b/package.json index 5a3a739..056f716 100644 --- a/package.json +++ b/package.json @@ -59,8 +59,7 @@ "core-js": "^3.6.5", "flyio": "^0.6.2", "regenerator-runtime": "^0.12.1", - "vue": "^2.6.11", - "vuex": "^3.2.0" + "vue": "^2.6.11" }, "devDependencies": { "@dcloudio/types": "*", @@ -83,7 +82,8 @@ "node-sass": "^4.14.1", "postcss-comment": "^2.0.0", "sass-loader": "^10.0.2", - "vue-template-compiler": "^2.6.11" + "vue-template-compiler": "^2.6.11", + "vuex": "^3.5.1" }, "browserslist": [ "Android >= 4", diff --git a/src/App.vue b/src/App.vue index da83888..a5f3b49 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,6 +6,9 @@ this.updateManager(); }, methods: { + isLogin(){ + return !!uni.getStorageSync('token'); + }, updateManager(){ const updateManager = uni.getUpdateManager(); updateManager.onCheckForUpdate(res=>console.log('请求完新版本信息的回调-->',res.hasUpdate)); diff --git a/src/components/integral_order/integral_order.vue b/src/components/integral_order/integral_order.vue new file mode 100644 index 0000000..a49dd96 --- /dev/null +++ b/src/components/integral_order/integral_order.vue @@ -0,0 +1,132 @@ + + + + + \ No newline at end of file diff --git a/src/components/membership_order/membership_order.vue b/src/components/membership_order/membership_order.vue new file mode 100644 index 0000000..7b44149 --- /dev/null +++ b/src/components/membership_order/membership_order.vue @@ -0,0 +1,132 @@ + + + + + \ No newline at end of file diff --git a/src/components/order/integral/integral.vue b/src/components/order/integral/integral.vue deleted file mode 100644 index eef6bf7..0000000 --- a/src/components/order/integral/integral.vue +++ /dev/null @@ -1,132 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/order/membership/membership.vue b/src/components/order/membership/membership.vue deleted file mode 100644 index a4ec66b..0000000 --- a/src/components/order/membership/membership.vue +++ /dev/null @@ -1,132 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/order/reservation/reservation.vue b/src/components/order/reservation/reservation.vue deleted file mode 100644 index 48db55b..0000000 --- a/src/components/order/reservation/reservation.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/reservation_order/reservation_order.vue b/src/components/reservation_order/reservation_order.vue new file mode 100644 index 0000000..131bb34 --- /dev/null +++ b/src/components/reservation_order/reservation_order.vue @@ -0,0 +1,151 @@ + + + + + \ No newline at end of file diff --git a/src/js/api.js b/src/js/api.js index 90847cc..249ae44 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,8 +1,14 @@ -export const ORIGIN = ``; // 正式 - +export const ORIGIN = `http://testmanager.ouxuanzhineng.cn`; // 测试 export const API = { wechatMiniAppLoginAndSync:`${ORIGIN}/user/wechatMiniAppLoginAndSync`, // 小程序授权 + brandInfo:`${ORIGIN}/stadium/brand/get`, // 品牌信息 + assistantAuth:`${ORIGIN}/assistant/auth`, // 授权绑定 - 获取用户信息 + calc:`${ORIGIN}/admin/assistant/calc`, // 首页 统计页面 + stadiumList:`${ORIGIN}/stadium/list`, // 店铺列表 + stadiumDetail:`${ORIGIN}/stadium/detail`, // A店铺管理-店铺列表-店铺详情 + + } diff --git a/src/js/server.js b/src/js/server.js index e915940..3410a95 100644 --- a/src/js/server.js +++ b/src/js/server.js @@ -5,11 +5,9 @@ const islog = false export class Server { request(url,data,method,header,isDefaultGet,failMsg){ return new Promise(async (rs,rj)=>{ - const _store = vm.$store; - - let storeInfo = _store.state.storeInfo || null; - - if(storeInfo)data['brand_id'] = storeInfo.brand_id; + // const _store = vm.$store; + // let storeInfo = _store.state.storeInfo || null; + // if(storeInfo)data['brand_id'] = storeInfo.brand_id; const _token = uni.getStorageSync('token') || ''; if(_token)data['token'] = _token; diff --git a/src/main.js b/src/main.js index 7f88dd0..38f2407 100644 --- a/src/main.js +++ b/src/main.js @@ -1,11 +1,13 @@ import Vue from 'vue' import App from './App' +import store from './store/index.js'; Vue.config.productionTip = false App.mpType = 'app' const app = new Vue({ - ...App + ...App, + store }) app.$mount() diff --git a/src/pages.json b/src/pages.json index 1e2e4d2..4fcc9bb 100644 --- a/src/pages.json +++ b/src/pages.json @@ -6,6 +6,12 @@ } }, { + "path": "pages/admin_bind/admin_bind", + "style": { + "navigationBarTitleText": "扫码绑定" + } + }, + { "path": "pages/turnover/turnover", "style": { "navigationBarTitleText": "营业额" diff --git a/src/pages/admin_bind/admin_bind.vue b/src/pages/admin_bind/admin_bind.vue new file mode 100644 index 0000000..fddeee8 --- /dev/null +++ b/src/pages/admin_bind/admin_bind.vue @@ -0,0 +1,156 @@ + + + + + \ No newline at end of file diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 3761446..b602457 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -2,21 +2,21 @@ - - 广州欧轩智能场馆(共6家) + + {{indexData.brand_name || '-'}}(共{{indexData.stadium_num || '0'}}家) 点击登陆 今日总收入 - ¥0.00 + {{isLogin?'¥':''}}{{isLogin?(indexData.amount || '0'):'***'}} 收款笔数 - 10 + {{isLogin?(indexData.in_count || '0'):'**'}} 收款笔数 - 10 + {{isLogin?(indexData.out_count || '0'):'**'}} @@ -28,12 +28,12 @@ 消息中心 - 99 + {{indexData.message_count || '0'}} - + {{e.name}} @@ -45,8 +45,14 @@ 您的信息和数据将受到保护 - 取消 - 授权并登录 + + @@ -54,7 +60,10 @@ @@ -340,7 +434,7 @@ import util from '../../utils/util'; } .iam-btns{ @include centerFlex(center); - >view{ + >button{ margin: 0 20upx; width: 240upx; height: 92upx; @@ -350,7 +444,7 @@ import util from '../../utils/util'; border: 2upx solid $themeColor; font-size: 32upx; color: $themeColor; - &+view{ + &+button{ background-color: $themeColor; color: #fff; } diff --git a/src/pages/merchant_info/merchant_info.vue b/src/pages/merchant_info/merchant_info.vue index b10dba4..a2b4032 100644 --- a/src/pages/merchant_info/merchant_info.vue +++ b/src/pages/merchant_info/merchant_info.vue @@ -1,31 +1,53 @@