From dcf54a326a52f543b372a39abc307533beae59c1 Mon Sep 17 00:00:00 2001 From: liugongyu <290219706@qq.com> Date: Tue, 21 Dec 2021 09:42:36 +0800 Subject: [PATCH] 扬名微信公众号 --- build/webpack.base.conf.js | 8 ++++++-- package.json | 8 ++++---- src/api/invoice/invoice.js | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/assets/images/parkInvoice/parkInvoiceNo.png | Bin 0 -> 2330 bytes src/main.js | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/router/index.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/utils/common.js | 3 +++ src/utils/request.js | 4 ++-- src/utils/utils.js | 32 ++++++++++++++++++++++++++++++++ src/views/eInvoice/common/fill.vue | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/eInvoice/eInvoiceWrap.vue | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/views/eInvoice/invoiceOpt/checkEdit.vue | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/eInvoice/invoiceOpt/invoiceOpt.vue | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/eInvoice/invoiceRecord/exchange.vue | 38 ++++++++++++++++++++++++++++++++++++++ src/views/eInvoice/invoiceRecord/invoiceDetail.vue | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/views/eInvoice/invoiceRecord/invoiceRecord.vue | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/eInvoice/parkInvoice/parkInvoice.vue | 362 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/parkPay/parkRecord.vue | 6 +++--- 18 files changed, 1333 insertions(+), 11 deletions(-) create mode 100644 src/api/invoice/invoice.js create mode 100644 src/assets/images/parkInvoice/parkInvoiceNo.png create mode 100644 src/views/eInvoice/common/fill.vue create mode 100644 src/views/eInvoice/eInvoiceWrap.vue create mode 100644 src/views/eInvoice/invoiceOpt/checkEdit.vue create mode 100644 src/views/eInvoice/invoiceOpt/invoiceOpt.vue create mode 100644 src/views/eInvoice/invoiceRecord/exchange.vue create mode 100644 src/views/eInvoice/invoiceRecord/invoiceDetail.vue create mode 100644 src/views/eInvoice/invoiceRecord/invoiceRecord.vue create mode 100644 src/views/eInvoice/parkInvoice/parkInvoice.vue diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index a07e683..3ea4825 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -8,9 +8,10 @@ function resolve (dir) { return path.join(__dirname, '..', dir) } +const vuxLoader = require('vux-loader') +// const webpackConfig = originalConfig // 原来的 module.exports 代码赋值给变量 webpackConfig - -module.exports = { +let webpackConfig = { context: path.resolve(__dirname, '../'), entry: { app: './src/main.js' @@ -80,3 +81,6 @@ module.exports = { child_process: 'empty' } } +module.exports = vuxLoader.merge(webpackConfig, { + plugins: ['vux-ui'] +}) diff --git a/package.json b/package.json index 0292579..3c832e6 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "less-loader": "^4.1.0", "mint-ui": "^2.2.13", "moment": "^2.29.1", - "node-sass": "^5.0.0", + "node-sass": "^4.14.1", "sass-loader": "^7.3.1", "vue": "^2.5.2", - "mint-ui": "^2.2.13", "vue-h5-popup": "^1.0.2", - "vue-router": "^3.0.1" + "vue-router": "^3.0.1", + "vux": "^2.11.1" }, "devDependencies": { "autoprefixer": "^7.1.2", @@ -42,7 +42,6 @@ "friendly-errors-webpack-plugin": "^1.6.1", "html-webpack-plugin": "^2.30.1", "node-notifier": "^5.1.2", - "node-sass": "^5.0.0", "optimize-css-assets-webpack-plugin": "^3.2.0", "ora": "^1.2.0", "portfinder": "^1.0.13", @@ -64,6 +63,7 @@ "vue-loader": "^13.3.0", "vue-style-loader": "^3.0.1", "vue-template-compiler": "^2.5.2", + "vux-loader": "^1.2.9", "webpack": "^3.4.1", "webpack-bundle-analyzer": "^2.9.0", "webpack-dev-server": "^2.9.7", diff --git a/src/api/invoice/invoice.js b/src/api/invoice/invoice.js new file mode 100644 index 0000000..3dccfff --- /dev/null +++ b/src/api/invoice/invoice.js @@ -0,0 +1,77 @@ +import request from '@/utils/request' + + +// 获取发票抬头 +export function queryCustInvoiceInfoList(params) { + return request({ + url: 'invoice/queryCustInvoiceInfoList', + method: 'post', + data: params + }) +} + +// 天下发票抬头 +export function insertCustInvoiceInfo(params) { + return request({ + url: 'invoice/insertCustInvoiceInfo', + method: 'post', + data: params + }) +} + + +// 编辑发票抬头 +export function updateCustInvoiceInfo(params) { + return request({ + url: 'invoice/updateCustInvoiceInfo', + method: 'post', + data: params + }) +} + +// 删除发票抬头 +export function deleteCustInvoiceInfoByID(params) { + return request({ + url: 'invoice/deleteCustInvoiceInfoByID', + method: 'post', + data: params + }) +} + +// 可发票记录 +export function queryRntPayOrderForInvoice(params) { + return request({ + url: 'invoice/queryRntPayOrderForInvoice', + method: 'post', + data: params + }) +} + +// 提交开票 +export function openTicketForCustInvoiceHisInfo(params) { + return request({ + url: 'invoice/openTicketForCustInvoiceHisInfo', + method: 'post', + data: params + }) +} + +// 开票历史 +export function queryCustInvoiceHistoryList(params) { + return request({ + url: 'invoice/queryCustInvoiceHistoryList', + method: 'post', + data: params + }) +} + + + + + + + + + + + diff --git a/src/assets/images/parkInvoice/parkInvoiceNo.png b/src/assets/images/parkInvoice/parkInvoiceNo.png new file mode 100644 index 0000000..d4e36df Binary files /dev/null and b/src/assets/images/parkInvoice/parkInvoiceNo.png differ diff --git a/src/main.js b/src/main.js index 6e7f757..56250d1 100644 --- a/src/main.js +++ b/src/main.js @@ -39,11 +39,61 @@ Vue.prototype.$moment = moment import utils from './utils/utils' // 工具类 Vue.prototype.$utils = utils +import common from './utils/common' // 公共 +Vue.prototype.$common = common + import Mint from 'mint-ui'; import 'mint-ui/lib/style.css' Vue.use(Mint); + +import { + XHeader, + XInput, + Group, + XButton, + Tabbar, + TabbarItem, + Tab, + TabItem, + Cell, + CellBox, + Checklist, + CheckIcon, + Swiper, + SwiperItem, + Divider, + TransferDom, + Confirm, + Toast +}from 'vux' + + +Vue.component('Toast', Toast) +Vue.component('Confirm', Confirm) +Vue.component('TransferDom', TransferDom) +Vue.component('Divider', Divider) +Vue.component('SwiperItem', SwiperItem) +Vue.component('Swiper', Swiper) +Vue.component('CheckIcon', CheckIcon) +Vue.component('Checklist', Checklist) +Vue.component('Group', Group) +Vue.component('Cell', Cell) +Vue.component('cell-box', CellBox) +Vue.component('x-header', XHeader); +Vue.component('x-input', XInput); +Vue.component('group', Group); +Vue.component('x-button', XButton); +Vue.component('tabbar', Tabbar); +Vue.component('tabbar-item', TabbarItem); +Vue.component('tab', Tab); +Vue.component('tab-item', TabItem); + + +import { ToastPlugin } from 'vux' +Vue.use(ToastPlugin) + import 'swiper/dist/css/swiper.min.css' // 轮播 import 'swiper/dist/js/swiper.min' diff --git a/src/router/index.js b/src/router/index.js index 41df084..852264e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -37,6 +37,72 @@ export default new Router({ component: () => import("@/views/parkPay/orderPay.vue") }, + // ---------------- 电子发票导航 + { + path: '/eInvoiceWrap', + name: 'eInvoiceWrap', + component: () => import("@/views/eInvoice/eInvoiceWrap.vue") + }, + + // ---------------- 停车发票 + { + path: '/parkInvoice', + name: 'parkInvoice', + component: () => import("@/views/eInvoice/parkInvoice/parkInvoice.vue") + }, + + // ---------------- 填写发票 + { + path: '/fill', + name: 'fill', + component: () => import("@/views/eInvoice/common/fill.vue") + }, + + // ---------------- 发票操作 + { + path: '/invoiceOpt', + name: 'invoiceOpt', + component: () => import("@/views/eInvoice/invoiceOpt/invoiceOpt.vue") + }, + + + // ---------------- 个人发票操作查看 + { + path: '/checkEdit', + name: 'checkEdit', + component: () => import("@/views/eInvoice/invoiceOpt/checkEdit.vue") + }, + + // ---------------- 个人发票历史记录 + { + path: '/invoiceRecord', + name: 'invoiceRecord', + component: () => import("@/views/eInvoice/invoiceRecord/invoiceRecord.vue") + }, + + // ---------------- 个人发票历史查看 + { + path: '/invoiceDetail', + name: 'invoiceDetail', + component: () => import("@/views/eInvoice/invoiceRecord/invoiceDetail.vue") + }, + + // ---------------- 电子包含交易 + { + path: '/exchange', + name: 'exchange', + component: () => import("@/views/eInvoice/invoiceRecord/exchange.vue") + }, + + + + + + + + + + // //---------------- 个人页面导航 // { // path: '/selfNav', diff --git a/src/utils/common.js b/src/utils/common.js index e69de29..dd07ab9 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -0,0 +1,3 @@ +export default { + +} diff --git a/src/utils/request.js b/src/utils/request.js index b6329a4..027b13f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,9 +3,9 @@ import axios from 'axios' // let _url = process.env.API_ROOT // axios.defaults.baseURL = process.env.API_ROOT const service = axios.create({ - // https://dev.renniting.cn/pay/ 赤峰测试 + // http://dev.renniting.cn/pay/ 赤峰测试 // http://pay.service.renniting.cn/ 赤峰 - baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url + baseURL: 'http://dev.renniting.cn/pay/', // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests timeout: 6000 // request timeout }) diff --git a/src/utils/utils.js b/src/utils/utils.js index 8368c4f..2d92522 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -36,6 +36,11 @@ export default { var youWant=d.getFullYear() + '-' + this.completedString(d.getMonth() + 1) + '-' + this.completedString(d.getDate()) ; return youWant }, + timestampTransformTime: function (timestamp) { + var d = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 + var youWant=d.getFullYear() + '/' + this.completedString(d.getMonth() + 1) + '/' + this.completedString(d.getDate()) ; + return youWant + }, completedString:function(s) { return s < 10 ? '0' + s : s }, @@ -182,5 +187,32 @@ export default { strmd5=strmd5.toUpperCase(); return strmd5; }, + parseParams: function (data) { + try { + var tempArr = []; + for (var i in data) { + var key = (i); + var value = encodeURIComponent(data[i]);//decodeURIComponent + tempArr.push(key + '=' + value); + } + var urlParamsStr = tempArr.join('&'); + return urlParamsStr; + } catch (err) { + return ''; + } + }, + + commonParams: function() { + let salt = this.myCommonSalt(32); + let reqData = { + app_id: this.myVarAppid, + deviceInfo: this.myDeviceInfo, + salt: salt, + sign_type: "md5", + token:'b4bbab7dd63140b5b66cc962496b34f7', + orgId: this.myOrgId + }; + return reqData + } } diff --git a/src/views/eInvoice/common/fill.vue b/src/views/eInvoice/common/fill.vue new file mode 100644 index 0000000..9e2fc16 --- /dev/null +++ b/src/views/eInvoice/common/fill.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/src/views/eInvoice/eInvoiceWrap.vue b/src/views/eInvoice/eInvoiceWrap.vue new file mode 100644 index 0000000..09b9299 --- /dev/null +++ b/src/views/eInvoice/eInvoiceWrap.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/views/eInvoice/invoiceOpt/checkEdit.vue b/src/views/eInvoice/invoiceOpt/checkEdit.vue new file mode 100644 index 0000000..7da1045 --- /dev/null +++ b/src/views/eInvoice/invoiceOpt/checkEdit.vue @@ -0,0 +1,195 @@ + + + + + diff --git a/src/views/eInvoice/invoiceOpt/invoiceOpt.vue b/src/views/eInvoice/invoiceOpt/invoiceOpt.vue new file mode 100644 index 0000000..b79e670 --- /dev/null +++ b/src/views/eInvoice/invoiceOpt/invoiceOpt.vue @@ -0,0 +1,192 @@ + + + + + diff --git a/src/views/eInvoice/invoiceRecord/exchange.vue b/src/views/eInvoice/invoiceRecord/exchange.vue new file mode 100644 index 0000000..c72e013 --- /dev/null +++ b/src/views/eInvoice/invoiceRecord/exchange.vue @@ -0,0 +1,38 @@ + + + + + diff --git a/src/views/eInvoice/invoiceRecord/invoiceDetail.vue b/src/views/eInvoice/invoiceRecord/invoiceDetail.vue new file mode 100644 index 0000000..7bd7122 --- /dev/null +++ b/src/views/eInvoice/invoiceRecord/invoiceDetail.vue @@ -0,0 +1,46 @@ + + + + + + diff --git a/src/views/eInvoice/invoiceRecord/invoiceRecord.vue b/src/views/eInvoice/invoiceRecord/invoiceRecord.vue new file mode 100644 index 0000000..ef5fb6f --- /dev/null +++ b/src/views/eInvoice/invoiceRecord/invoiceRecord.vue @@ -0,0 +1,63 @@ + + + + + + diff --git a/src/views/eInvoice/parkInvoice/parkInvoice.vue b/src/views/eInvoice/parkInvoice/parkInvoice.vue new file mode 100644 index 0000000..3bf5add --- /dev/null +++ b/src/views/eInvoice/parkInvoice/parkInvoice.vue @@ -0,0 +1,362 @@ + + + + + diff --git a/src/views/parkPay/parkRecord.vue b/src/views/parkPay/parkRecord.vue index 54b02d4..6e63caf 100644 --- a/src/views/parkPay/parkRecord.vue +++ b/src/views/parkPay/parkRecord.vue @@ -14,7 +14,7 @@
-

停车1小时内无需缴费，请申请离场。

+
    @@ -33,7 +33,7 @@

    停车时长：{{ $utils.dateFormat(i.parkDuration)}}

    ￥{{(i.unPayFee/100).toFixed(2)}}

    -

    申请离场

    +

    申请离场

    出场缴费

@@ -315,7 +315,7 @@ export default { } else { //$('.dialog-out').show() - this.$msgbox('提示', '停车15分钟内无需缴费，申请成功。') + this.$msgbox('提示', response.message) } }) -- libgit2 0.21.4