Ver Fonte

样式修改

lilei há 2 anos atrás
pai
commit
157e180561
5 ficheiros alterados com 119 adições e 93 exclusões
  1. 2 8
      pages.json
  2. 90 84
      pages/index/index.vue
  3. 4 1
      pages/morePage/morePage.vue
  4. BIN
      static/tab/midBtn.png
  5. 23 0
      store/index.js

+ 2 - 8
pages.json

@@ -316,16 +316,10 @@
 		"backgroundColor": "#ffffff",
 		"fontSize": "14px",
 		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tab/tab_home_normal.png",
-				"selectedIconPath": "static/tab/tab_home_pressed.png",
-				"text": "首页"
+				"pagePath": "pages/index/index"
 			},
 			{
-				"pagePath": "pages/morePage/morePage",
-				"iconPath": "static/tab/tab_personal_normal.png",
-				"selectedIconPath": "static/tab/tab_personal_pressed.png",
-				"text": "更多"
+				"pagePath": "pages/morePage/morePage"
 			}
 		]
 	}

+ 90 - 84
pages/index/index.vue

@@ -1,98 +1,101 @@
 <template>
-	<view class="content">
-		<view class="header-box">
-			<UniStatusBar></UniStatusBar>
-			<view class="title flex align_center" :style="{height:(navHeight+'px')}">
-				<u-image src="/static/logo-h.png" width="349" height='40'></u-image>
-			</view>
-		</view>
-		<view class="cbody">
-		<view class="body-box bg-blue">
-			<!-- 滚动区域 -->
-			<view class="scroll-list">
-				<scrollBox v-if="list.length" :list="list"></scrollBox>
-			</view>
-			<!-- 保证金 -->
-			<view class="notices flex align_center" v-if="bondRecord" @click="toPayBondAmount">
-				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有一笔保证金待支付 ¥{{bondRecord.bondAmount}}</view> 
-				<!-- <text class="text">立即支付>></text> -->
-			</view>
-			<!-- 待取货提醒 -->
-			<view class="notices flex align_center" v-if="!bondRecord&&orderTodo" @click="toOrder">
-				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有待取货的货架订单哦!</view> <text class="text">立即处理>></text>
-			</view>
-			<!-- 门店审核不通过 -->
-			<view class="notices flex justify_between" v-if="storeApply&&storeApply.auditStatus=='REFUSE'&&storeApply.readFlag=='0'">
-				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 门店认证资料审核不通过,请重新提交审核!</view> <text class="text" @click="toKnow">知道了</text>
+	<view>
+		<view class="content">
+			<view class="header-box">
+				<UniStatusBar></UniStatusBar>
+				<view class="title flex align_center" :style="{height:(navHeight+'px')}">
+					<u-image src="/static/logo-h.png" width="349" height='40'></u-image>
+				</view>
 			</view>
-			<!-- 名片 -->
-			<view class="userCard flex align_center justify_between">
-				<view class="userCard-info flex align_center">
-					<view>
-						<u-image shape='circle' v-if="!hasLogin" src="/static/def_personal_avatar.png" width="90" height="90"></u-image>
-						<u-image shape='circle' v-else :src="avatarUrl||'/static/def_personal_avatar.png'" width="90" height="90"></u-image>
-					</view>
-					<view class="user-info" @click="toUser">
-						<view v-if="!hasLogin" style="font-size: 40rpx;">
-							请点击登录
+			<view class="cbody">
+			<view class="body-box bg-blue">
+				<!-- 滚动区域 -->
+				<view class="scroll-list">
+					<scrollBox v-if="list.length" :list="list"></scrollBox>
+				</view>
+				<!-- 保证金 -->
+				<view class="notices flex align_center" v-if="bondRecord" @click="toPayBondAmount">
+					<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有一笔保证金待支付 ¥{{bondRecord.bondAmount}}</view> 
+					<!-- <text class="text">立即支付>></text> -->
+				</view>
+				<!-- 待取货提醒 -->
+				<view class="notices flex align_center" v-if="!bondRecord&&orderTodo" @click="toOrder">
+					<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有待取货的货架订单哦!</view> <text class="text">立即处理>></text>
+				</view>
+				<!-- 门店审核不通过 -->
+				<view class="notices flex justify_between" v-if="storeApply&&storeApply.auditStatus=='REFUSE'&&storeApply.readFlag=='0'">
+					<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 门店认证资料审核不通过,请重新提交审核!</view> <text class="text" @click="toKnow">知道了</text>
+				</view>
+				<!-- 名片 -->
+				<view class="userCard flex align_center justify_between">
+					<view class="userCard-info flex align_center">
+						<view>
+							<u-image shape='circle' v-if="!hasLogin" src="/static/def_personal_avatar.png" width="90" height="90"></u-image>
+							<u-image shape='circle' v-else :src="avatarUrl||'/static/def_personal_avatar.png'" width="90" height="90"></u-image>
 						</view>
-						<view v-else>
-							<view class="user-name">{{userInfo.userNameCN || userInfo.mobile}}</view>
-							<view v-if="hasLogin&&userInfo&&userInfo.sysUserFlag == '0'">
-								<u-tag text="个人用户" mode="dark" type="warning" shape="circle" size="mini" />
+						<view class="user-info" @click="toUser">
+							<view v-if="!hasLogin" style="font-size: 40rpx;">
+								请点击登录
+							</view>
+							<view v-else>
+								<view class="user-name">{{userInfo.userNameCN || userInfo.mobile}}</view>
+								<view v-if="hasLogin&&userInfo&&userInfo.sysUserFlag == '0'">
+									<u-tag text="个人用户" mode="dark" type="warning" shape="circle" size="mini" />
+								</view>
+								<view v-else>{{userInfo.orgName}}</view>
 							</view>
-							<view v-else>{{userInfo.orgName}}</view>
 						</view>
 					</view>
-				</view>
-				<view @click="toUser">
-					<text v-if="hasLogin&&userInfo&&userInfo.sysUserFlag == '0'" class="user-rz">
-						{{storeApply&&storeApply.auditStatus=='WAIT'?'认证门店审核中':'认证成为门店'}}
-					</text>
-					<u-icon name="arrow-right"></u-icon>
+					<view @click="toUser">
+						<text v-if="hasLogin&&userInfo&&userInfo.sysUserFlag == '0'" class="user-rz">
+							{{storeApply&&storeApply.auditStatus=='WAIT'?'认证门店审核中':'认证成为门店'}}
+						</text>
+						<u-icon name="arrow-right"></u-icon>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="body-box">	
-			<!-- 扫描按钮 -->
-			<view class="scanButton flex align_center" @click="openCamera">
-				<u-icon name="scan" size="60"></u-icon><text class="ml10">扫描VIN</text>
+			<view class="body-box">	
+				<!-- 扫描按钮 -->
+				<view class="scanButton flex align_center" @click="openCamera">
+					<u-icon name="scan" size="60"></u-icon><text class="ml10">扫描VIN</text>
+				</view>
+				<!-- 直接取货 -->
+				<view class="quickButton flex align_center" v-if="userInfo.sysUserFlag == '1'" @click="openTakeGood">
+					<text>没有VIN,直接取货</text>
+				</view>
+				<view class="flex align_center justify_center">
+					<u-image src="/static/banner1.png" width="645" height="504"></u-image>
+				</view>
+				<u-action-sheet :list="actionList" @click="clickAction" v-model="showAction"></u-action-sheet>
 			</view>
-			<!-- 直接取货 -->
-			<view class="quickButton flex align_center" v-if="userInfo.sysUserFlag == '1'" @click="openTakeGood">
-				<text>没有VIN,直接取货</text>
+			<!-- 扫描记录 -->
+			<view class="list-box">
+				<!-- 扫描记录 -->
+				<u-cell-group :border="false">
+					<u-cell-item title="VIN查询历史" @click="toAllRecord" :title-style="{fontSize:'1em'}" value="全部">
+						<u-icon slot="icon" size="38" color="#066cff" style="margin-right: 0.3em;" name="order"></u-icon>
+					</u-cell-item>
+				</u-cell-group>
+				<u-cell-group :border="false" v-if="hasLogin">
+					<u-cell-item v-for="item in vinList" 
+					@click="toChoosePart(item)" 
+					:key="item.id" 
+					:title="item.vinCode" 
+					:title-style="{fontSize:'1em'}" 
+					:label="userInfo&&userInfo.sysUserFlag == '0' ? item.createDate : (item.brandName +' '+item.modelName)">
+						<text slot="icon"></text>
+					</u-cell-item>
+					<view style="padding: 20upx;">
+						<u-empty :src="`/static/nodata.png`" icon-size="180" :text="noDataText" img-width="120" v-if="vinList.length==0 && status!='loading'" mode="list"></u-empty>
+						<u-loadmore v-if="status=='loading'" :status="status" />
+					</view>
+				</u-cell-group>
+				<view class="des" v-if="vinList.length&&hasLogin">仅展示最近5条记录,点击“全部”查看更多</view>
+				<view class="des" v-if="!hasLogin">请登录后查看历史记录</view>
 			</view>
