Explorar o código

新版app打包导航修改

asd26269546 %!s(int64=2) %!d(string=hai) anos
pai
achega
954cbeddec
Modificáronse 42 ficheiros con 224 adicións e 101 borrados
  1. 2 2
      components/commons-header/index.vue
  2. 38 6
      pages.json
  3. 28 0
      pages/equipment/jinxiaocun.vue
  4. 26 0
      pages/equipment/shengchang.vue
  5. BIN=BIN
      static/1.png
  6. BIN=BIN
      static/2.png
  7. BIN=BIN
      static/btn_jxc_blue.png
  8. BIN=BIN
      static/btn_jxc_gray.png
  9. BIN=BIN
      static/btn_sb_blue.png
  10. BIN=BIN
      static/btn_sb_gray.png
  11. BIN=BIN
      static/btn_sc_blue.png
  12. BIN=BIN
      static/btn_sc_gray.png
  13. BIN=BIN
      static/btn_xz_blue.png
  14. BIN=BIN
      static/btn_xz_gray.png
  15. 0 1
      unpackage/dist/build/app-plus/app-config-service.js
  16. 0 0
      unpackage/dist/build/app-plus/app-service.js
  17. 0 0
      unpackage/dist/build/app-plus/app-view.js
  18. 0 0
      unpackage/dist/build/app-plus/manifest.json
  19. BIN=BIN
      unpackage/dist/build/app-plus/static/1.png
  20. BIN=BIN
      unpackage/dist/build/app-plus/static/2.png
  21. BIN=BIN
      unpackage/dist/build/app-plus/static/btn_jxc_blue.png
  22. BIN=BIN
      unpackage/dist/build/app-plus/static/btn_jxc_gray.png
  23. BIN=BIN
      unpackage/dist/build/app-plus/static/btn_sb_blue.png
  24. BIN=BIN
      unpackage/dist/build/app-plus/static/btn_sb_gray.png
  25. BIN=BIN
      unpackage/dist/build/app-plus/static/btn_sc_blue.png
  26. BIN=BIN
      unpackage/dist/build/app-plus/static/btn_sc_gray.png
  27. BIN=BIN
      unpackage/dist/build/app-plus/static/btn_xz_blue.png
  28. BIN=BIN
      unpackage/dist/build/app-plus/static/btn_xz_gray.png
  29. 0 1
      unpackage/dist/dev/app-plus/app-config-service.js
  30. 0 0
      unpackage/dist/dev/app-plus/app-service.js
  31. 130 91
      unpackage/dist/dev/app-plus/app-view.js
  32. 0 0
      unpackage/dist/dev/app-plus/manifest.json
  33. BIN=BIN
      unpackage/dist/dev/app-plus/static/1.png
  34. BIN=BIN
      unpackage/dist/dev/app-plus/static/2.png
  35. BIN=BIN
      unpackage/dist/dev/app-plus/static/btn_jxc_blue.png
  36. BIN=BIN
      unpackage/dist/dev/app-plus/static/btn_jxc_gray.png
  37. BIN=BIN
      unpackage/dist/dev/app-plus/static/btn_sb_blue.png
  38. BIN=BIN
      unpackage/dist/dev/app-plus/static/btn_sb_gray.png
  39. BIN=BIN
      unpackage/dist/dev/app-plus/static/btn_sc_blue.png
  40. BIN=BIN
      unpackage/dist/dev/app-plus/static/btn_sc_gray.png
  41. BIN=BIN
      unpackage/dist/dev/app-plus/static/btn_xz_blue.png
  42. BIN=BIN
      unpackage/dist/dev/app-plus/static/btn_xz_gray.png

+ 2 - 2
components/commons-header/index.vue

@@ -3,7 +3,7 @@
 		<view class="header-banner">
 			<view class="back">
 				
-				<i class="iconfont"  @click="backFn" style="font-size: 30rpx;">&#xe6c5;</i>
+				<!-- <i class="iconfont"  @click="backFn" style="font-size: 30rpx;">&#xe6c5;</i> -->
 				
 			</view>
 			<view class="center-title">
