Skip to content

W
wly-APP
Commit 2727ebc4 authored by chicheng's avatar chicheng
Browse files
Options

添加账票管理模块

parent fbe1daab
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 772 additions and 392 deletions
pages.json
View file @ 2727ebc4
......@@ -937,39 +937,6 @@
}
}
},
{
"path": "pages/account-inquiry/account-inquiry",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "账款查询",
"autoBackButton": true
},
"bounce": "none"
}
}
},
{
"path": "pages/marketsupportfee-select/marketsupportfee-select",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "市场支持费用查询",
"autoBackButton": true
},
"bounce": "none"
}
// "enablePullDownRefresh": true
}
},
{
"path": "pages/storage-list/storage-list",
"style": {
......@@ -1456,6 +1423,36 @@
}
}
}
},
{
"path": "pages/billing-invoice/invoice-query",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "账款查询",
"autoBackButton": true
}
}
}
},
{
"path": "pages/billing-invoice/market-support-query",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "市场支持费用查询",
"autoBackButton": true
}
}
}
}
],
"globalStyle": {
......
pages/billing-invoice/billing-invoice.nvue
View file @ 2727ebc4
......@@ -3,19 +3,17 @@
<view class="status_bar" :style="navHeight"></view>
<view class="listview">
<view class="cell-list">
<view class="cell-list-block" @click="goOrder('account-inquiry')">
<view class="cell-list-block" @click="goOrder('billing-invoice/invoice-query')">
<image class="icon-address" src="@/static/image/billing_inquiry@3x.png" mode="aspectFit"></image>
<view class="cell-list-block__content">
<text class="cell-list-block__title">账款查询</text>
<text class="cell-list-block__desc">Account inquiry</text>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
<view class="cell-list-block" @click="goOrder('marketsupportfee-select')">
<view class="cell-list-block" @click="goOrder('billing-invoice/market-support-query')">
<image class="icon-address" src="@/static/image/billing_market@3x.png" mode="aspectFit"></image>
<view class="cell-list-block__content">
<text class="cell-list-block__title">市场支持费用查询</text>
<text class="cell-list-block__desc">Market support fee inquiry</text>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
......@@ -45,9 +43,9 @@
...mapState(['sysinfo'])
},
methods: {
goOrder(type) {
goOrder(path) {
uni.navigateTo({
url: `/pages/${type}/${type}`
url: `/pages/${path}`
});
}
}
......@@ -129,4 +127,4 @@
padding: 0 36rpx 0 16rpx;
align-items: center;
}
</style>
</style>
pages/usercenter/usercenter.nvue
View file @ 2727ebc4
......@@ -36,7 +36,7 @@
<text class="entry-bill-text">销售订单</text>
</view>
<!-- <view class="entry-block" @click="goPage('billing-invoice')">
<view class="entry-block" @click="goPage('billing-invoice')">
<view class="entry-bill">
<image class="entry-bill-icon entry-bill-icon_billing"
src="@/static/image/usercenter_billinginvoice@3x.png" mode="">
......@@ -44,7 +44,6 @@
</view>
<text class="entry-bill-text">账票管理</text>
</view>
-->
<view class="entry-block" @click="goPage('ticket-order')" v-if='!isChildCustomer'>
<view class="entry-bill">
<image class="entry-bill-icon entry-bill-icon_billing"
......
servers/api.helper.js
View file @ 2727ebc4
......@@ -183,23 +183,23 @@ class Request {
if (config.url.indexOf('crm-app') !== -1) {
config.baseUrl = 'https://crm.wuliangye.com.cn'
// config.baseUrl = 'http://221.10.127.60:5000'
// config.baseUrl = 'https://crm.wuliangye.com.cn'
config.baseUrl = 'http://221.10.127.60:5000'
} else if (config.url.indexOf('adapter') !== -1) {
config.baseUrl = 'http://api.wuliangcreart.com'
// config.baseUrl = 'http://221.10.127.60:5000/gateway/cyj'
// config.baseUrl = 'http://api.wuliangcreart.com'
config.baseUrl = 'http://221.10.127.60:5000/gateway/cyj'
} else if (config.url.indexOf('wmdpwebservices') !== -1) {
config.baseUrl = 'https://crm.wuliangye.com.cn/gateway/sczx'
// config.baseUrl = 'http://221.10.127.60:5000/gateway/sczx'
// config.baseUrl = 'https://crm.wuliangye.com.cn/gateway/sczx'
config.baseUrl = 'http://221.10.127.60:5000/gateway/sczx'
} else if (config.url.indexOf('wmdp-storeapp') !== -1) {
config.baseUrl = 'https://crm.wuliangye.com.cn/gateway/zdcx'
// config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx'
// config.baseUrl = 'https://crm.wuliangye.com.cn/gateway/zdcx'
config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx'
} else if (config.url.indexOf('uusafe') !== -1) {
config.baseUrl = 'https://apps.wuliangye.com.cn:9076'
// config.baseUrl = 'https://zzy.ipincloud.cn:9070'
// config.baseUrl = 'https://apps.wuliangye.com.cn:9076'
config.baseUrl = 'https://zzy.ipincloud.cn:9070'
} else {
config.baseUrl = 'http://218.89.67.37:8001/wlySap'
// config.baseUrl = 'http://221.10.127.60:5000/wlySap'
// config.baseUrl = 'http://218.89.67.37:8001/wlySap'
config.baseUrl = 'http://221.10.127.60:5000/wlySap'
}
console.log(config.baseUrl)
} catch (e) {
......
store/index.js
View file @ 2727ebc4
......@@ -12,7 +12,7 @@ try {
}
// 需要永久存储，且下次APP启动需要取出的，在state中的变量名
let saveStateKeys = ['vuex_user', 'vuex_token'];
let saveStateKeys = ['vuex_user', 'vuex_token', 'userInfo', 'userBpData', 'isChildCustomer'];
// 保存变量到本地存储中
const saveLifeData = function(key, value) {
......@@ -38,11 +38,12 @@ const store = new Vuex.Store({
// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
vuex_version: '1.0.1',
vuex_demo: '绛紫',
userInfo: {
// 从本地存储恢复登录信息，避免热重载时丢失
userInfo: lifeData.userInfo ? lifeData.userInfo : {
name: '',
code: ''
},
userBpData: {
userBpData: lifeData.userBpData ? lifeData.userBpData : {
USER_BP: '',
ROLES: [{
"ROLE_DESC": "",
......@@ -69,7 +70,27 @@ const store = new Vuex.Store({
'INFO': {},
'baseinfo': {}
},
isChildCustomer: false
// 从本地存储恢复登录信息，避免热重载时丢失
isChildCustomer: lifeData.isChildCustomer !== undefined ? lifeData.isChildCustomer : false
},
getters: {
// 获取角色信息，包含 USER_BP 和 ROLE
role(state) {
if (!state.userBpData) {
return {
USER_BP: '',
ROLE: ''
}
}
// 获取第一个角色的 ROLE_ID
const roleId = state.userBpData.ROLES && state.userBpData.ROLES.length > 0
? state.userBpData.ROLES[0].ROLE_ID
: ''
return {
USER_BP: state.userBpData.USER_BP || '',
ROLE: roleId
}
}
},
mutations: {
$uStore(state, payload) {
......@@ -95,4 +116,4 @@ const store = new Vuex.Store({
}
})
export default store
export default store
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment