Merge remote-tracking branch 'origin/master' into xiaozy_当月动销

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"
 			}
 		]
 	}

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;
+	top: 5rpx;
-	right: 0;
+	right: 8rpx;
-	width: 80rpx;
+	width: 30rpx;
-	height: 80rpx;
+	height: 30rpx;
-	line-height: 80rpx;
+	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;
+	left: 110rpx;
-	bottom: 12rpx;
+	bottom: 40rpx;
 	font-size: 28rpx;
 	color: #666;
 }

pages/index/newindex.vue

@@ -57,11 +57,12 @@
 						<template v-for="optionItme,optionIndex in item.submenu">
 							<view class="option" v-if="user.authList.includes(optionItme.lable)" :key="optionIndex" @tap.stop="jump(optionItme)">
 								<view class="star" @tap.stop="collectionFn(optionItme)">
-									<uni-icons :color="iconFn(optionItme)" custom-prefix="iconfont" type="iconshoucang-yishoucang" size="18"></uni-icons>
+									<uni-icons :color="iconFn(optionItme)" custom-prefix="iconfont" type="iconshoucang-yishoucang" size="14"></uni-icons>
 								</view>
 								<view class="wall">
 									<view class="name">{{optionItme.name}}</view>
-									<uni-icons color="#fff" custom-prefix="iconfont" :type="optionItme.icon" size="50"></uni-icons>
+									<image style="width: 100rpx;height: 100rpx;" :src="optionItme.image"></image>
+									<!-- <uni-icons color="#fff" custom-prefix="iconfont" :type="optionItme.icon" size="50"></uni-icons> -->
 								</view>
 							</view>
 						</template>
@@ -80,7 +81,8 @@
 							<uni-icons custom-prefix="iconfont" color="#fff" type="iconchiping" size="20"></uni-icons>
 						</view>
 						<view class="collection_item_name">
-							<uni-icons custom-prefix="iconfont" color="#2866FF" :type="item.icon" size="30"></uni-icons>
+							<image style="width: 95rpx;height: 95rpx;" :src="item.image"></image>
+							<!-- <uni-icons custom-prefix="iconfont" color="#2866FF" :type="item.icon" size="30"></uni-icons> -->
 							<view class="collection_item_text">{{item.name}}</view>
 						</view>
 					</view>
@@ -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))

utils/request.js

@@ -2,7 +2,7 @@ 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