经销存模块上线

components/header-bar/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="header-bar">
 		<view class="">
-			<uni-icons type="back" size="30"></uni-icons>
+			<uni-icons type="back" size="30" @click="backFn"></uni-icons>
 		</view>
 		<view class="text">
 			{{title || '导航'}}
@@ -25,6 +25,11 @@
 			}
 		},
 		methods:{
+			backFn(){
+				uni.navigateBack({
+						delta:1,//返回层数，2则上上页
+					})
+			},
 			toAdd(){
 				uni.navigateTo({
 					url:'/pages/supplyChain' + this.addUrl
@@ -40,7 +45,7 @@
 		line-height: 100rpx;
 		display: flex;
 		justify-content: space-between;
-		padding: 0 24rpx;
+		padding: 40rpx 24rpx 0;
 		background-color: #fff;
 	}
 </style>

pages.json

@@ -19,158 +19,184 @@
 		{
 			"path": "pages/supplyChain/warehouse/list",
 			"style": {
-				"navigationBarTitleText": "仓库维护"
+				"navigationBarTitleText": "仓库维护",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/warehouse/add",
 			"style": {
-				"navigationBarTitleText": "仓库维护添加"
+				"navigationBarTitleText": "仓库维护添加",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/product/list",
 			"style": {
-				"navigationBarTitleText": "产品列表"
+				"navigationBarTitleText": "产品列表",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/product/add",
 			"style": {
-				"navigationBarTitleText": "产品添加"
+				"navigationBarTitleText": "产品添加",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/material/list",
 			"style": {
-				"navigationBarTitleText": "物料维护"
+				"navigationBarTitleText": "物料维护",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/material/add",
 			"style": {
-				"navigationBarTitleText": "物料维护添加"
+				"navigationBarTitleText": "物料维护添加",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/classify/classify",
 			"style": {
-				"navigationBarTitleText": "分类维护"
+				"navigationBarTitleText": "分类维护",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/purchase/purchase",
 			"style": {
-				"navigationBarTitleText": "物料申购"
+				"navigationBarTitleText": "物料申购",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/purchase/add",
 			"style": {
-				"navigationBarTitleText": "物料申购添加"
+				"navigationBarTitleText": "物料申购添加",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/workOrder/list",
 			"style": {
-				"navigationBarTitleText": "工单列表"
+				"navigationBarTitleText": "工单列表",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/workOrder/add",
 			"style": {
-				"navigationBarTitleText": "工单详情"
+				"navigationBarTitleText": "工单详情",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/productionPlan/list",
 			"style": {
-				"navigationBarTitleText": "生产计划"
+				"navigationBarTitleText": "生产计划",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/productionPlan/add",
 			"style": {
-				"navigationBarTitleText": "计划详情"
+				"navigationBarTitleText": "计划详情",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/productionReport/list",
 			"style": {
-				"navigationBarTitleText": "生产报工"
+				"navigationBarTitleText": "生产报工",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/productionReport/add",
 			"style": {
-				"navigationBarTitleText": "生产报工详情"
+				"navigationBarTitleText": "生产报工详情",
+				"navigationStyle": "custom"
 			}
 		},
 		
 		{
 			"path": "pages/supplyChain/warehousing/list",
 			"style": {
-				"navigationBarTitleText": "完工入库"
+				"navigationBarTitleText": "完工入库",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/warehousing/add",
 			"style": {
-				"navigationBarTitleText": "完工入库详情"
+				"navigationBarTitleText": "完工入库详情",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/lineManagement/list",
 			"style": {
-				"navigationBarTitleText": "线边管理"
+				"navigationBarTitleText": "线边管理",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/lineManagement/details",
 			"style": {
-				"navigationBarTitleText": "线边管理详情"
+				"navigationBarTitleText": "线边管理详情",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/lineManagement/submit",
 			"style": {
-				"navigationBarTitleText": "线边管理提交"
+				"navigationBarTitleText": "线边管理提交", 
+				"navigationStyle": "custom" 
 			}
 		},
 		{
 			"path": "pages/supplyChain/sale/sale",
 			"style": {
-				"navigationBarTitleText": "销售订单"
+				"navigationBarTitleText": "销售订单",
+				"navigationStyle": "custom" 
 			}
 		},
 		{
 			"path": "pages/supplyChain/sale/add",
 			"style": {
-				"navigationBarTitleText": "销售订单新增"
+				"navigationBarTitleText": "销售订单新增",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/inOrOut/purchaseIn",
 			"style": {
-				"navigationBarTitleText": "采购入库"
+				"navigationBarTitleText": "采购入库",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/inOrOut/purchaseInAdd",
 			"style": {
-				"navigationBarTitleText": "采购入库添加"
+				"navigationBarTitleText": "采购入库添加",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/inOrOut/manualIn",
 			"style": {
-				"navigationBarTitleText": "手动入库"
+				"navigationBarTitleText": "手动入库",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/supplyChain/InventoryCount/list",
 			"style": {
-				"navigationBarTitleText": "库存盘点"
+				"navigationBarTitleText": "库存盘点",
+				"navigationStyle": "custom"
 			}
 		},
 		//im页面~~~~~~~~~~~~~~~~~~

unpackage/dist/dev/app-plus/app-view.js

@@ -2731,7 +2731,16 @@ var render = function () {
       _c(
         "uni-view",
         { attrs: { _i: 1 } },
-        [_c("uni-icons", { attrs: { _i: 2 } })],
+        [
+          _c("uni-icons", {
+            attrs: { _i: 2 },
+            on: {
+              click: function ($event) {
+                return _vm.$handleViewEvent($event)
+              },
+            },
+          }),
+        ],
         1
       ),
       _c("uni-view", { staticClass: _vm._$g(3, "sc"), attrs: { _i: 3 } }, [
@@ -2855,7 +2864,7 @@ if(false) {}
 var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ./node_modules/css-loader/dist/runtime/api.js */ 16);
 exports = ___CSS_LOADER_API_IMPORT___(false);
 // Module
-exports.push([module.i, ".header-bar[data-v-4753eed1] {\n  height: 100rpx;\n  line-height: 100rpx;\n  display: flex;\n  justify-content: space-between;\n  padding: 0 24rpx;\n  background-color: #fff;\n}\n", ""]);
+exports.push([module.i, ".header-bar[data-v-4753eed1] {\n  height: 100rpx;\n  line-height: 100rpx;\n  display: flex;\n  justify-content: space-between;\n  padding: 40rpx 24rpx 0;\n  background-color: #fff;\n}\n", ""]);
 // Exports
 module.exports = exports;
 

util/http.js

@@ -14,7 +14,7 @@ if (process.env.NODE_ENV === 'development') {
 /**
  * 封装get方法
  * @param url
- * @param data
+ * @param data 
  * @returns {Promise}
  */
 
@@ -75,7 +75,8 @@ export function post(url, req = {}, ) {
 			method: 'POST',
 			header: hander,
 			success: (res) => {
-				
+				console.log(BASE_URL + url)
+				console.log(res)
 				if (res.data.code == 401) {
 					uni.showToast({
 						icon: "error",