-			<view class="flex align_center justify_center">
-				<u-image src="/static/banner1.png" width="645" height="504"></u-image>
 			</view>
-			<u-action-sheet :list="actionList" @click="clickAction" v-model="showAction"></u-action-sheet>
-		</view>
-		<!-- 扫描记录 -->
-		<view class="list-box">
-			<!-- 扫描记录 -->
-			<u-cell-group :border="false">
-				<u-cell-item title="VIN查询历史" @click="toAllRecord" :title-style="{fontSize:'1em'}" value="全部">
-					<u-icon slot="icon" size="38" color="#066cff" style="margin-right: 0.3em;" name="order"></u-icon>
-				</u-cell-item>
-			</u-cell-group>
-			<u-cell-group :border="false" v-if="hasLogin">
-				<u-cell-item v-for="item in vinList" 
-				@click="toChoosePart(item)" 
-				:key="item.id" 
-				:title="item.vinCode" 
-				:title-style="{fontSize:'1em'}" 
-				:label="userInfo&&userInfo.sysUserFlag == '0' ? item.createDate : (item.brandName +' '+item.modelName)">
-					<text slot="icon"></text>
-				</u-cell-item>
-				<view style="padding: 20upx;">
-					<u-empty :src="`/static/nodata.png`" icon-size="180" :text="noDataText" img-width="120" v-if="vinList.length==0 && status!='loading'" mode="list"></u-empty>
-					<u-loadmore v-if="status=='loading'" :status="status" />
-				</view>
-			</u-cell-group>
-			<view class="des" v-if="vinList.length&&hasLogin">仅展示最近5条记录,点击“全部”查看更多</view>
-			<view class="des" v-if="!hasLogin">请登录后查看历史记录</view>
-		</view>
 		</view>
+		<u-tabbar :list="vuex_tabBarList" :mid-button="true"></u-tabbar>
 	</view>
 </template>
 
@@ -137,7 +140,7 @@
 			}
 		},
 		computed: {
-			...mapState(['hasLogin','vuex_vinScanNums']),
+			...mapState(['hasLogin','vuex_vinScanNums','vuex_tabBarList']),
 			hasShelf(){
 				return this.$store.state.vuex_storeShelf
 			},
@@ -475,6 +478,9 @@
 </script>
 
 <style lang="less">
+	page{
+		background-color: #ffffff;
+	}
 	.content {
 		margin: 0;
 		padding: 0;

+ 4 - 1
pages/morePage/morePage.vue

@@ -1,4 +1,5 @@
 <template>
+	<view>
 	<view class="morePages">
 		<view class="list-box" v-if="$hasPermissions('M_stockQueryList_mini')||$hasPermissions('M_stockPut_mini')">
 			<view class="list-title">
@@ -79,6 +80,8 @@
 			</view>
 		</u-popup>
 	</view>
+	<u-tabbar :list="vuex_tabBarList" :mid-button="true"></u-tabbar>
+	</view>
 </template>
 
 <script>
@@ -94,7 +97,7 @@
 			}
 		},
 		computed: {
-			...mapState(['hasLogin']),
+			...mapState(['hasLogin','vuex_tabBarList']),
 			hasShelf(){
 				return !!this.$store.state.vuex_storeShelf
 			},

BIN
static/tab/midBtn.png


+ 23 - 0
store/index.js

@@ -61,6 +61,29 @@ const store = new Vuex.Store({
 		vuex_scanMaxNums: 10, // 最大扫描次数
 		vuex_storeAuthInfo: null ,// 门店认证状态信息
 		vuex_tempData: null, // 临时数据
+		vuex_tabBarList: [
+			{
+				"pagePath": "/pages/index/index",
+				"iconPath": "/static/tab/tab_home_normal.png",
+				"selectedIconPath": "/static/tab/tab_home_pressed.png",
+				"text": "首页",
+				'customIcon': false,
+			},
+			{
+				'iconPath': "/static/tab/midBtn.png",
+				'selectedIconPath': "/static/tab/midBtn.png",
+				'text': '扫描VIN',
+				'midButton': true,
+				'customIcon': false,
+			},
+			{
+				"pagePath": "/pages/morePage/morePage",
+				"iconPath": "/static/tab/tab_personal_normal.png",
+				"selectedIconPath": "/static/tab/tab_personal_pressed.png",
+				"text": "更多",
+				'customIcon': false,
+			}
+		]
     },
 	getters:{
 		getOpeid(state){