lilei hace 3 años
padre
commit
e26776e44f

+ 6 - 2
App.vue

@@ -2,7 +2,7 @@
 	export default {
 	export default {
 		globalData: {
 		globalData: {
 			// baseUrl: 'http://192.168.16.155:7003/clzwx/', // 本地
 			// baseUrl: 'http://192.168.16.155:7003/clzwx/', // 本地
-			baseUrl: 'https://wx.test.chelingzhu.com/clzwx/', // 预发布
+			baseUrl: 'http://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://wx.chelingzhu.com/clzwx/' // 生产
 			// baseUrl: 'https://wx.chelingzhu.com/clzwx/' // 生产
 		},
 		},
 		onLaunch: function() {
 		onLaunch: function() {
@@ -22,9 +22,13 @@
 	@import "/static/iconfont/iconfont.css";
 	@import "/static/iconfont/iconfont.css";
 	/*每个页面公共css */
 	/*每个页面公共css */
 	page {
 	page {
+		width: 100%;
 		min-height: 100%;
 		min-height: 100%;
 		display: flex;
 		display: flex;
-		background: #fff;
+		background: #f8f8f8;
+		> view{
+			width: 100%;
+		}
 	}
 	}
 
 
 	/* #ifdef MP-BAIDU */
 	/* #ifdef MP-BAIDU */

+ 15 - 9
api/request.js

@@ -11,13 +11,23 @@ function request(options) {
     };
     };
 	const baseUrl = getApp().globalData.baseUrl
 	const baseUrl = getApp().globalData.baseUrl
     Object.assign(_obj, options);
     Object.assign(_obj, options);
-    _obj.header['X-AUTH-TOKEN'] = uni.getStorageSync('token');
-    _obj.header['X-HEADER-APPID'] = 'WuyoKG1AcDZzLwxfhOAC+E16SeG3+mDqVYmsa/e5HRE=';
+    // _obj.header['X-AUTH-TOKEN'] = uni.getStorageSync('token');
+    // _obj.header['X-HEADER-APPID'] = 'WuyoKG1AcDZzLwxfhOAC+E16SeG3+mDqVYmsa/e5HRE=';
+	
+	const header = {
+			'USER-TERM-TYPE': 'ipad', // 支付时需要用到 与pad一致
+			'App-Type': 2,
+			'Version': '',
+			'authorization':'Bearer clz|eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxNTA5MTMzMDAwMCIsImF1dGhfdXNlciI6eyJ1c2VyU24iOiIxMDc1OSIsInVzZXJpZCI6IjEwNzU5IiwidXNlcm5hbWUiOiIxNTA5MTMzMDAwMCIsInVzZXJUeXBlIjoiMiIsIm1lcmNoYW50SWQiOiIxMDA0MCIsIm1lcmNoYW50U24iOiIxMDA0MCIsIm9yZ0lkIjoiMTAwMDAiLCJvcmdTbiI6IjEwMDAwIiwib3JnTmFtZSI6Iui9pumihuS4u-aAu-mDqOmXqOW6lyIsIm9yZ1N0YXR1cyI6IjEiLCJvcmdFeHBpcmVEYXRlIjoiMjA5OS0wMS0wMSIsIm9yZ1RoZW1lVHlwZSI6ImNoZWxpbmd6aHUiLCJyb290T3JnSWQiOiIxMDAwMCIsInJvb3RPcmdTbiI6IjEwMDAwIiwicm9vdE9yZ05hbWUiOiLovabpoobkuLsiLCJyb290T3JnRXhwaXJlRGF0ZSI6IjIwOTktMDEtMDEiLCJyb290T3JnVGhlbWVUeXBlIjoiY2hlbGluZ3podSIsInJvb3RPcmdTdGF0dXMiOiIxIiwib3JnVHlwZSI6ImxzIiwic2NvcGVUeXBlIjoiYWxsIiwicm9vdE1lbnVNb3VsZElkIjoiMiIsIm9yZ01lbnVNb3VsZElkIjoiMiIsInN1cGVyQWRtaW4iOiIwIiwidXNlck5hbWVDTiI6IuW8oOS4ieS6miIsIm1vYmlsZSI6IjE1MDkxMzMwMDAwIiwiZW1haWwiOm51bGwsInNleCI6IjEiLCJwYXNzd29yZCI6ImZmMDNjYWI5MjBmMmFjN2I4NzUyNWNmMzhhMjIyMTlmZTAyNjlmMjRkZjhiMWVhNWQ1OGFiNTk5Iiwic2FsdCI6bnVsbCwiYXV0aG9yaXRpZXMiOm51bGwsInBlcm1Db2RlcyI6bnVsbCwiYWNsTWFwIjpudWxsLCJhY2NvdW50Tm9uRXhwaXJlZCI6dHJ1ZSwiYWNjb3VudE5vbkxvY2tlZCI6dHJ1ZSwiY3JlZGVudGlhbHNOb25FeHBpcmVkIjp0cnVlLCJlbmFibGVkIjp0cnVlLCJhcHBOYW1lIjpudWxsLCJleHRlbmRJbmZvIjpudWxsLCJleHRJbmZvIjp7fSwic291cmNlRmxhZyI6bnVsbCwiY2xpZW50VHlwZSI6bnVsbCwibXVzdENoYW5nZVB3ZCI6bnVsbCwiZXhwZWN0VHJ1c3QiOmZhbHNlfSwic2NvcGUiOlsiYWxsIl0sImV4cCI6MTY1MzcxODA2NiwianRpIjoiNTBlMzE5ZTktZTg1MC00NGU2LWE1OTItODkyNzk4OTA3MjZjIiwiY2xpZW50X2lkIjoiY2xpZW50X3Bhc3N3b3JkIiwic3RhdHVzIjoiMjAwIn0.zeyKjVatzDT9fnw_c6x0CzQWORbxEcNg486qy5rsYvk'
+	}
+	_obj.header = header
+	_obj.header['X-HEADER-APPID'] = 'WuyoKG1AcDZzLwxfhOAC+E16SeG3+mDqVYmsa/e5HRE=';
+	
     _obj.url = baseUrl + _obj.url;
     _obj.url = baseUrl + _obj.url;
     _obj.method = _obj.method.toUpperCase();
     _obj.method = _obj.method.toUpperCase();
     _obj.success = function(res) {
     _obj.success = function(res) {
       if (_obj.url.indexOf('checkLogin') > -1) {
       if (_obj.url.indexOf('checkLogin') > -1) {
-        resolve(res);
+        resolve(res.data);
       } else if (res.data.status === '900010') {
       } else if (res.data.status === '900010') {
         setTimeout(function() {
         setTimeout(function() {
           wx.showToast({
           wx.showToast({
@@ -35,7 +45,7 @@ function request(options) {
 		  mpvue.reLaunch({ url });
 		  mpvue.reLaunch({ url });
 		}, 1000);
 		}, 1000);
       } else {
       } else {
-        resolve(res);
+        resolve(res.data);
       }
       }
     };
     };
     _obj.fail = function(err) {
     _obj.fail = function(err) {
@@ -52,11 +62,7 @@ function getRoutePath() {
   let url = currentPage.route; // 当前页面url
   let url = currentPage.route; // 当前页面url
   const options = objToUrl(currentPage.options); // 如果要获取url中所带的参数可以查看options
   const options = objToUrl(currentPage.options); // 如果要获取url中所带的参数可以查看options
   const lanuch = [
   const lanuch = [
-    'pages/personCenter/personCenter',
-    'pages/myPackage/myPackage',
-    'pagesMe/personData/personData',
-    'pages/packageDetail/packageDetail',
-	'pages/chooseCar/chooseCar'
+    'pages/personData/personData'
   ].includes(url);
   ].includes(url);
   url = '/' + url;
   url = '/' + url;
   if (options.length) {
   if (options.length) {

+ 25 - 25
api/shelf.js

@@ -1,22 +1,22 @@
-import axios from '@/libs/axios.js'
+import request from './request';
 
 
 // 查詢門店是否支持数字货架
 // 查詢門店是否支持数字货架
 export const findStoreShelf = (params) => {
 export const findStoreShelf = (params) => {
-  return axios.request({
+  return request({
     url: `shelf/findStoreShelf`,
     url: `shelf/findStoreShelf`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
 // vin 查询 车型code
 // vin 查询 车型code
 export const queryPartCodeByVin = (params) => {
 export const queryPartCodeByVin = (params) => {
-  return axios.request({
+  return request({
     url: `vinPart/queryPartCodeByVin/${params.vinNumber}`,
     url: `vinPart/queryPartCodeByVin/${params.vinNumber}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
 //数字货架适配vin不分页
 //数字货架适配vin不分页
 export const getShelfQueryList = (params) => {
 export const getShelfQueryList = (params) => {
-  return axios.request({
+  return request({
     url: `shelfProduct/queryList`,
     url: `shelfProduct/queryList`,
     data: params,
     data: params,
     method: 'post'
     method: 'post'
@@ -24,7 +24,7 @@ export const getShelfQueryList = (params) => {
 }
 }
 //数字货架产品分页
 //数字货架产品分页
 export const getShelfProductList = (params) => {
 export const getShelfProductList = (params) => {
-  return axios.request({
+  return request({
     url: `shelfProduct/queryPage/${params.pageNo}/${params.pageSize}`,
     url: `shelfProduct/queryPage/${params.pageNo}/${params.pageSize}`,
     data: params,
     data: params,
     method: 'post'
     method: 'post'
@@ -32,7 +32,7 @@ export const getShelfProductList = (params) => {
 }
 }
 //数字货架产品类型查询
 //数字货架产品类型查询
 export const getShelfProductType = (params) => {
 export const getShelfProductType = (params) => {
-  return axios.request({
+  return request({
     url: `shelfProductType/queryList`,
     url: `shelfProductType/queryList`,
     data: params,
     data: params,
     method: 'post'
     method: 'post'
@@ -40,7 +40,7 @@ export const getShelfProductType = (params) => {
 }
 }
 // 数字货架订单分页查询
 // 数字货架订单分页查询
 export const getShelfOrderList = (params) => {
 export const getShelfOrderList = (params) => {
-  return axios.request({
+  return request({
     url: `shelfOrder/queryPage/${params.pageNo}/${params.pageSize}`,
     url: `shelfOrder/queryPage/${params.pageNo}/${params.pageSize}`,
     data: params,
     data: params,
     method: 'post'
     method: 'post'
@@ -48,7 +48,7 @@ export const getShelfOrderList = (params) => {
 }
 }
 // 保存数字货架订单
 // 保存数字货架订单
 export const saveShelfOrder = (params) => {
 export const saveShelfOrder = (params) => {
-  return axios.request({
+  return request({
     url: `shelfOrder/save`,
     url: `shelfOrder/save`,
     data: params,
     data: params,
     method: 'post'
     method: 'post'
@@ -56,28 +56,28 @@ export const saveShelfOrder = (params) => {
 }
 }
 // 关闭订单
 // 关闭订单
 export const cancelShelfOrder = (params) => {
 export const cancelShelfOrder = (params) => {
-  return axios.request({
+  return request({
     url: `shelfOrder/cancel/${params.sn}`,
     url: `shelfOrder/cancel/${params.sn}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
 // 数字货架取货单详情
 // 数字货架取货单详情
 export const findBySnShelfOrder = (params) => {
 export const findBySnShelfOrder = (params) => {
-  return axios.request({
+  return request({
     url: `shelfOrder/findBySn/${params.sn}`,
     url: `shelfOrder/findBySn/${params.sn}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
 // 确认取货
 // 确认取货
 export const outShelfOrder = (params) => {
 export const outShelfOrder = (params) => {
-  return axios.request({
+  return request({
     url: `shelfOrder/out/${params.sn}`,
     url: `shelfOrder/out/${params.sn}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
 // 扫码确认
 // 扫码确认
 export const scanConfirmShelfOrder = (params) => {
 export const scanConfirmShelfOrder = (params) => {
-  return axios.request({
+  return request({
     url: `shelfOrder/scanConfirm`,
     url: `shelfOrder/scanConfirm`,
 	data: params,
 	data: params,
     method: 'post'
     method: 'post'
@@ -85,14 +85,14 @@ export const scanConfirmShelfOrder = (params) => {
 }
 }
 // 待结算列表-按月结算
 // 待结算列表-按月结算
 export const waitSettleForMonth = (params) => {
 export const waitSettleForMonth = (params) => {
-  return axios.request({
+  return request({
     url: `shelfOrder/waitSettleForMonth`,
     url: `shelfOrder/waitSettleForMonth`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
 // 待结算列表-授信结算
 // 待结算列表-授信结算
 export const waitSettleForSx = (params) => {
 export const waitSettleForSx = (params) => {
-  return axios.request({
+  return request({
     url: `shelfOrder/waitSettleForSx/${params.shelfOrderState}`,
     url: `shelfOrder/waitSettleForSx/${params.shelfOrderState}`,
     method: 'get'
     method: 'get'
   })
   })
@@ -100,7 +100,7 @@ export const waitSettleForSx = (params) => {
 
 
 // 数字货架结算单分页查询
 // 数字货架结算单分页查询
 export const getShelfSettleBillList = (params) => {
 export const getShelfSettleBillList = (params) => {
-  return axios.request({
+  return request({
     url: `shelfSettleBill/queryPage/${params.pageNo}/${params.pageSize}`,
     url: `shelfSettleBill/queryPage/${params.pageNo}/${params.pageSize}`,
     data: params,
     data: params,
     method: 'post'
     method: 'post'
@@ -109,14 +109,14 @@ export const getShelfSettleBillList = (params) => {
 
 
 // 结算是否支付成功
 // 结算是否支付成功
 export const shelfSettleBillPaySuccess = (params) => {
 export const shelfSettleBillPaySuccess = (params) => {
-  return axios.request({
+  return request({
     url: `shelfSettleBill/isPay/${params.orderNo}`,
     url: `shelfSettleBill/isPay/${params.orderNo}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
 // 数字货架结算单去支付
 // 数字货架结算单去支付
 export const shelfSettleBillToPay = (params) => {
 export const shelfSettleBillToPay = (params) => {
-  return axios.request({
+  return request({
     url: `shelfSettleBill/toPay`,
     url: `shelfSettleBill/toPay`,
     data: params,
     data: params,
     method: 'post'
     method: 'post'
@@ -125,7 +125,7 @@ export const shelfSettleBillToPay = (params) => {
 
 
 // 保证金是否支付成功
 // 保证金是否支付成功
 export const shelfBondRecordPaySuccess = (params) => {
 export const shelfBondRecordPaySuccess = (params) => {
-  return axios.request({
+  return request({
     url: `shelfBondRecord/isPay/${params.orderNo}`,
     url: `shelfBondRecord/isPay/${params.orderNo}`,
     method: 'get'
     method: 'get'
   })
   })
@@ -133,7 +133,7 @@ export const shelfBondRecordPaySuccess = (params) => {
 
 
 //保证金去支付
 //保证金去支付
 export const shelfBondRecordToPay = (params) => {
 export const shelfBondRecordToPay = (params) => {
-  return axios.request({
+  return request({
     url: `shelfBondRecord/toPay`,
     url: `shelfBondRecord/toPay`,
 	data: params,
 	data: params,
     method: 'post'
     method: 'post'
@@ -141,7 +141,7 @@ export const shelfBondRecordToPay = (params) => {
 }
 }
 // 待支付保证金
 // 待支付保证金
 export const shelfBondRecordWaitPayRecord = (params) => {
 export const shelfBondRecordWaitPayRecord = (params) => {
-  return axios.request({
+  return request({
     url: `shelfBondRecord/waitPayRecord`,
     url: `shelfBondRecord/waitPayRecord`,
     data: params,
     data: params,
     method: 'post'
     method: 'post'
@@ -149,7 +149,7 @@ export const shelfBondRecordWaitPayRecord = (params) => {
 }
 }
 // 查詢門店数字数字货架
 // 查詢門店数字数字货架
 export const findStoreShelfSettleRule = (params) => {
 export const findStoreShelfSettleRule = (params) => {
-  return axios.request({
+  return request({
     url: `shelf/settleRule/findStoreShelfSettleRule`,
     url: `shelf/settleRule/findStoreShelfSettleRule`,
     method: 'get'
     method: 'get'
   })
   })
@@ -157,7 +157,7 @@ export const findStoreShelfSettleRule = (params) => {
 
 
 // 补货入库列表
 // 补货入库列表
 export const getShelfReplenishBilllList = (params) => {
 export const getShelfReplenishBilllList = (params) => {
-  return axios.request({
+  return request({
     url: `shelfReplenishBill/queryPage/${params.pageNo}/${params.pageSize}`,
     url: `shelfReplenishBill/queryPage/${params.pageNo}/${params.pageSize}`,
     data: params,
     data: params,
     method: 'post'
     method: 'post'
@@ -165,7 +165,7 @@ export const getShelfReplenishBilllList = (params) => {
 }
 }
 // 补货入库详情
 // 补货入库详情
 export const findShelfReplenishBill = (params) => {
 export const findShelfReplenishBill = (params) => {
-  return axios.request({
+  return request({
     url: `shelfReplenishBill/findBySn/${params.sn}`,
     url: `shelfReplenishBill/findBySn/${params.sn}`,
     method: 'get'
     method: 'get'
   })
   })
@@ -173,7 +173,7 @@ export const findShelfReplenishBill = (params) => {
 
 
 // 临时补货保存
 // 临时补货保存
 export const shelfTemporarySave = (params) => {
 export const shelfTemporarySave = (params) => {
-  return axios.request({
+  return request({
     url: `shelfTemporaryDispatching/save`,
     url: `shelfTemporaryDispatching/save`,
 	data: params,
 	data: params,
     method: 'post'
     method: 'post'
@@ -182,7 +182,7 @@ export const shelfTemporarySave = (params) => {
 
 
 // 取货列表数量合计
 // 取货列表数量合计
 export const shelfGetTotalWaitQty = (params) => {
 export const shelfGetTotalWaitQty = (params) => {
-  return axios.request({
+  return request({
     url: `shelfOrder/getTotalWaitQty`,
     url: `shelfOrder/getTotalWaitQty`,
 	data: params,
 	data: params,
     method: 'post'
     method: 'post'

+ 2 - 2
pages.json

@@ -139,7 +139,7 @@
 		    "path" : "pages/digitalShelf/orderList",
 		    "path" : "pages/digitalShelf/orderList",
 		    "style" :                                                                                    
 		    "style" :                                                                                    
 		    {
 		    {
-		        "navigationBarTitleText": "扫码取货",
+		        "navigationBarTitleText": "货架订单",
 		        "enablePullDownRefresh": false
 		        "enablePullDownRefresh": false
 		    }
 		    }
 		}
 		}
@@ -147,7 +147,7 @@
 		    "path" : "pages/digitalShelf/orderDetail",
 		    "path" : "pages/digitalShelf/orderDetail",
 		    "style" :                                                                                    
 		    "style" :                                                                                    
 		    {
 		    {
-		        "navigationBarTitleText": "取货单详情",
+		        "navigationBarTitleText": "单详情",
 		        "enablePullDownRefresh": false
 		        "enablePullDownRefresh": false
 		    }
 		    }
 		    
 		    

+ 10 - 10
pages/digitalShelf/orderDetail.vue

@@ -4,7 +4,7 @@
 			<view class="statusH">
 			<view class="statusH">
 				<view class="flex flex_column align_center">
 				<view class="flex flex_column align_center">
 					<view class="status-row">
 					<view class="status-row">
-						<u-icon :name="statusIcon" size="42" color="#fff"> 
+						<u-icon :name="statusIcon" size="42" color="#333"> 
 						</u-icon>
 						</u-icon>
 						<text>{{statusText}}</text>
 						<text>{{statusText}}</text>
 					</view>
 					</view>
@@ -93,9 +93,9 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<view class="footer flex align-center" v-if="info">
-			<u-button v-if="info.billState != 'CLOSE'&&info.settleState=='WAIT'" :throttle-time="100" @click="deleteRow" shape="circle" type="info">关闭取货单</u-button>
-			<u-button v-if="info.billState == 'WAIT'" :throttle-time="100" @click="sanCodeRow" :style="{background:'#1283d4',color:'#fff'}" shape="circle" type="success">扫码取货</u-button>
+		<view class="footer flex align_center justify_center" v-if="info">
+			<u-button v-if="info.billState != 'CLOSE'&&info.settleState=='WAIT'" :throttle-time="100" @click="deleteRow" shape="circle" type="info">取消订单</u-button>
+			<u-button v-if="info.billState == 'WAIT'" :throttle-time="100" @click="sanCodeRow" :custom-style="{background:'#1283d4',color:'#fff'}" shape="circle" type="success">扫码取货</u-button>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
@@ -179,7 +179,7 @@
 						  this.statusMessage = ''
 						  this.statusMessage = ''
 					  }
 					  }
 					  if(this.info.billState == 'CLOSE'){
 					  if(this.info.billState == 'CLOSE'){
-						  this.statusText = '已关闭'
+						  this.statusText = '已取消'
 						  this.statusIcon = 'close-circle'
 						  this.statusIcon = 'close-circle'
 						  this.statusMessage = ''
 						  this.statusMessage = ''
 					  }
 					  }
@@ -199,12 +199,12 @@
 		  		this.message(res.message)
 		  		this.message(res.message)
 		  	})
 		  	})
 		  },
 		  },
-		  // 确认关闭取货单
+		  // 确认取消取货单
 		  deleteRow () {
 		  deleteRow () {
 		    let _this = this
 		    let _this = this
 		    clzConfirm({
 		    clzConfirm({
 		  		title: '提示',
 		  		title: '提示',
-		  		content: '确认关闭取货单吗?',
+		  		content: '确认取消取货单吗?',
 		  		success: (ret) => {
 		  		success: (ret) => {
 		  		  if(ret.confirm||ret.index==0){
 		  		  if(ret.confirm||ret.index==0){
 		  			  _this.delOrder()
 		  			  _this.delOrder()
@@ -286,7 +286,6 @@
 		}
 		}
 		.contHead {
 		.contHead {
 			background-color: white;
 			background-color: white;
-			margin-top: -20rpx;
 			.statusH{
 			.statusH{
 				> view{
 				> view{
 					padding: 10upx 12%;
 					padding: 10upx 12%;
@@ -411,13 +410,14 @@
 		.footer{
 		.footer{
 			padding: 20upx 60upx;
 			padding: 20upx 60upx;
 			background: #FFFFFF;
 			background: #FFFFFF;
-			uni-button{
+			button{
 				&:after{
 				&:after{
 					border: 0;
 					border: 0;
 				}
 				}
-				width: 45%;
 				color: #585858;
 				color: #585858;
 				font-size: 32rpx;
 				font-size: 32rpx;
+				margin: 0 20rpx;
+				width: 320rpx;
 			}
 			}
 		}
 		}
 	}
 	}

+ 4 - 4
pages/digitalShelf/orderList.vue

@@ -41,7 +41,7 @@
 										 {{item.totalQty}}件商品
 										 {{item.totalQty}}件商品
 									 </view>
 									 </view>
 									 <view style="text-align: right;">
 									 <view style="text-align: right;">
-										 <button :hover-stop-propagation="true" @click.stop="deleteRow(item,index)" v-if="item.billState != 'CLOSE'&&item.settleState=='WAIT'" class="action del" size="mini">关闭取货单</button>
+										 <button :hover-stop-propagation="true" @click.stop="deleteRow(item,index)" v-if="item.billState != 'CLOSE'&&item.settleState=='WAIT'" class="action del" size="mini">取消订单</button>
 										 <button :hover-stop-propagation="true" @click.stop="sanCodeRow(item)" v-if="item.billState == 'WAIT'" class="action finish" size="mini">扫码取货</button>
 										 <button :hover-stop-propagation="true" @click.stop="sanCodeRow(item)" v-if="item.billState == 'WAIT'" class="action finish" size="mini">扫码取货</button>
 									 </view>
 									 </view>
 								 </view>
 								 </view>
@@ -82,7 +82,7 @@
 						count: 0
 						count: 0
 					  },
 					  },
 					  {
 					  {
-					    dispName: '已关闭',
+					    dispName: '已取消',
 					  	typeId: 3,
 					  	typeId: 3,
 						count: 0
 						count: 0
 					  },
 					  },
@@ -234,12 +234,12 @@
 					this.message(res.data.message)
 					this.message(res.data.message)
 				})
 				})
 			},
 			},
-			// 确认关闭取货单
+			// 确认取消取货单
 			deleteRow (params,index) {
 			deleteRow (params,index) {
 			  let _this = this
 			  let _this = this
 			  clzConfirm({
 			  clzConfirm({
 					title: '提示',
 					title: '提示',
-					content: '确认关闭取货单吗?',
+					content: '确认取消订单吗?',
 					success: (ret) => {
 					success: (ret) => {
 					  if(ret.confirm||ret.index==0){
 					  if(ret.confirm||ret.index==0){
 						  _this.delOrder(params.shelfOrderSn,index)
 						  _this.delOrder(params.shelfOrderSn,index)

+ 15 - 12
pages/digitalShelf/stockPut.vue

@@ -8,6 +8,7 @@
 				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, indexs) in tabList" :key="indexs">
 					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, indexs) in tabList" :key="indexs">
 						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
 						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+							<view style="height: 20rpx;" ></view>
 							<view  
 							<view  
 							class="check-order-list" 
 							class="check-order-list" 
 							v-for="(item,index) in list" 
 							v-for="(item,index) in list" 
@@ -26,20 +27,19 @@
 											  {{item.dealerName||'--'}}
 											  {{item.dealerName||'--'}}
 										  </view>
 										  </view>
 										  <view class="carVin" v-if="item.billState=='WAIT_CHECK'">
 										  <view class="carVin" v-if="item.billState=='WAIT_CHECK'">
-											  待入库数量:<text>{{item.totalConfirmQty||item.totalConfirmQty==0?item.totalConfirmQty:'--'}}</text>
+											待入库数量:<text>{{item.totalConfirmQty||item.totalConfirmQty==0?item.totalConfirmQty:'--'}}</text>
 										  </view>
 										  </view>
 										  <view class="carVin" v-if="item.billState=='FINISH'">
 										  <view class="carVin" v-if="item.billState=='FINISH'">
-										  											  已入库数量:<text>{{item.totalPutQty||item.totalPutQty==0?item.totalPutQty:'--'}}</text>
+										  	已入库数量:<text>{{item.totalPutQty||item.totalPutQty==0?item.totalPutQty:'--'}}</text>
 										  </view>
 										  </view>
 									 </view>
 									 </view>
 									 <view>
 									 <view>
 									 	<button  :hover-stop-propagation="true" @click.stop="viewRow(item)"  class="action finish" size="mini">查看详情</button>
 									 	<button  :hover-stop-propagation="true" @click.stop="viewRow(item)"  class="action finish" size="mini">查看详情</button>
-									 	<!-- <button v-if="swiperCurrent==0" :hover-stop-propagation="true" @click.stop="toPut(item)" class="action finish" size="mini">立即入库</button> -->
 									 </view>
 									 </view>
 								 </view>
 								 </view>
 							 </view>
 							 </view>
-							 <u-empty :src="`/static/def_imgs.png`" icon-size="240" :text="noDataText" img-width="120" v-if="list.length==0 && status!='loading'" mode="list"></u-empty>
-							 <view style="padding: 20upx;">
+							 <u-empty :src="`/static/def_imgs.png`" icon-size="150" :text="noDataText" img-width="120" v-if="list.length==0 && status!='loading'" mode="list"></u-empty>
+							 <view style="padding:0 30upx 30upx;">
 								 <u-loadmore v-if="(total>=list.length&&list.length)||status=='loading'" :status="status" />
 								 <u-loadmore v-if="(total>=list.length&&list.length)||status=='loading'" :status="status" />
 							 </view>
 							 </view>
 						</scroll-view>
 						</scroll-view>
@@ -224,22 +224,25 @@
 
 
 <style lang="scss">
 <style lang="scss">
 	page{
 	page{
-		height: 100%;
+		height: 100vh;
+		background-color: #F8F8F8;
 	}
 	}
 	.digitShelf-pagesCons{
 	.digitShelf-pagesCons{
 		width: 100%;
 		width: 100%;
-		height: 100%;
-		display: flex;
-		flex-direction: column;
+		height: 100vh;
 		.tab-body{
 		.tab-body{
+			width: 100%;
+			height: 100vh;
+			display: flex;
+			flex-direction: column;
 			.check-list{
 			.check-list{
 				height: calc(100vh - 44px);
 				height: calc(100vh - 44px);
 			}
 			}
 			.check-order-list{
 			.check-order-list{
 				background: #ffffff;
 				background: #ffffff;
 				padding: 10upx 20upx;
 				padding: 10upx 20upx;
-				margin: 25upx;
-				border-radius: 30upx;
+				margin: 0 25rpx 25rpx 25rpx;
+				border-radius: 20upx;
 				box-shadow: 1px 1px 3px #EEEEEE;
 				box-shadow: 1px 1px 3px #EEEEEE;
 				.check-row{
 				.check-row{
 					display: flex;
 					display: flex;
@@ -268,7 +271,7 @@
 							font-size: 32upx;
 							font-size: 32upx;
 							font-weight: bold;
 							font-weight: bold;
 							line-height: normal;
 							line-height: normal;
-							margin-bottom: 10rpx;
+							margin-bottom: 20rpx;
 						}
 						}
 						.carVin{
 						.carVin{
 							color: #666E75;
 							color: #666E75;

+ 30 - 16
pages/digitalShelf/stockPutDetail.vue

@@ -2,13 +2,25 @@
 	<view class="orderDetail-digitalShel flex flex_column">
 	<view class="orderDetail-digitalShel flex flex_column">
 		<view class="contHead">
 		<view class="contHead">
 			<view class="statusH">
 			<view class="statusH">
-				<view class="flex flex_column align_center">
+				<view class="flex flex_column align_center" v-if="pageInfo&&pageInfo.billState=='WAIT_CHECK'">
 					<view class="status-row">
 					<view class="status-row">
-						<u-icon :name="pageInfo&&pageInfo.billState=='WAIT_CHECK'?'hourglass-half-fill':'checkmark-circle'" size="42" color="#fff"> 
-						</u-icon>
-						<text>{{pageInfo&&pageInfo.billState=='WAIT_CHECK'?'待入库':'已入库'}}</text>
+						<u-icon name="hourglass-half-fill" size="48" color="#333"> </u-icon>
+						<text>待入库</text>
+					</view>
+					<view style="width: 100%;">
+						<view class="messageText"><text>配送发送:</text>{{pageInfo&&pageInfo.dispatchTypeValue?pageInfo.dispatchTypeValue:'--'}}</view>
+						<view class="messageText"><text>出库备注:</text>{{pageInfo&&pageInfo.remarks?pageInfo.remarks:'--'}}</view>
+					</view>
+				</view>
+				<view class="flex flex_column align_center" v-else>
+					<view class="status-row">
+						<u-icon name="checkmark-circle" size="48" color="#2196F3"> </u-icon>
+						<text style="color: #2196F3;">已入库</text>
+					</view>
+					<view style="width: 100%;">
+						<view class="messageText"><text>入库人员:</text>{{pageInfo&&pageInfo.confirmPersonName?pageInfo.confirmPersonName:'--'}}</view>
+						<view class="messageText"><text>入库时间:</text>{{pageInfo&&pageInfo.putStockTime?pageInfo.putStockTime:'--'}}</view>
 					</view>
 					</view>
-					<view class="messageText">配送方式:{{pageInfo&&pageInfo.dispatchTypeValue?pageInfo.dispatchTypeValue:'--'}}</view>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -108,8 +120,10 @@
 <style lang="less">
 <style lang="less">
 	page{
 	page{
 		height: 100%;
 		height: 100%;
+		background-color: #F8F8F8;
 	}
 	}
 	.orderDetail-digitalShel{
 	.orderDetail-digitalShel{
+		width: 100%;
 		height: 100%;
 		height: 100%;
 		.redText{
 		.redText{
 			color: #FB1E1E;
 			color: #FB1E1E;
@@ -119,11 +133,9 @@
 			overflow: auto;
 			overflow: auto;
 		}
 		}
 		.contHead {
 		.contHead {
-			background-color: white;
-			margin-top: -20rpx;
 			.statusH{
 			.statusH{
 				> view{
 				> view{
-					padding: 10upx 12%;
+					padding: 20upx 5%;
 					font-size: 34upx;
 					font-size: 34upx;
 				}
 				}
 				.status-row{
 				.status-row{
@@ -131,22 +143,21 @@
 					text{
 					text{
 						margin-left: 10rpx;
 						margin-left: 10rpx;
 					}
 					}
+					margin-bottom: 20rpx;
 				}
 				}
 				.messageText{
 				.messageText{
 					font-size: 30upx;
 					font-size: 30upx;
-					text-align: center;
+					padding: 10rpx 0;
+					color: #666;
 					text{
 					text{
-						color: #ffaa00;
+						color: #333;
 					}
 					}
-					padding: 10rpx 0;
 				}
 				}
 			}
 			}
 		}
 		}
 		.info{
 		.info{
-			background-color: #FFFFFF;
-			padding: 10rpx 30upx;
+			padding: 0 30upx;
 			font-size: 32rpx;
 			font-size: 32rpx;
-			margin-bottom: 20rpx;
 			.infoList{
 			.infoList{
 				display: flex;
 				display: flex;
 				justify-content: space-between;
 				justify-content: space-between;
@@ -166,15 +177,18 @@
 				}
 				}
 			}
 			}
 			.item-list{
 			.item-list{
+				background-color: #FFFFFF;
 				border-bottom: 2rpx solid #f2f2f2;
 				border-bottom: 2rpx solid #f2f2f2;
+				padding: 25rpx;
+				margin-bottom: 20rpx;
+				border-radius: 20rpx;
+				box-shadow: 2rpx 3rpx 5rpx #eee;
 				&:last-child{
 				&:last-child{
 					border: none;
 					border: none;
 				}
 				}
 				> view{
 				> view{
-					padding: 20rpx 0;
 					&:first-child{
 					&:first-child{
 						margin-right: 20rpx;
 						margin-right: 20rpx;
-						margin-top: 18rpx;
 					}
 					}
 					&:last-child{
 					&:last-child{
 						flex-grow: 1;
 						flex-grow: 1;

+ 1 - 1
pages/morePage/morePage.vue

@@ -18,7 +18,7 @@
 				<u-icon size="34" name="order"></u-icon> <text>订单管理</text>
 				<u-icon size="34" name="order"></u-icon> <text>订单管理</text>
 			</view>
 			</view>
 			<u-cell-group :border="false">
 			<u-cell-group :border="false">
-				<u-cell-item title="货架订单" :title-style="{fontSize:'1em'}">
+				<u-cell-item title="货架订单" @click="toPage('/pages/digitalShelf/orderList')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 					<text slot="icon"></text>
 				</u-cell-item>
 				</u-cell-item>
 				<u-cell-item title="临配订单" :title-style="{fontSize:'1em'}">
 				<u-cell-item title="临配订单" :title-style="{fontSize:'1em'}">