@@ -68,7 +68,7 @@
 		props:{
 			title:{
 				type:String,
-			}
+			},
 		},
 		data(){
 			return {

+ 38 - 6
pages.json

@@ -70,6 +70,20 @@
 			}
 		},
 		{
+			"path": "pages/equipment/shengchang",
+			"style": {
+				"navigationBarTitleText": "生产",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/equipment/jinxiaocun",
+			"style": {
+				"navigationBarTitleText": "进销存",
+				"navigationStyle": "custom"
+			}
+		},
+		{
 			"path": "pages/equipment/sterilization",
 			"style": {
 				"navigationBarTitleText": "注塑机",
@@ -149,7 +163,7 @@
 		"color": "#333333",
 		"selectedColor": "#3370FF",
 		"backgroundColor": "#fff",
-		"borderStyle": "white",
+		"borderStyle": "black",
 
 		"list": [
 			// {
@@ -167,16 +181,34 @@
 			},
 			{
 				"pagePath": "pages/im/im",
-				"text": "通讯录",
+				"text": "协作",
+				"iconPath": "static/btn_sc_gray.png",
+				"selectedIconPath": "static/btn_sc_blue.png"
+			},
+			{
+				"pagePath": "pages/equipment/shengchang",
+				"text": "生产",
 				"iconPath": "static/btn_shengc_gray.png",
 				"selectedIconPath": "static/btn_shengc_blue.png"
 			},
 			{
-				"pagePath": "pages/user/user",
-				"text": "我的",
-				"iconPath": "static/btn_mine_gray.png",
-				"selectedIconPath": "static/btn_mine_blue.png"
+				"pagePath": "pages/equipment/jinxiaocun",
+				"text": "进销存",
+				"iconPath": "static/btn_jxc_gray.png",
+				"selectedIconPath": "static/btn_jxc_blue.png"
 			}
+			// {
+			// 	"pagePath": "pages/im/im",
+			// 	"text": "通讯录",
+			// 	"iconPath": "static/btn_shengc_gray.png",
+			// 	"selectedIconPath": "static/btn_shengc_blue.png"
+			// },
+			// {
+			// 	"pagePath": "pages/user/user",
+			// 	"text": "我的",
+			// 	"iconPath": "static/btn_mine_gray.png",
+			// 	"selectedIconPath": "static/btn_mine_blue.png"
+			// }
 		]
 	},
 	"globalStyle": {

+ 28 - 0
pages/equipment/jinxiaocun.vue

@@ -0,0 +1,28 @@
+<template>
+	<view class="">
+		<commons-header title="进销存"></commons-header>
+		<view class="shengchang">
+			<image src="../../static/1.png" mode="widthFix"></image>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	import commonsHeader from '../../components/commons-header/index.vue'
+	export default {
+		components:{
+			commonsHeader
+		},
+	}
+</script>
+
+<style>
+	.shengchang{
+		padding: 40rpx 30rpx;
+		margin-top: 100rpx;
+		image{
+			width: 100%;
+		}
+	}
+</style>

+ 26 - 0
pages/equipment/shengchang.vue

@@ -0,0 +1,26 @@
+<template>
+	<view class="">
+		<commons-header title="生产"></commons-header>
+		<view class="shengchang">
+			<image src="../../static/2.png" mode="widthFix"></image>
+		</view>
+	</view>
+</template>
+<script>
+	import commonsHeader from '../../components/commons-header/index.vue'
+	export default {
+		components:{
+			commonsHeader
+		},
+	}
+</script>
+
+<style>
+	.shengchang{
+		padding: 40rpx 30rpx;
+		margin-top: 100rpx;
+		image{
+			width: 100%;
+		}
+	}
+</style>

BIN=BIN
static/1.png


BIN=BIN
static/2.png


BIN=BIN
static/btn_jxc_blue.png


BIN=BIN
static/btn_jxc_gray.png


BIN=BIN
static/btn_sb_blue.png


BIN=BIN
static/btn_sb_gray.png


BIN=BIN
static/btn_sc_blue.png


BIN=BIN
static/btn_sc_gray.png


BIN=BIN
static/btn_xz_blue.png


BIN=BIN
static/btn_xz_gray.png


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
unpackage/dist/build/app-plus/app-config-service.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/build/app-plus/app-service.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/build/app-plus/app-view.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/build/app-plus/manifest.json


BIN=BIN
unpackage/dist/build/app-plus/static/1.png


BIN=BIN
unpackage/dist/build/app-plus/static/2.png


BIN=BIN
unpackage/dist/build/app-plus/static/btn_jxc_blue.png


BIN=BIN
unpackage/dist/build/app-plus/static/btn_jxc_gray.png


BIN=BIN
unpackage/dist/build/app-plus/static/btn_sb_blue.png


BIN=BIN
unpackage/dist/build/app-plus/static/btn_sb_gray.png


BIN=BIN
unpackage/dist/build/app-plus/static/btn_sc_blue.png


BIN=BIN
unpackage/dist/build/app-plus/static/btn_sc_gray.png


BIN=BIN
unpackage/dist/build/app-plus/static/btn_xz_blue.png


BIN=BIN
unpackage/dist/build/app-plus/static/btn_xz_gray.png


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
unpackage/dist/dev/app-plus/app-config-service.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 130 - 91
unpackage/dist/dev/app-plus/app-view.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


BIN=BIN
unpackage/dist/dev/app-plus/static/1.png


BIN=BIN
unpackage/dist/dev/app-plus/static/2.png


BIN=BIN
unpackage/dist/dev/app-plus/static/btn_jxc_blue.png


BIN=BIN
unpackage/dist/dev/app-plus/static/btn_jxc_gray.png


BIN=BIN
unpackage/dist/dev/app-plus/static/btn_sb_blue.png


BIN=BIN
unpackage/dist/dev/app-plus/static/btn_sb_gray.png


BIN=BIN
unpackage/dist/dev/app-plus/static/btn_sc_blue.png


BIN=BIN
unpackage/dist/dev/app-plus/static/btn_sc_gray.png


BIN=BIN
unpackage/dist/dev/app-plus/static/btn_xz_blue.png


BIN=BIN
unpackage/dist/dev/app-plus/static/btn_xz_gray.png


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio