Merge branch 'test' of http://git.echepei.com/sailun/sailun-tbr-web into test

common/p-scan/scan.vue

@@ -23,7 +23,7 @@
 			// #ifdef APP-PLUS
 			var currentWebview = page.$getAppWebview();
 			this.barcode = plus.barcode.create('barcode', this.barcode, {
-				top: '85px',
+				top: '10%',
 				left: '10%',
 				width: '80%',
 				height: '31.5%', //180px

pages.json

@@ -307,14 +307,26 @@
 		}
 	},
 	"tabBar": {
+		"color": "#6A6A6A",
+		"selectedColor": "#0095FF",
+		"backgroundColor": "#ffffff",
 		"list": [{
-				"pagePath": "pages/home/index"
+				"pagePath": "pages/home/index",
+				"iconPath": "static/sailun/home.png",
+				"selectedIconPath": "static/sailun/homefill.png",
+				"text": "首页"
 			},
 			{
-				"pagePath": "pages/msg/index"
+				"pagePath": "pages/msg/index",
+				"iconPath": "static/sailun/message.png",
+				"selectedIconPath": "static/sailun/messagefill.png",
+				"text": "消息"
 			},
 			{
-				"pagePath": "pages/me/index"
+				"pagePath": "pages/me/index",
+				"iconPath": "static/sailun/my.png",
+				"selectedIconPath": "static/sailun/myfill.png",
+				"text": "我的"
 			}
 		]
 	}

pages/home/index.vue

@@ -1,21 +1,21 @@
 <template>
-	<view>
+	<view style="background-color: #FFFFFF;height: 100%;">
 		<view class="status_bar">
 			<!-- 这里是状态栏 -->
 		</view>
 		<view class="u-page">
 			<view class="u-m-t-20">
-				<u-swiper :list="tabbarList" :height="310" bg-color="#F4F4F4"></u-swiper>
+				<u-swiper :list="tabbarList" :height="310"  :effect3d="true" border-radius="20" effect3d-previous-margin="20"></u-swiper>
 			</view>
 			<view class="u-flex u-m-t-20  u-m-l-20 u-m-r-20">
 				<view class="u-flex u-row-center" style="width: 450rpx; height: 70rpx;border-radius: 50rpx;background: rgba(52,140,245,0.1);font-size: 20rpx;color: #348CF5; font-size: 500;">
 					<u-image width="45rpx" height="35rpx" src="../../static/sailun/speaker.png" style="margin:10rpx;"></u-image>公告
 				</view>
-				<u-notice-bar mode="horizontal" :list="noticebarList" :volume-icon="false" bg-color="#F4F4F4" color="#2B2B2B"></u-notice-bar>
+				<u-notice-bar mode="horizontal" :list="noticebarList" :volume-icon="false" bg-color="#FFF" color="#2B2B2B" padding="18rpx 12rpx"></u-notice-bar>
 			</view>
-			<view class="u-flex u-m-t-20 u-row-around u-m-15">
-				<u-image width="340rpx"  src="../../static/sailun/scan_in.png" @click="scancodeIn" mode="widthFix"></u-image>
-				<u-image width="340rpx"  src="../../static/sailun/scan_out.png" @click="scancodeOut" mode="widthFix"></u-image>
+			<view class="u-flex u-m-t-20 u-row-around u-m-l-10 u-m-r-10">
+				<u-image width="350rpx"  src="../../static/sailun/scan_in.png" @click="scancodeIn" mode="widthFix"></u-image>
+				<u-image width="350rpx"  src="../../static/sailun/scan_out.png" @click="scancodeOut" mode="widthFix"></u-image>
 			</view>
 			<view class="u-m-t-20">
 				<view class="u-m-l-30" style="font-size: 34rpx;">
@@ -28,12 +28,12 @@
 					<u-image width="350rpx" height="212rpx" src="../../static/sailun/4.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;" @click="inIntegral"></u-image>
 				</view>
 			</view>
-			<view class="u-flex u-row-center u-m-t-20">
+			<view class="u-flex u-row-center u-m-t-30">
 				<u-image width="680rpx" src="../../static/sailun/88reward.png" mode="widthFix"></u-image>
 			</view>
 		</view>
 		<!-- 与包裹页面所有内容的元素u-page同级，且在它的下方 -->
-		<u-tabbar v-model="current" :list="list"></u-tabbar>
+		<!-- <u-tabbar v-model="current" :list="list"></u-tabbar> -->
 	</view>
 </template>
 
@@ -41,30 +41,6 @@
 	export default {
 		data() {
 			return {
-				list: [{
-						iconPath: "home",
-						selectedIconPath: "home-fill",
-						text: '首页',
-						customIcon: false,
-						pagePath: '/pages/home/index'
-					},
-					{
-						iconPath: "chat",
-						selectedIconPath: "chat-fill",
-						text: '消息',
-						count: 2,
-						isDot: false,
-						customIcon: false,
-						pagePath: '/pages/msg/index'
-					},
-					{
-						iconPath: "account",
-						selectedIconPath: "account-fill",
-						text: '我的',
-						customIcon: false,
-						pagePath: '/pages/me/index'
-					},
-				],
 				tabbarList: [{
 						image: '../../static/sailun/swiper1.png'
 					},
@@ -76,7 +52,6 @@
 					}
 				],
 				noticebarList: ['恭喜您获得10000000元积分红包', '恭喜您获得10000000元积分红包', '恭喜您获得10000000元积分红包'],
-				current: 0
 			};
 		},
 		methods: {

pages/me/index.vue

@@ -1,11 +1,11 @@
 <template>
-	<view>
-		<view class="status_bar">
-			<!-- 这里是状态栏 -->
-		</view>
-		<view class="u-page">
+	<view style="background-color: #FFFFFF;height: 100%;">
+		<view class="u-page status_bar">
 			<view class="head">
-				<view class="u-flex u-row-between" style="padding: 50rpx 30rpx">
+				<view class="status_bar">
+					<!-- 这里是状态栏 -->
+				</view>
+				<view class="u-flex u-row-between" style="padding: 10rpx 40rpx 30rpx;">
 					<view class="u-flex">
 						<view class="">
 							<u-image width="130rpx" height="130rpx" src="../../static/sailun/head-portrait.png" :lazy-load="true" shape="circle">
@@ -28,7 +28,7 @@
 						</u-image>
 					</view>
 				</view>
-				<view class="u-flex u-row-around">
+				<view class="u-flex u-row-around u-m-t-20">
 					<view class="u-text-center">
 						<view style="font-size:34rpx; color: #FFFFFF;">
 							张三
@@ -48,7 +48,7 @@
 				</view>
 			</view>
 			<view style="position: relative;top:-110rpx">
-				<u-card padding="20" box-shadow="0px 1px 10px rgba(0,0,0,0.2)" border-radius="20" :show-foot="false" :border="false">
+				<u-card padding="20" box-shadow="0rpx 0rpx 24rpx 0rpx rgba(101, 176, 249, 0.41)" border-radius="20" :show-foot="false" :border="false">
 					<view slot="head" class="u-flex u-row-between u-col-bottom">
 						<view style="font-size: 34rpx;">
 							结算中心
@@ -94,7 +94,7 @@
 						</view>
 					</view>
 				</u-card>
-				<u-card padding="20" box-shadow="0px 1px 10px rgba(0,0,0,0.2)" border-radius="20" :show-foot="false" :border="false">
+				<u-card padding="20" box-shadow="0rpx 0rpx 24rpx 0rpx rgba(101, 176, 249, 0.41)" border-radius="20" :show-foot="false" :border="false">
 					<view slot="head" class="u-flex u-row-between u-col-bottom">
 						<view style="font-size: 34rpx;">
 							我的服务
@@ -180,19 +180,22 @@
 				</u-card>
 				<u-cell-group>
 					<u-cell-item  title="核销记录">
-						<u-icon slot="icon" size="32" name="balance-o" custom-prefix="van-icon"></u-icon>
+						<u-icon slot="icon" size="42" name="balance-o" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>
 					<u-cell-item  title="兑换记录">
-						<u-icon slot="icon" size="32" name="balance-list-o" custom-prefix="van-icon"></u-icon>
+						<u-icon slot="icon" size="42" name="balance-list-o" custom-prefix="van-icon"></u-icon>
+					</u-cell-item>
+					<u-cell-item  title="经销商库存">
+						<u-icon slot="icon" size="42" name="points" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>
-					<u-cell-item icon="setting-fill" title="设置" @click="inSetting">
-						<u-icon slot="icon" size="32" name="setting-o" custom-prefix="van-icon"></u-icon>
+					<u-cell-item title="设置" @click="inSetting">
+						<u-icon slot="icon" size="42" name="setting-o" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>
 				</u-cell-group>
 			</view>
 		</view>
 		<!-- 与包裹页面所有内容的元素u-page同级， -->
-		<u-tabbar v-model="current" :list="list"></u-tabbar>
+		<!-- <u-tabbar v-model="current" :list="list"></u-tabbar> -->
 	</view>
 </template>
 
@@ -201,31 +204,6 @@
 		data() {
 			return {
 				src: '../../static/sailun/fade.jpg',
-				list: [{
-						iconPath: "home",
-						selectedIconPath: "home-fill",
-						text: '首页',
-						customIcon: false,
-						pagePath: '/pages/home/index'
-					},
-					{
-						iconPath: "chat",
-						selectedIconPath: "chat-fill",
-						text: '消息',
-						count: 2,
-						isDot: false,
-						customIcon: false,
-						pagePath: '/pages/msg/index'
-					},
-					{
-						iconPath: "account",
-						selectedIconPath: "account-fill",
-						text: '我的',
-						customIcon: false,
-						pagePath: '/pages/me/index'
-					},
-				],
-				current: 2
 			};
 		},
 		methods:{
@@ -281,13 +259,11 @@
 <style lang="scss" scoped>
 	.status_bar {
 		height: var(--status-bar-height);
-		width: 100%;
-		background-color: #0095FF;
 	}
 
 	.head {
 		width: 750rpx;
-		height: 429rpx;
+		height: 460rpx;
 		// background: linear-gradient(50deg, #3F77F6 0%, #66CCFF 100%);
 		background-image:  url(../../static/sailun/mebg.png);
 		background-size:100% 100%;

pages/msg/index.vue

@@ -24,7 +24,7 @@
 				</view>
 			</u-swipe-action>
 		</view>
-		<u-tabbar v-model="current" :list="list"></u-tabbar>
+		<!-- <u-tabbar v-model="current" :list="list"></u-tabbar> -->
 	</view>
 </template>
 
@@ -32,31 +32,6 @@
 	export default {
 		data() {
 			return {
-				current: 1,
-				list: [{
-						iconPath: "home",
-						selectedIconPath: "home-fill",
-						text: '首页',
-						customIcon: false,
-						pagePath: '/pages/home/index'
-					},
-					{
-						iconPath: "chat",
-						selectedIconPath: "chat-fill",
-						text: '消息',
-						count: 2,
-						isDot: false,
-						customIcon: false,
-						pagePath: '/pages/msg/index'
-					},
-					{
-						iconPath: "account",
-						selectedIconPath: "account-fill",
-						text: '我的',
-						customIcon: false,
-						pagePath: '/pages/me/index'
-					},
-				],
 				msgList: [{
 						id: 1,
 						ip: 1,