ccjgmwz 4 年之前
父節點
當前提交
4a73269cb1

+ 0 - 2
unimall-app/App.vue

@@ -11,7 +11,6 @@
 			...mapMutations(['login'])
 		},
 		onLaunch: function() {
-			uni.hideTabBar()
 			this.$socket.initWebIM(this.$ws, true, true)
 			let userInfo = uni.getStorageSync('userInfo') || '';
 			if(userInfo.id){
@@ -25,7 +24,6 @@
 			}
 		},
 		onShow: function() {
-			uni.hideTabBar()
 			console.log('App Show')
 		},
 		onHide: function() {

+ 1 - 1
unimall-app/components/chat/im-drawer.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-	import emojiData from "../../static/emoji/emojiData.js"
+	import emojiData from "@/pageC/static/emoji/emojiData.js"
 	import emotion from '@/components/emotion/index.vue'
 	export default {
 		name:'im-drawer',

+ 1 - 1
unimall-app/components/chat/left-bubble.vue

@@ -50,7 +50,7 @@
 </template>
 
 <script>
-	import { transform } from "../../static/emoji/ChatUtils.js";
+	import { transform } from "@/pageC/static/emoji/ChatUtils.js";
 	export default {
 		name: 'left-bubble',
 		components:{

+ 1 - 1
unimall-app/components/chat/right-bubble.vue

@@ -49,7 +49,7 @@
 
 <script>
 	import ImgCache from '@/components/img-cache/img-cache.vue';
-	import { transform } from "../../static/emoji/ChatUtils.js";
+	import { transform } from "@/pageC/static/emoji/ChatUtils.js";
 	
 	export default {
 		name: 'right-bubble',

+ 1 - 1
unimall-app/components/emotion/index.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-	import { emojiList } from "@/static/emoji/emoji.js"
+	import { emojiList } from "@/pageC/static/emoji/emoji.js"
 	export default {
 		name:'u-emotion',
 		data() {

+ 1 - 1
unimall-app/pageC/chat/chat.vue

@@ -43,7 +43,7 @@
 	import ImDrawer from '@/components/chat/im-drawer.vue'
 	import RedCard from '@/components/chat/red-card.vue'
 	import RedEnvelope from "@/components/redenvelope"
-	import emojiData from "../../static/emoji/emojiData.js"
+	import emojiData from "@/pageC/static/emoji/emojiData.js"
 	import ImgCache from '@/components/img-cache/img-cache.vue'
 	import RightBubble from '@/components/chat/right-bubble.vue'
 	import LeftBubble from '@/components/chat/left-bubble.vue'

+ 0 - 0
unimall-app/static/emoji/ChatUtils.js → unimall-app/pageC/static/emoji/ChatUtils.js


+ 0 - 0
unimall-app/static/emoji/emoji.js → unimall-app/pageC/static/emoji/emoji.js


+ 0 - 0
unimall-app/static/emoji/emojiData.js → unimall-app/pageC/static/emoji/emojiData.js


+ 0 - 0
unimall-app/static/iconfont/iconfont.ttf → unimall-app/pageC/static/iconfont/iconfont.ttf


+ 17 - 6
unimall-app/pages.json

@@ -4,7 +4,7 @@
 	    },
 		"lazyCodeLoading": "requiredComponents",
 		"tabBar": {
-			"custom":true,
+			"custom":false,
 			"color": "#7A7E83",
 			"selectedColor": "#3cc51f",
 			"borderStyle": "black",
@@ -12,23 +12,34 @@
 			"list": [
 				{
 					"pagePath": "pages/sale/information",
+					"iconPath":"static/img/zixun.png",
+					"selectedIconPath":"static/img/zixun_check.png",
 					"text": "资讯"
 				},
 				
 				{
 					"pagePath": "pages/buy/transaction",
+					"iconPath":"static/img/jiaoyi.png",
+					"selectedIconPath":"static/img/jiaoyi_check.png",
 					"text": "交易"
 				},
 				{
 					"pagePath": "pages/home/home",
-					"text": "粮信"
+					"iconPath":"static/img/wode.png",
+					"selectedIconPath":"static/img/wode_check.png",
+					"text": "粮信",
+					"midButton":true
 				},
 				{
 					"pagePath": "pages/tran/tran",
+					"iconPath":"static/img/wuliu.png",
+					"selectedIconPath":"static/img/wuliu_check.png",
 					"text": "物流"
 				},
 				{
 					"pagePath": "pages/user/user",
+					"iconPath":"static/img/wode.png",
+					"selectedIconPath":"static/img/wode_check.png",
 					"text": "我的"
 				}
 			]
@@ -615,13 +626,13 @@
 								"autoBackButton": false,
 								"backgroundColor": "#fff",
 								"buttons": [{
-										"fontSrc": "/static/iconfont/iconfont.ttf",
+										"fontSrc": "/pageC/static/iconfont/iconfont.ttf",
 										"float": "right",
 										"text": "\ue626"
 									}
 									,
 									{
-										"fontSrc": "/static/iconfont/iconfont.ttf",
+										"fontSrc": "/pageC/static/iconfont/iconfont.ttf",
 										"float": "left",
 										"text": "\ue6f2",
 										"color": "#303133",
@@ -709,7 +720,7 @@
 								},
 								// #endif
 								"buttons": [{
-										"fontSrc": "/static/iconfont/iconfont.ttf",
+										"fontSrc": "/pageC/static/iconfont/iconfont.ttf",
 										"float": "right",
 										"text": "\ue609",
 										"color": "#303133",
@@ -717,7 +728,7 @@
 									}
 									// #ifdef H5
 									, {
-										"fontSrc": "/static/iconfont/iconfont.ttf",
+										"fontSrc": "/pageC/static/iconfont/iconfont.ttf",
 										"float": "left",
 										"text": "\ue6f2",
 										"color": "#303133",

+ 1 - 3
unimall-app/pages/buy/transaction.vue

@@ -76,7 +76,7 @@
 			</view>
 		</view> -->
 		
-		<u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar>
+		<!-- <u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar> -->
 		<drag-button
 			:isDock="true"
 			:existTabBar="true"
@@ -107,7 +107,6 @@
 			};
 		},
 		onShow() {
-			uni.hideTabBar()
 			if(uni.getStorageSync("PageCur")){
 				this.PageCur = uni.getStorageSync("PageCur");
 			}
@@ -122,7 +121,6 @@
 			this.cateId = options.tid ? options.tid : 0;
 			this.keywords = options.keywords ? options.keywords : ''
 			this.loadData();
-			uni.hideTabBar()
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;

+ 1 - 3
unimall-app/pages/sale/information.vue

@@ -132,7 +132,7 @@
 			</view>
 			
 		</view>
-		<u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar>
+		<!-- <u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar> -->
 		<!-- <view v-if='scrollTop>100' class='goTop'><image src='../../static/top.png'  @click="goTop"></image></view> -->
 		
 		<!-- <u-back-top :scroll-top="scrollTop" tips="顶部" :custom-style="{backgroundColor: '#a0cfff',color: '#2979ff'}"
@@ -215,7 +215,6 @@
 		onReady() {
 		},
 		onShow() {
-			uni.hideTabBar()
 			if (uni.getStorageSync("PageCur")) {
 				this.PageCur = uni.getStorageSync("PageCur");
 			}
@@ -261,7 +260,6 @@
 			uni.removeStorage({
 				key: 'PageCur'
 			})
-			uni.hideTabBar()
 			// this.loadData() 
 		},
 		onPageScroll(e) {

+ 1 - 3
unimall-app/pages/tran/tran.vue

@@ -123,7 +123,7 @@
 			</view>
 		</view> -->
 		
-		<u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar>
+		<!-- <u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar> -->
 	</view>
 </template>
 
@@ -150,7 +150,6 @@
 				...mapState(['hasLogin','userInfo'])
 			},
 			onShow() {
-				uni.hideTabBar()
 				this.PageCur = "tran"
 				uni.setStorageSync('PageCur', this.PageCur);
 				this.loadData()
@@ -163,7 +162,6 @@
 				this.loadData()
 			},
 			onLoad() {
-				uni.hideTabBar()
 			},
 			// onPageScroll(e) {
 			// 	//兼容iOS端下拉时顶部漂移

+ 1 - 3
unimall-app/pages/user/user.vue

@@ -120,7 +120,7 @@
 			@btnClick="look"
 			/> -->
 			
-			<u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar>
+			<!-- <u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar> -->
     </view>  
 	
 </template>  
@@ -227,11 +227,9 @@
 		
 		onShow() {
 			console.log('myTip',this.myTip)
-			uni.hideTabBar()
 			this.loadData()
 		},
 		onLoad(){
-			uni.hideTabBar()
 		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {

二進制
unimall-app/static/img/jiaoyi.png


二進制
unimall-app/static/img/jiaoyi_check.png


二進制
unimall-app/static/img/wode.png


二進制
unimall-app/static/img/wode_check.png


二進制
unimall-app/static/img/wuliu.png


二進制
unimall-app/static/img/wuliu_check.png


二進制
unimall-app/static/img/zixun.png


二進制
unimall-app/static/img/zixun_check.png