diff --git a/pages/index/menu.json b/pages/index/menu.json index 2edccf6..75a2661 100644 --- a/pages/index/menu.json +++ b/pages/index/menu.json @@ -9,13 +9,15 @@ "name":"司机列表", "router":"/driverManagement/index/index", "lable":"driver:info:list", - "icon":"iconxiugaiyonghuxinxi" + "icon":"iconxiugaiyonghuxinxi", + "image":"../../static/newindex/driverList.png" }, { "name":"新增司机", "router":"/driverManagement/addDiver/addDiver", "lable":"driver:info:add", - "icon":"iconxiugaiyonghuxinxi" + "icon":"iconxiugaiyonghuxinxi", + "image":"../../static/newindex/driverAdd.png" } ] }, @@ -29,13 +31,15 @@ "name":"分发列表", "router":"/oilDistribution/index/index", "lable":"distributeReverse:info:list", - "icon":"iconbiangeng" + "icon":"iconbiangeng", + "image":"../../static/newindex/distributeReverseList.png" }, { "icon":"iconbiangeng", "name":"新增分发", "router":"/oilDistribution/distribute/distribute", - "lable":"distributeReverse:info:add" + "lable":"distributeReverse:info:add", + "image":"../../static/newindex/distributeReverseAdd.png" } ] }, @@ -49,7 +53,8 @@ "icon":"iconzhangdanchaxun", "name":"订单列表", "router":"/orderList/index/index", - "lable":"oilOrder:info:list" + "lable":"oilOrder:info:list", + "image":"../../static/newindex/oilOrderList.png" } ] }, @@ -63,13 +68,15 @@ "icon":"iconjiagebiangeng", "name":"油站动销", "router":"/salesRanking/page/index/index", - "lable":"ranking:info:list" + "lable":"ranking:info:list", + "image":"../../static/newindex/rankingList.png" }, { "icon":"iconjiagebiangeng", "name":"企业动销", "router":"/salesRanking/page/index/enterpriseIndex", - "lable":"ranking:info:list" + "lable":"ranking:info:list", + "image":"../../static/newindex/enterpriseList.png" } ] }, @@ -83,13 +90,15 @@ "icon":"iconxiugaijiage", "name":"调价申请", "router":"/priceAdjustment/page/index/index", - "lable":"priceAdjust:info:list" + "lable":"priceAdjust:info:list", + "image":"../../static/newindex/priceAdjustList.png" }, { "icon":"iconxiugaijiage", "name":"调价任务", "router":"/priceAdjustmentTask/page/index", - "lable":"priceTask:info:list" + "lable":"priceTask:info:list", + "image":"../../static/newindex/priceTaskList.png" } ] }, @@ -103,13 +112,15 @@ "icon":"iconxiugaijiage", "name":"油站公司充值", "router":"/oilAccount/page/companyRecharge/index", - "lable":"sys:siteCompany:recharge" + "lable":"sys:siteCompany:recharge", + "image":"../../static/newindex/siteCompanyList.png" }, { "icon":"iconxiugaijiage", "name":"油站账户充值", "router":"/oilAccount/page/accountRecharge/index", - "lable":"sys:siteAcct:recharge" + "lable":"sys:siteAcct:recharge", + "image":"../../static/newindex/siteAcctList.png" } ] }, @@ -123,13 +134,15 @@ "icon":"iconxiugaijiage", "name":"公司账户管理", "router":"/financialCenter/business/index", - "lable":"finance:account:enterprise" + "lable":"finance:account:enterprise", + "image":"../../static/newindex/accountEnterpriseList.png" }, { "icon":"iconxiugaijiage", "name":"油站账户管理", "router":"/financialCenter/serviceStation/index", - "lable":"finance:account:serviceStation" + "lable":"finance:account:serviceStation", + "image":"../../static/newindex/accountServiceStationList.png" } ] }, @@ -143,13 +156,15 @@ "icon":"iconxiugaiyonghuxinxi", "name":"客户运营系统", "router":"/userManagement/customer/index", - "lable":"management:user:customer" + "lable":"management:user:customer", + "image":"../../static/newindex/customerList.png" }, { "icon":"iconxiugaiyonghuxinxi", "name":"星油云站", "router":"/userManagement/yunSite/index", - "lable":"management:user:yunSite" + "lable":"management:user:yunSite", + "image":"../../static/newindex/yunSiteList.png" } ] } diff --git a/pages/index/newindex.css b/pages/index/newindex.css index eef6673..81545b5 100644 --- a/pages/index/newindex.css +++ b/pages/index/newindex.css @@ -226,14 +226,14 @@ } .options-frame { margin-top: 10rpx; - padding-left: 106rpx; + padding: 0 35rpx; display: flex; } .options-frame > .option { position: relative; margin-left: 20rpx; padding: 10rpx 14rpx; - width: 240rpx; + width: 335rpx; height: 140rpx; background: #fff; border-radius: 20rpx; @@ -243,11 +243,11 @@ } .options-frame > .option > .star { position: absolute; - top: 0; - right: 0; - width: 80rpx; - height: 80rpx; - line-height: 80rpx; + top: 5rpx; + right: 8rpx; + width: 30rpx; + height: 30rpx; + line-height: 30rpx; text-align: center; background: #ffffff; border-radius: 20rpx; @@ -256,17 +256,15 @@ } .options-frame > .option > .wall { position: relative; - padding-left: 20rpx; padding-top: 9rpx; - width: 212rpx; + width: 297rpx; height: 120rpx; - background: rgba(40, 102, 255, .1) ; border-radius: 20rpx; } .options-frame > .option > .wall > .name { position: absolute; - left: 24rpx; - bottom: 12rpx; + left: 110rpx; + bottom: 40rpx; font-size: 28rpx; color: #666; } diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue index 69e44e5..dadbf84 100644 --- a/pages/index/newindex.vue +++ b/pages/index/newindex.vue @@ -57,11 +57,12 @@ @@ -80,7 +81,8 @@ - + + {{item.name}} @@ -176,7 +178,7 @@ this.$set(this.collection,index,'') }, iconFn(e) { - return this.collection.filter((item) => e.name == item.name).length == 0 ? '#bbbbbb' : '#FFB730'; + return this.collection.filter((item) => e.name == item.name).length == 0 ? '#bbbbbb' : '#0256FF'; }, initFn() { this.menuList = JSON.parse(JSON.stringify(menus)) diff --git a/static/newindex/accountEnterpriseList.png b/static/newindex/accountEnterpriseList.png new file mode 100644 index 0000000..36e0bd6 Binary files /dev/null and b/static/newindex/accountEnterpriseList.png differ diff --git a/static/newindex/accountServiceStationList.png b/static/newindex/accountServiceStationList.png new file mode 100644 index 0000000..1054190 Binary files /dev/null and b/static/newindex/accountServiceStationList.png differ diff --git a/static/newindex/customerList.png b/static/newindex/customerList.png new file mode 100644 index 0000000..d280bbe Binary files /dev/null and b/static/newindex/customerList.png differ diff --git a/static/newindex/distributeReverseAdd.png b/static/newindex/distributeReverseAdd.png new file mode 100644 index 0000000..5df2f04 Binary files /dev/null and b/static/newindex/distributeReverseAdd.png differ diff --git a/static/newindex/distributeReverseList.png b/static/newindex/distributeReverseList.png new file mode 100644 index 0000000..1c44a36 Binary files /dev/null and b/static/newindex/distributeReverseList.png differ diff --git a/static/newindex/driverAdd.png b/static/newindex/driverAdd.png new file mode 100644 index 0000000..dd66a90 Binary files /dev/null and b/static/newindex/driverAdd.png differ diff --git a/static/newindex/driverList.png b/static/newindex/driverList.png new file mode 100644 index 0000000..0d2baea Binary files /dev/null and b/static/newindex/driverList.png differ diff --git a/static/newindex/enterpriseList.png b/static/newindex/enterpriseList.png new file mode 100644 index 0000000..29a6318 Binary files /dev/null and b/static/newindex/enterpriseList.png differ diff --git a/static/newindex/oilOrderList.png b/static/newindex/oilOrderList.png new file mode 100644 index 0000000..d247a3f Binary files /dev/null and b/static/newindex/oilOrderList.png differ diff --git a/static/newindex/priceAdjustList.png b/static/newindex/priceAdjustList.png new file mode 100644 index 0000000..52b9118 Binary files /dev/null and b/static/newindex/priceAdjustList.png differ diff --git a/static/newindex/priceTaskList.png b/static/newindex/priceTaskList.png new file mode 100644 index 0000000..fff8733 Binary files /dev/null and b/static/newindex/priceTaskList.png differ diff --git a/static/newindex/rankingList.png b/static/newindex/rankingList.png new file mode 100644 index 0000000..513d1e7 Binary files /dev/null and b/static/newindex/rankingList.png differ diff --git a/static/newindex/siteAcctList.png b/static/newindex/siteAcctList.png new file mode 100644 index 0000000..fc94ff7 Binary files /dev/null and b/static/newindex/siteAcctList.png differ diff --git a/static/newindex/siteCompanyList.png b/static/newindex/siteCompanyList.png new file mode 100644 index 0000000..2aa210f Binary files /dev/null and b/static/newindex/siteCompanyList.png differ diff --git a/static/newindex/yunSiteList.png b/static/newindex/yunSiteList.png new file mode 100644 index 0000000..7c09295 Binary files /dev/null and b/static/newindex/yunSiteList.png differ diff --git a/utils/request.js b/utils/request.js index 1295dd6..57d7b2d 100644 --- a/utils/request.js +++ b/utils/request.js @@ -2,21 +2,21 @@ import axios from 'axios' import utils from '@/utils/encode' // const env = process.env.NODE_ENV // const env = 'test' -const env = 'test' +const env = 'production' const testUrl = 'http://192.168.1.85:38080' // const productUrl = 'https://www.xingoil.com/adminapi' -// const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new +// const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new const productUrl = 'http://uat.xingoil.com/adminapi' const service = axios.create({ baseURL: env == 'production' ? productUrl : testUrl, - // baseURL: testUrl, + // baseURL: testUrl, timeout: 5000 }) var url = '' service.interceptors.request.use( config => { - // 拦截请求 + // 拦截请求 uni.showLoading({ title: '加载中...', mask: true @@ -25,7 +25,7 @@ service.interceptors.request.use( const unionId = uni.getStorageSync('unionid') const openId = uni.getStorageSync('openid') - // const accountSources = 'WE_CHAT_PROGRAM' + // const accountSources = 'WE_CHAT_PROGRAM' const accountSources = 'LOGIN_MP_WECHAT' // console.log('取出来缓存', token, openid) @@ -118,7 +118,7 @@ service.interceptors.response.use( console.log('用户点击取消'); } } - + }) } return res