diff --git a/package.json b/package.json index 88bf604..00493b9 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,8 @@ "vant": "^2.10.3", "vue": "^2.6.10", "vue-router": "^3.0.3", - "vuex": "^3.0.1" + "vuex": "^3.0.1", + "moment": "^2.29.1" }, "devDependencies": { "@vue/cli-plugin-babel": "^3.10.0", diff --git a/src/assets/images/calendar.png b/src/assets/images/calendar.png new file mode 100644 index 0000000..b46345a Binary files /dev/null and b/src/assets/images/calendar.png differ diff --git a/src/assets/images/gou.png b/src/assets/images/gou.png new file mode 100644 index 0000000..8296504 Binary files /dev/null and b/src/assets/images/gou.png differ diff --git a/src/assets/images/search.png b/src/assets/images/search.png new file mode 100644 index 0000000..512d107 Binary files /dev/null and b/src/assets/images/search.png differ diff --git a/src/routers/index.js b/src/routers/index.js index 6bc4464..f7340ac 100644 --- a/src/routers/index.js +++ b/src/routers/index.js @@ -5,6 +5,21 @@ import Vue from 'vue'; import Router from 'vue-router'; +import marketingClose from "@/views/navigation/accounts/marketingClose" +import memberCancel from "@/views/navigation/memberCancel" +import memberGathering from "@/views/navigation/consume/memberGathering" +import memberIntegral from "@/views/navigation/integral/memberIntegral" +import memberTicket from "@/views/navigation/ticket/memberTicket" +import ticketDetails from "@/views/navigation/ticket/ticketDetails" +import chPhone from "@/views/navigation/ticket/chPhone" +import details from "@/views/navigation/details" +import commodity from "@/views/navigation/commodity" +import accomplish from "@/views/navigation/accomplish" +import billing from "@/views/navigation/billing" +import todayConsume from "@/views/navigation/consume/todayConsume" +import current from "@/views/navigation/consume/current" +import integralParticulars from "@/views/navigation/integral/integralParticulars" +import userMessage from "@/views/navigation/integral/userMessage" const Login = () => import(/* webpackChunkName: "login" */ '@/views/login'); const Home = () => import(/* webpackChunkName: "home" */ '@/views/home'); @@ -80,6 +95,96 @@ const routes = [ title: '登陆信息' } }, + { + path: '/marketingClose',//营销结算 + name: 'marketingClose', + component:marketingClose + + }, + { + path: '/memberCancel',//会员核销 + name: 'memberCancel', + component:memberCancel + + }, + { + path: '/memberGathering',//消费卡收款 + name: 'memberGathering', + component:memberGathering + + }, + { + path: '/memberIntegral',//会员积分integralParticulars + name: 'memberIntegral', + component:memberIntegral + + }, + { + path: '/integralParticulars',//会员积分 - 查询详情页 + name: 'integralParticulars', + component:integralParticulars + + }, + { + path: '/userMessage',//会员积分 - 查询详情页 -会员详情 + name: 'userMessage', + component:userMessage + + }, + { + path: '/memberTicket',//会员赠券 + name: 'memberTicket', + component:memberTicket + + }, + { + path: '/chPhone',//会员赠券 - 详情页 + name: 'chPhone', + component:chPhone + + }, + { + path: '/ticketDetails',//会员赠券 - 详情页 + name: 'ticketDetails', + component:ticketDetails + + }, + { + path: '/details',//手动核销 子页面 + name: 'details', + component:details + + }, + { + path: '/commodity',//核销 详情页 + name: 'commodity', + component:commodity + + }, + { + path: '/accomplish',//核销 完成返回页面 + name: 'accomplish', + component:accomplish + + }, + { + path: '/billing',//核销 账单 + name: 'billing', + component:billing + + }, + { + path: '/todayConsume',//消费卡收款 -当日记录 + name: 'todayConsume', + component:todayConsume + + }, + { + path: '/current',//消费卡收款 -当日记录 + name: 'current', + component:current + + }, ]; diff --git a/src/services/apiUrl.js b/src/services/apiUrl.js index 73b8fe9..d3b5e4a 100644 --- a/src/services/apiUrl.js +++ b/src/services/apiUrl.js @@ -8,15 +8,15 @@ export const apiUrl = { //交易,核销,收银的echarts图表数据 getTabletListOrder: '/api/wxDateAmountRecord/listOrder', getTabletListVerify: '/api/wxDateAmountRecord/listVerified', - getMicroPayAmountOnDate:'/api/wxDateAmountRecord/listMicropay', + getMicroPayAmountOnDate: '/api/wxDateAmountRecord/listMicropay', // 检查用户是否有权限修改收款账户 permitModifiy: "/api/merchant/permitModifiy", // B端用户详情 userDetail: '/api/user/detail', //获取积分操作记录 - getCreditList:"/api/credit/list", + getCreditList: "/api/credit/list", //获取会员可赠送的券列表 - wxMerchantcouponSend:"/api/couponSend/list", + wxMerchantcouponSend: "/api/couponSend/list", // 商户注券记录 wxMerchantcouponStory: "/api/couponSend/actionLog", @@ -25,5 +25,11 @@ export const apiUrl = { // mock qryPageConfig: '/test/pageConfig', - msg: '/index/securityPolicy' + msg: '/index/securityPolicy', + // 查询券详情 + ticketDetails: '/api/couponOrder/detail', + // 券核销 + cancel: "/api/couponOrder/verify", + // 已被核销的券包 + couponOrderListVerified: '/api/couponOrder/listVerified', } diff --git a/src/services/request.js b/src/services/request.js index 652089e..4b97fff 100644 --- a/src/services/request.js +++ b/src/services/request.js @@ -32,7 +32,7 @@ const instance = axios.create({ instance.interceptors.request.use( function(config) { config.headers.bid = store.state.token; - config.headers.token = store.state.token; + // config.headers.token = store.state.token; // 在发送请求之前做处理... config.headers = Object.assign( config.method === "post" diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 9559201..7231b6a 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -8,7 +8,16 @@

富茂服务商

- +
+
+
+
+ +
+ {{item.text}} +
+
+
@@ -67,6 +76,38 @@ export default { showJiaoyi: true, showHexiao: true, showShouyin: true, + classIfyList: [ + { + text: "会员核销", + icon: "iconfont icon-hexiao", + id: 0, + path:"/memberCancel" + }, + { + text: "消费卡收款", + icon: "iconfont icon-shouye1", + id: 1, + path:"/memberGathering" + }, + { + text: "会员积分", + icon: "iconfont icon-jifen", + id: 4, + path:"/memberIntegral" + }, + { + text: "会员赠券", + icon: "iconfont icon-quan", + id: 5, + path:"/memberTicket" + }, + { + text: "营销结算", + icon: "iconfont icon-jiesuan", + id: 6, + path:"/marketingClose" + }, + ], }; }, mounted() { @@ -76,6 +117,9 @@ export default { }, methods: { + toWriteoff(path){ + this.$router.push(path) + }, /** * 交易记录 */ @@ -358,6 +402,29 @@ export default { background: #f8f8fa; margin-bottom: 1.6rem; } +.writeOff { + width: 100%; + margin-top: 0.1rem; +} +.classification { + position: relative; + width: 93%; + height: 3.7rem; + background: #fff; + border-radius: .15rem; + margin: .3rem auto; + z-index: 1000; + width: 9.5rem; + margin: 0 auto; + display: flex; + flex-wrap: wrap; + +} +.category{ + border: 0.01rem #eee solid; + padding: 0.2rem; + width: 25%; +} .header-wrap { width: 100%; height: 4rem; @@ -444,4 +511,5 @@ export default { height: 4rem; margin-top: .2rem; } + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index f191590..2cdceb6 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -57,14 +57,14 @@ export default { data: { phone: val.userName, password: val.password, - appId: "wxa2c60cdeef4ec602", + appId: "wx9ff823abeef23b94", // latitude: 34.51685, // longitude: 110.89456, } }).then(res => { console.log(res) if (res.code === 200) { - // this.doLogin(res) + this.doLogin(res) this.$router.push({ path: '/home' }) diff --git a/src/views/navigation/accomplish.vue b/src/views/navigation/accomplish.vue new file mode 100644 index 0000000..1ea8f89 --- /dev/null +++ b/src/views/navigation/accomplish.vue @@ -0,0 +1,63 @@ + + + + + \ No newline at end of file diff --git a/src/views/navigation/accounts/marketingClose.vue b/src/views/navigation/accounts/marketingClose.vue new file mode 100644 index 0000000..9b8f245 --- /dev/null +++ b/src/views/navigation/accounts/marketingClose.vue @@ -0,0 +1,329 @@ + + + \ No newline at end of file diff --git a/src/views/navigation/billing.vue b/src/views/navigation/billing.vue new file mode 100644 index 0000000..5b8565c --- /dev/null +++ b/src/views/navigation/billing.vue @@ -0,0 +1,164 @@ + + + + + \ No newline at end of file diff --git a/src/views/navigation/commodity.vue b/src/views/navigation/commodity.vue new file mode 100644 index 0000000..89d9407 --- /dev/null +++ b/src/views/navigation/commodity.vue @@ -0,0 +1,186 @@ + + + + + \ No newline at end of file diff --git a/src/views/navigation/consume/current.vue b/src/views/navigation/consume/current.vue new file mode 100644 index 0000000..ce6a1b4 --- /dev/null +++ b/src/views/navigation/consume/current.vue @@ -0,0 +1,213 @@ + + + \ No newline at end of file diff --git a/src/views/navigation/consume/memberGathering.vue b/src/views/navigation/consume/memberGathering.vue new file mode 100644 index 0000000..1bb61e8 --- /dev/null +++ b/src/views/navigation/consume/memberGathering.vue @@ -0,0 +1,58 @@ + + + + \ No newline at end of file diff --git a/src/views/navigation/consume/todayConsume.vue b/src/views/navigation/consume/todayConsume.vue new file mode 100644 index 0000000..3005467 --- /dev/null +++ b/src/views/navigation/consume/todayConsume.vue @@ -0,0 +1,122 @@ + + + + \ No newline at end of file diff --git a/src/views/navigation/details.vue b/src/views/navigation/details.vue new file mode 100644 index 0000000..6aff7af --- /dev/null +++ b/src/views/navigation/details.vue @@ -0,0 +1,124 @@ + + + + + + + diff --git a/src/views/navigation/integral/integralParticulars.vue b/src/views/navigation/integral/integralParticulars.vue new file mode 100644 index 0000000..a95be25 --- /dev/null +++ b/src/views/navigation/integral/integralParticulars.vue @@ -0,0 +1,74 @@ + + + \ No newline at end of file diff --git a/src/views/navigation/integral/memberIntegral.vue b/src/views/navigation/integral/memberIntegral.vue new file mode 100644 index 0000000..3f39f1a --- /dev/null +++ b/src/views/navigation/integral/memberIntegral.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/src/views/navigation/integral/userMessage.vue b/src/views/navigation/integral/userMessage.vue new file mode 100644 index 0000000..ad6c4ef --- /dev/null +++ b/src/views/navigation/integral/userMessage.vue @@ -0,0 +1,139 @@ + + + + \ No newline at end of file diff --git a/src/views/navigation/memberCancel.vue b/src/views/navigation/memberCancel.vue new file mode 100644 index 0000000..9c936f5 --- /dev/null +++ b/src/views/navigation/memberCancel.vue @@ -0,0 +1,31 @@ + + + \ No newline at end of file diff --git a/src/views/navigation/memberPublic.vue b/src/views/navigation/memberPublic.vue new file mode 100644 index 0000000..4520f6e --- /dev/null +++ b/src/views/navigation/memberPublic.vue @@ -0,0 +1,58 @@ + + + + + + \ No newline at end of file diff --git a/src/views/navigation/ticket/chPhone.vue b/src/views/navigation/ticket/chPhone.vue new file mode 100644 index 0000000..d662091 --- /dev/null +++ b/src/views/navigation/ticket/chPhone.vue @@ -0,0 +1,74 @@ + + + \ No newline at end of file diff --git a/src/views/navigation/ticket/memberTicket.vue b/src/views/navigation/ticket/memberTicket.vue new file mode 100644 index 0000000..91dcbc4 --- /dev/null +++ b/src/views/navigation/ticket/memberTicket.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/src/views/navigation/ticket/ticketDetails.vue b/src/views/navigation/ticket/ticketDetails.vue new file mode 100644 index 0000000..d8e96f1 --- /dev/null +++ b/src/views/navigation/ticket/ticketDetails.vue @@ -0,0 +1,226 @@ + + + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index aa09f71..1e97682 100644 --- a/vue.config.js +++ b/vue.config.js @@ -20,7 +20,7 @@ module.exports = { } }, '/fumao': { - target: 'https://b.malls.iformall.com/B', + target: 'https://btest.malls.iformall.com/B', changeOrigin: true, pathRewrite: { '^/fumao': ''