lilei 3 年之前
父節點
當前提交
092237ddf9

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 <script>
 	export default {
 	export default {
 		globalData: {
 		globalData: {
-			// baseUrl: 'http://192.168.16.155:7003/clzwx/', // 本地
-			baseUrl: 'http://md.test.zyucgj.com/saas/clz/', // 预发布
+			baseUrl: 'http://192.168.16.156:9110/saas/clz/', // 本地
+			// baseUrl: 'http://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://wx.chelingzhu.com/clzwx/' // 生产
 			// baseUrl: 'https://wx.chelingzhu.com/clzwx/' // 生产
 		},
 		},
 		onLaunch: function() {
 		onLaunch: function() {

+ 1 - 1
api/request.js

@@ -18,7 +18,7 @@ function request(options) {
 			'USER-TERM-TYPE': 'ipad', // 支付时需要用到 与pad一致
 			'USER-TERM-TYPE': 'ipad', // 支付时需要用到 与pad一致
 			'App-Type': 2,
 			'App-Type': 2,
 			'Version': '',
 			'Version': '',
-			'authorization':'Bearer clz|eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxNTA5MTMzMDAwMCIsImF1dGhfdXNlciI6eyJ1c2VyU24iOiIxMDc1OSIsInVzZXJpZCI6IjEwNzU5IiwidXNlcm5hbWUiOiIxNTA5MTMzMDAwMCIsInVzZXJUeXBlIjoiMiIsIm1lcmNoYW50SWQiOiIxMDA0MCIsIm1lcmNoYW50U24iOiIxMDA0MCIsIm9yZ0lkIjoiMTAwMDAiLCJvcmdTbiI6IjEwMDAwIiwib3JnTmFtZSI6Iui9pumihuS4u-aAu-mDqOmXqOW6lyIsIm9yZ1N0YXR1cyI6IjEiLCJvcmdFeHBpcmVEYXRlIjoiMjA5OS0wMS0wMSIsIm9yZ1RoZW1lVHlwZSI6ImNoZWxpbmd6aHUiLCJyb290T3JnSWQiOiIxMDAwMCIsInJvb3RPcmdTbiI6IjEwMDAwIiwicm9vdE9yZ05hbWUiOiLovabpoobkuLsiLCJyb290T3JnRXhwaXJlRGF0ZSI6IjIwOTktMDEtMDEiLCJyb290T3JnVGhlbWVUeXBlIjoiY2hlbGluZ3podSIsInJvb3RPcmdTdGF0dXMiOiIxIiwib3JnVHlwZSI6ImxzIiwic2NvcGVUeXBlIjoiYWxsIiwicm9vdE1lbnVNb3VsZElkIjoiMiIsIm9yZ01lbnVNb3VsZElkIjoiMiIsInN1cGVyQWRtaW4iOiIwIiwidXNlck5hbWVDTiI6IuW8oOS4ieS6miIsIm1vYmlsZSI6IjE1MDkxMzMwMDAwIiwiZW1haWwiOm51bGwsInNleCI6IjEiLCJwYXNzd29yZCI6ImZmMDNjYWI5MjBmMmFjN2I4NzUyNWNmMzhhMjIyMTlmZTAyNjlmMjRkZjhiMWVhNWQ1OGFiNTk5Iiwic2FsdCI6bnVsbCwiYXV0aG9yaXRpZXMiOm51bGwsInBlcm1Db2RlcyI6bnVsbCwiYWNsTWFwIjpudWxsLCJhY2NvdW50Tm9uRXhwaXJlZCI6dHJ1ZSwiYWNjb3VudE5vbkxvY2tlZCI6dHJ1ZSwiY3JlZGVudGlhbHNOb25FeHBpcmVkIjp0cnVlLCJlbmFibGVkIjp0cnVlLCJhcHBOYW1lIjpudWxsLCJleHRlbmRJbmZvIjpudWxsLCJleHRJbmZvIjp7fSwic291cmNlRmxhZyI6bnVsbCwiY2xpZW50VHlwZSI6bnVsbCwibXVzdENoYW5nZVB3ZCI6bnVsbCwiZXhwZWN0VHJ1c3QiOmZhbHNlfSwic2NvcGUiOlsiYWxsIl0sImV4cCI6MTY1NDA2MjgyNSwianRpIjoiMjUyNDVjNGMtZjhlNy00MTk3LTkyNGYtOTRlNjdmNjcyNTkxIiwiY2xpZW50X2lkIjoiY2xpZW50X3Bhc3N3b3JkIiwic3RhdHVzIjoiMjAwIn0.Jdv8-owZWdbKLoFFSaIZBGfvNNiSV9iYx_9gmNVjd1Q'
+			'authorization':'Bearer clz|eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxNTA5MTMzMDAwMCIsImF1dGhfdXNlciI6eyJ1c2VyU24iOiIxMDc1OSIsInVzZXJpZCI6IjEwNzU5IiwidXNlcm5hbWUiOiIxNTA5MTMzMDAwMCIsInVzZXJUeXBlIjoiMiIsIm1lcmNoYW50SWQiOiIxMDA0MCIsIm1lcmNoYW50U24iOiIxMDA0MCIsIm9yZ0lkIjoiMTAwMDAiLCJvcmdTbiI6IjEwMDAwIiwib3JnTmFtZSI6Iui9pumihuS4u-aAu-mDqOmXqOW6lyIsIm9yZ1N0YXR1cyI6IjEiLCJvcmdFeHBpcmVEYXRlIjo0MDcwODgwMDAwMDAwLCJvcmdUaGVtZVR5cGUiOiJjaGVsaW5nemh1Iiwicm9vdE9yZ0lkIjoiMTAwMDAiLCJyb290T3JnU24iOiIxMDAwMCIsInJvb3RPcmdOYW1lIjoi6L2m6aKG5Li7Iiwicm9vdE9yZ0V4cGlyZURhdGUiOjQwNzA4ODAwMDAwMDAsInJvb3RPcmdUaGVtZVR5cGUiOiJjaGVsaW5nemh1Iiwicm9vdE9yZ1N0YXR1cyI6IjEiLCJvcmdUeXBlIjoibHMiLCJzY29wZVR5cGUiOiJhbGwiLCJyb290TWVudU1vdWxkSWQiOiIyIiwib3JnTWVudU1vdWxkSWQiOiIyIiwic3VwZXJBZG1pbiI6IjAiLCJ1c2VyTmFtZUNOIjoi5byg5LiJ5LqaIiwibW9iaWxlIjoiMTUwOTEzMzAwMDAiLCJlbWFpbCI6bnVsbCwic2V4IjoiMSIsInBhc3N3b3JkIjoiZmYwM2NhYjkyMGYyYWM3Yjg3NTI1Y2YzOGEyMjIxOWZlMDI2OWYyNGRmOGIxZWE1ZDU4YWI1OTkiLCJzYWx0IjpudWxsLCJhdXRob3JpdGllcyI6bnVsbCwicGVybUNvZGVzIjpudWxsLCJhY2xNYXAiOm51bGwsImFjY291bnROb25FeHBpcmVkIjp0cnVlLCJhY2NvdW50Tm9uTG9ja2VkIjp0cnVlLCJjcmVkZW50aWFsc05vbkV4cGlyZWQiOnRydWUsImVuYWJsZWQiOnRydWUsImFwcE5hbWUiOm51bGwsImV4dGVuZEluZm8iOm51bGwsImV4dEluZm8iOnt9LCJzb3VyY2VGbGFnIjpudWxsLCJjbGllbnRUeXBlIjpudWxsLCJtdXN0Q2hhbmdlUHdkIjpudWxsLCJleHBlY3RUcnVzdCI6ZmFsc2V9LCJzY29wZSI6WyJhbGwiXSwiZXhwIjoxNjU0MTM5NTY2LCJqdGkiOiI0ODE4YWU4ZC1lMjNhLTQyZmItYWRiMS05OTExM2JkYmQzZTYiLCJjbGllbnRfaWQiOiJjbGllbnRfcGFzc3dvcmQiLCJzdGF0dXMiOiIyMDAifQ.fLDpC-HgUnYgHYGnoLLwGu83MAyJiSpfPWTv18iy0sk'
 	}
 	}
 	_obj.header = header
 	_obj.header = header
 	_obj.header['X-HEADER-APPID'] = 'WuyoKG1AcDZzLwxfhOAC+E16SeG3+mDqVYmsa/e5HRE=';
 	_obj.header['X-HEADER-APPID'] = 'WuyoKG1AcDZzLwxfhOAC+E16SeG3+mDqVYmsa/e5HRE=';

+ 1 - 1
api/shelf.js

@@ -49,7 +49,7 @@ export const getShelfOrderList = (params) => {
 // 保存数字货架订单
 // 保存数字货架订单
 export const saveShelfOrder = (params) => {
 export const saveShelfOrder = (params) => {
   return request({
   return request({
-    url: `shelfOrder/save`,
+    url: `shelfOrder/create`,
     data: params,
     data: params,
     method: 'post'
     method: 'post'
   })
   })

+ 0 - 32
pages.json

@@ -236,38 +236,6 @@
 		    }
 		    }
 		    
 		    
 		}
 		}
-		,{
-		    "path" : "pages/digitalShelf/temproaryStockIn/temproaryStockIn",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "我要临配",
-		        "enablePullDownRefresh": false,
-				"app-plus":{
-					"titleNView": {
-						"titleAlign": "left",
-						"buttons": [ //原生标题栏按钮配置,
-							{
-								"text": "\ue6b5 联系汽配商" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
-								"fontSrc": "/static/iconfont/iconfont.ttf",
-								"fontSize": "14",
-								"width":"130px",
-								"color":"#00aaff"
-							}
-						]
-					}
-				}
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/temproaryStockIn/moreShelfProduct",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "更多配件",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
     ],
     ],
 	"globalStyle": {
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTextStyle": "black",

+ 76 - 44
pages/digitalShelf/choosePart.vue

@@ -7,10 +7,7 @@
 			</div>
 			</div>
 			<div>
 			<div>
 				<div class="flex align-center">
 				<div class="flex align-center">
-					<div class="carTits ellipsis-two">{{modelLabel}}</div>
-					<!-- <div class="qhbtns flex align-center" v-if="carList.length>1" @click="openSelCarModel">
-						<u-image width="32" height="32" :src="`/static/${theme}/qiehuan.png`"></u-image> 切换车型
-					</div> -->
+					<div class="carTits ellipsis-two">{{modelLabel||''}}</div>
 				</div>
 				</div>
 				<div class="flex align-center">
 				<div class="flex align-center">
 					<div>VIN码:{{vinNumber}}</div>
 					<div>VIN码:{{vinNumber}}</div>
@@ -50,7 +47,7 @@
 						 			<view class="item-detail-info">
 						 			<view class="item-detail-info">
 						 				<view class="flex justify_between">
 						 				<view class="flex justify_between">
 						 					<text class="item-detail-text flex_1">{{item.code}}</text>
 						 					<text class="item-detail-text flex_1">{{item.code}}</text>
-						 					<text class="item-detail-text" v-if="item.affiliation=='SHELF'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
+						 					<text class="item-detail-text">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
 						 				</view>
 						 				</view>
 						 				<view class="flex justify_between">
 						 				<view class="flex justify_between">
 						 					<view class="item-detail-text flex_1">
 						 					<view class="item-detail-text flex_1">
@@ -60,10 +57,11 @@
 						 						<u-button shape="circle" @click="addPart(item)" v-if="!item.checked" :custom-style="{width:'48upx',height:'48upx'}" type="primary" size="mini">
 						 						<u-button shape="circle" @click="addPart(item)" v-if="!item.checked" :custom-style="{width:'48upx',height:'48upx'}" type="primary" size="mini">
 						 							<u-icon name="plus" color="#fff" size="28"></u-icon>
 						 							<u-icon name="plus" color="#fff" size="28"></u-icon>
 						 						</u-button>
 						 						</u-button>
-						 						<u-number-box v-else @change="updateNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
+						 						<u-number-box v-else @change="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
 						 					</view>
 						 					</view>
 						 					<view class="item-detail-text" v-if="item.affiliation=='SUPER_CATALOGUE'||!item.currentInven">
 						 					<view class="item-detail-text" v-if="item.affiliation=='SUPER_CATALOGUE'||!item.currentInven">
-						 						<text @click="toRuku(item)" class="phtxt">我要临配</text>
+						 						<text v-if="!item.checked" @click="addPart(item)" class="phtxt">我要临配</text>
+												<u-number-box v-else @change="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
 						 					</view>
 						 					</view>
 						 				</view>
 						 				</view>
 						 			</view>
 						 			</view>
@@ -75,7 +73,10 @@
 						 	</view>
 						 	</view>
 						 </view>
 						 </view>
 						 <view v-if="vinPartList&&vinPartList.length==0">
 						 <view v-if="vinPartList&&vinPartList.length==0">
-						 	<u-empty v-if="status!='loading'" :src="`/static/nodata.png`" icon-size="180" text="暂无适配推荐" mode="list" :margin-top="30"></u-empty>
+						 	<u-empty v-if="vinStatus!='loading'" :src="`/static/nodata.png`" icon-size="180" text="暂无适配推荐" mode="list" :margin-top="30"></u-empty>
+						 </view>
+						 <view style="padding: 20upx;">
+						 	<u-loadmore v-if="vinStatus=='loading'" :status="vinStatus" />
 						 </view>
 						 </view>
 					</view>
 					</view>
 					<!-- 其它配件 -->
 					<!-- 其它配件 -->
@@ -105,7 +106,8 @@
 											<u-number-box v-else @change="updateNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
 											<u-number-box v-else @change="updateNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
 										</view>
 										</view>
 										<view class="item-detail-text" v-else>
 										<view class="item-detail-text" v-else>
-											<text @click="toRuku(item)" class="phtxt">我要临配</text>
+											<text @click="addPart(item)" v-if="!item.checked" class="phtxt">我要临配</text>
+											<u-number-box v-else @change="updateNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
 										</view>
 										</view>
 									</view>
 									</view>
 								</view>
 								</view>
@@ -117,7 +119,7 @@
 						</view>
 						</view>
 					</view>
 					</view>
 					<view v-if="partList&&partList.length==0">
 					<view v-if="partList&&partList.length==0">
-						<u-empty v-if="status!='loading'" :src="`/static/nodata.png`" icon-size="240" :text="noDataText" mode="list" :margin-top="150"></u-empty>
+						<u-empty v-if="status!='loading'" :src="`/static/nodata.png`" icon-size="180" :text="noDataText" mode="list" :margin-top="150"></u-empty>
 					</view>
 					</view>
 					<view style="padding: 20upx;">
 					<view style="padding: 20upx;">
 						<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
 						<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
@@ -130,11 +132,11 @@
 			<div>
 			<div>
 				<div class="cpb_cart" :style="{background: partListData.length==0?'#eee':''}" @click="openCart">
 				<div class="cpb_cart" :style="{background: partListData.length==0?'#eee':''}" @click="openCart">
 					<u-badge type="error" :count="cartNums" :offset="[-4,-4]" bgColor="#FF5200"></u-badge>
 					<u-badge type="error" :count="cartNums" :offset="[-4,-4]" bgColor="#FF5200"></u-badge>
-					<u-image width="44" height="44" :src="`/static/${theme}/icon_shopping@3x.png`"></u-image>
+					<u-image width="44" height="44" :src="`/static/icon_shopping@3x.png`"></u-image>
 				</div>
 				</div>
 			</div>
 			</div>
 			<div>
 			<div>
-				<u-button type="primary" @click="submitForm" :custom-style="{background:'#1283d4',fontSize:'32rpx'}" shape="circle">立即提交</u-button>
+				<u-button type="primary" :loading="saveLoading" @click="submitForm" :custom-style="{background:'#1283d4',fontSize:'32rpx'}" shape="circle">立即提交</u-button>
 			</div>
 			</div>
 		</div>
 		</div>
 		<!-- 已选配件 购物车 -->
 		<!-- 已选配件 购物车 -->
@@ -151,20 +153,21 @@
 						</view>
 						</view>
 						<view class="item-info uni-col-10">
 						<view class="item-info uni-col-10">
 							<view class="item-name">
 							<view class="item-name">
+								<text class="item-tempPart" v-if="!item.currentInven">临配</text>
 								<text>{{item.name}}</text>
 								<text>{{item.name}}</text>
 							</view>
 							</view>
 							<view class="item-detail">
 							<view class="item-detail">
 								<view class="item-detail-info">
 								<view class="item-detail-info">
 									<view class="flex justify_between">
 									<view class="flex justify_between">
 										<text class="item-detail-text flex_1">{{item.code}}</text>
 										<text class="item-detail-text flex_1">{{item.code}}</text>
-										<text class="item-detail-text">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
+										<text class="item-detail-text" >库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
 									</view>
 									</view>
 									<view class="flex justify_between">
 									<view class="flex justify_between">
 										<view class="item-detail-text flex_1">
 										<view class="item-detail-text flex_1">
 											<text class="item-price">¥{{item.price||0}}</text>
 											<text class="item-price">¥{{item.price||0}}</text>
 										</view>
 										</view>
 										<view class="item-detail-text">
 										<view class="item-detail-text">
-											<u-number-box @change="updateCartNums" v-model="item.qty" :index="'cart_'+item.productSn" :min="0" :max="item.currentInven"></u-number-box>
+											<u-number-box @change="updateCartNums" v-model="item.qty" :index="'cart_'+item.productSn" :min="0" :max="item.currentInven||999999"></u-number-box>
 										</view>
 										</view>
 									</view>
 									</view>
 								</view>
 								</view>
@@ -189,6 +192,7 @@
 				curLeve2: '',  //  当前所选二级菜单
 				curLeve2: '',  //  当前所选二级菜单
 				carInfo: null,
 				carInfo: null,
 				status: 'loading',
 				status: 'loading',
+				vinStatus: 'loading',
 				noDataText: '暂无配件',
 				noDataText: '暂无配件',
 				pageNo: 1,
 				pageNo: 1,
 				pageSize: 10,
 				pageSize: 10,
@@ -201,17 +205,13 @@
 				partListData: [], // 已选配件
 				partListData: [], // 已选配件
 				vinPartList: [],
 				vinPartList: [],
 				isIphoneXup: false,
 				isIphoneXup: false,
-				dealerPhone: ''
+				dealerPhone: '',
+				saveLoading: false
 			}
 			}
 		},
 		},
 		computed:{
 		computed:{
 			modelLabel(){
 			modelLabel(){
-				// const data = this.carInfo
-				// const carModelLabel = [data.carBrand, data.vehicleSeriesNameCn, data.capacity, data.vehicleOfYear, data.vehicleNameCn +
-				// 	'(' + data.salesVersion + ')'
-				// ]
-				// return carModelLabel.join(' ')
-				return this.carInfo.text
+				return this.carInfo&&this.carInfo.text||''
 			},
 			},
 			cartNums(){
 			cartNums(){
 				let ret = 0
 				let ret = 0
@@ -234,7 +234,6 @@
 			// #ifdef APP-PLUS
 			// #ifdef APP-PLUS
 			var webView = this.$mp.page.$getAppWebview();
 			var webView = this.$mp.page.$getAppWebview();
 			if(this.dealerPhone==''){
 			if(this.dealerPhone==''){
-				console.log(11)
 				webView.setTitleNViewButtonStyle(0,{text:"",color:"#FFFFFF"}); 
 				webView.setTitleNViewButtonStyle(0,{text:"",color:"#FFFFFF"}); 
 			}
 			}
 			// #endif
 			// #endif
@@ -354,9 +353,10 @@
 				      productTypeSn: this.curLeve2 == 'all' ? '' : this.curLeve2,
 				      productTypeSn: this.curLeve2 == 'all' ? '' : this.curLeve2,
 					  codeList: this.vinCode
 					  codeList: this.vinCode
 				  }
 				  }
+				this.vinStatus = 'loading'
 				getShelfQueryList(params).then(res => {
 				getShelfQueryList(params).then(res => {
 					this.vinPartList = this.fiterChecked(res.data || []) 
 					this.vinPartList = this.fiterChecked(res.data || []) 
-					console.log(this.vinPartList)
+					this.vinStatus = 'nomore'
 				})
 				})
 			},
 			},
 			// 过滤已选择的
 			// 过滤已选择的
@@ -389,13 +389,6 @@
 				this.showSelCarModel = false
 				this.showSelCarModel = false
 				this.carInfo = item
 				this.carInfo = item
 			},
 			},
-			// 补货
-			toRuku(data){
-				this.$store.state.vuex_shelfChoosePart.push(data)
-				uni.navigateTo({
-				    url: '/pages/digitalShelf/temproaryStockIn/temproaryStockIn?vinNumber='+this.vinNumber
-				})
-			},
 			// 添加到购物车
 			// 添加到购物车
 			addPart(item){
 			addPart(item){
 				item.checked = true
 				item.checked = true
@@ -406,6 +399,7 @@
 					name: item.name,
 					name: item.name,
 					unit: item.unit,
 					unit: item.unit,
 					price: item.price,
 					price: item.price,
+					cost: item.cost,
 					currentInven: item.currentInven,
 					currentInven: item.currentInven,
 					code: item.code,
 					code: item.code,
 					qty: item.qty,
 					qty: item.qty,
@@ -413,14 +407,13 @@
 					checked: true
 					checked: true
 				})
 				})
 			},
 			},
-			// 修改列表上数量
-			updateNums(data){
-				const prow = this.partList.find(item => item.productSn == data.index)
+			// 更新配件列表数量
+			updatePartList(data,type){
+				const prow = this[type].find(item => item.productSn == data.index)
 				const index = this.partListData.findIndex(item => item.productSn == data.index)
 				const index = this.partListData.findIndex(item => item.productSn == data.index)
 				// 删除
 				// 删除
 				if(data.value == 0){
 				if(data.value == 0){
 					prow.checked = false
 					prow.checked = false
-					console.log(index,'+++')
 					if(index>=0){
 					if(index>=0){
 						this.partListData.splice(index,1)
 						this.partListData.splice(index,1)
 					}
 					}
@@ -432,8 +425,17 @@
 					this.partListData.splice()
 					this.partListData.splice()
 				}
 				}
 			},
 			},
+			// 修改适配配件上数量
+			updateVinNums(data){
+				this.updatePartList(data,'vinPartList')
+			},
+			// 修改其它配件上的数量
+			updateNums(data){
+				this.updatePartList(data,'partList')
+			},
 			// 点击购物车修改数量
 			// 点击购物车修改数量
 			updateCartNums(data){
 			updateCartNums(data){
+				console.log(data)
 				if(data.value == 0){
 				if(data.value == 0){
 					const index = this.partListData.findIndex(item => 'cart_'+item.productSn == data.index)
 					const index = this.partListData.findIndex(item => 'cart_'+item.productSn == data.index)
 					if(index>=0){
 					if(index>=0){
@@ -443,10 +445,20 @@
 						this.showCart = false
 						this.showCart = false
 					}
 					}
 				}
 				}
-				// 同步更新配件列表上的
+				// 同步更新Vin适配配件列表上的
+				const vinprow = this.vinPartList.find(item => 'cart_'+item.productSn == data.index)
+				if(vinprow){
+					vinprow.qty = data.value
+					vinprow.checked = !!data.value
+					this.vinPartList.splice()
+				}
+				// 同步更新其它配件列表上的
 				const prow = this.partList.find(item => 'cart_'+item.productSn == data.index)
 				const prow = this.partList.find(item => 'cart_'+item.productSn == data.index)
-				prow.qty = data.value
-				prow.checked = !!data.value
+				if(prow){
+					prow.qty = data.value
+					prow.checked = !!data.value
+					this.partList.splice()
+				}
 			},
 			},
 			// 打开购物车
 			// 打开购物车
 			openCart(){
 			openCart(){
@@ -462,13 +474,22 @@
 			// 格式化数据
 			// 格式化数据
 			formatData(){
 			formatData(){
 				const partList = []
 				const partList = []
+				const tempList = []
 				this.partListData.map(item => {
 				this.partListData.map(item => {
-					partList.push({
-						"productSn": item.productSn,
-						"totalQty": item.qty
-					})
+					if(item.currentInven){
+						partList.push({
+							"productSn": item.productSn,
+							"totalQty": item.qty
+						})
+					}else{
+						tempList.push({
+							"productSn": item.productSn,
+							"qty": item.qty,
+							"price": item.cost
+						})
+					}
 				})
 				})
-				return partList
+				return [partList,tempList]
 			},
 			},
 			// 立即提交
 			// 立即提交
 			submitForm(){
 			submitForm(){
@@ -482,12 +503,14 @@
 				
 				
 				// 开始提交
 				// 开始提交
 				const params = {
 				const params = {
-					shelfOrderDetailList: this.formatData(),
+					shelfOrderDetailList: this.formatData()[0],
+					tempBillDetailList: this.formatData()[1],
 					vin: this.vinNumber,
 					vin: this.vinNumber,
-					vehicleModel: this.modelLabel,
+					vehicleModel: this.modelLabel || '',
 					vehicleLogo: this.carInfo.icon||'',
 					vehicleLogo: this.carInfo.icon||'',
 				}
 				}
 				console.log(params,'立即提交')
 				console.log(params,'立即提交')
+				this.saveLoading = true
 				saveShelfOrder(params).then(res => {
 				saveShelfOrder(params).then(res => {
 					console.log(res,'saveShelfOrder')
 					console.log(res,'saveShelfOrder')
 					if(res.status == 200){
 					if(res.status == 200){
@@ -501,6 +524,7 @@
 							url:"/pages/digitalShelf/choosePartResult?data="+encodeURIComponent(JSON.stringify({remindMessage:res.message}))+"&state=0"
 							url:"/pages/digitalShelf/choosePartResult?data="+encodeURIComponent(JSON.stringify({remindMessage:res.message}))+"&state=0"
 						})
 						})
 					}
 					}
+					this.saveLoading = false
 				})
 				})
 			}
 			}
 		}
 		}
@@ -601,6 +625,7 @@
 					border-bottom: 2rpx solid #f5f5f5;
 					border-bottom: 2rpx solid #f5f5f5;
 					.item-info{
 					.item-info{
 						padding-left: 20upx;
 						padding-left: 20upx;
+						flex-grow: 1;
 						.item-name{
 						.item-name{
 							font-size: 32upx;
 							font-size: 32upx;
 							color: #191919;
 							color: #191919;
@@ -704,6 +729,13 @@
 			}
 			}
 			.item-name{
 			.item-name{
 				font-size: 36rpx;
 				font-size: 36rpx;
+				.item-tempPart{
+					background: #0055ff;
+					color: #fff;
+					border-radius: 1em;
+					font-size: 0.8em;
+					padding: 0 0.5em;
+				}
 			}
 			}
 			.item-info{
 			.item-info{
 				border-bottom:2rpx solid #f8f8f8;
 				border-bottom:2rpx solid #f8f8f8;

+ 97 - 33
pages/digitalShelf/choosePartResult.vue

@@ -10,8 +10,8 @@
 					</view>
 					</view>
 					<view class="messageText" v-html="info&&info.remindMessage||''"></view>
 					<view class="messageText" v-html="info&&info.remindMessage||''"></view>
 					<view class="button-group">
 					<view class="button-group">
-						<button :hover-stop-propagation="true" @click="back" class="back" size="mini">返回首页</button>
-						<button :hover-stop-propagation="true" @click="toScan" v-if="state == 1" class="action" size="mini">扫码取货</button>
+						<button :hover-stop-propagation="true" @click="toScan" v-if="state == 1&&partList.length" class="back" size="mini">扫码取货</button>
+						<button :hover-stop-propagation="true" @click="onceQh" v-if="state == 1&&partList.length" class="action" size="mini">一键取货</button>
 						<button :hover-stop-propagation="true" @click="toSettle" v-if="state == 0" class="actionFail" size="mini">去结算</button>
 						<button :hover-stop-propagation="true" @click="toSettle" v-if="state == 0" class="actionFail" size="mini">去结算</button>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -19,46 +19,80 @@
 		</view>
 		</view>
 		<view class="order-body">
 		<view class="order-body">
 			<view class="info partList" v-if="state == 1">
 			<view class="info partList" v-if="state == 1">
-				<view class="infoList">
-					<view class="title">配件列表</view>
-					<view>
-						{{partList.length}}款,共<text class="redText">{{totalNums}}</text>件
+				<u-tabs :list="[{name:'货架订单',value:0},{name:'临配订单',value:1}]" :is-scroll="false" :current="current" @change="changeTab"></u-tabs>
+				<view v-if="current==0">
+					<view class="infoList" v-if="partList.length">
+						<view class="title">请在货架上按照指定位置拿取配件</view>
+						<view>
+							{{partList.length}}款,共<text class="redText">{{totalNums}}</text>件
+						</view>
 					</view>
 					</view>
-				</view>
-				<view v-for="item in partList" :key="item.id" class="flex align-center item-list">
-					<view>
-						<u-image border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
+					<view v-else>
+						<u-empty :src="`/static/nodata.png`" icon-size="180" text="暂无货架订单" mode="list" :margin-top="30"></u-empty>
 					</view>
 					</view>
-					<view>
-						<view class="item-name">
-						  <text>{{item.productName}}</text>
+					<view v-for="item in partList" :key="item.id" class="flex align-center item-list">
+						<view>
+							<u-image border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
 						</view>
 						</view>
-						<view class="item-nums">
-							X <text>{{item.totalQty}}{{item.unit||''}}</text>
+						<view>
+							<view class="item-name">
+							  <text>{{item.productName}}</text>
+							</view>
+							<view class="item-nums">
+								X <text>{{item.totalQty}}{{item.unit||''}}</text>
+							</view>
+							<view class="item-head">
+								<text>{{item.productCode}}</text>
+								<text class="item-no">{{item.shelfPlaceCode}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="current==1">
+					<view class="infoList" v-if="tempPartList.length">
+						<view class="title">请耐心等待汽配经销商进行配送</view>
+						<view>
+							{{tempPartList.length}}款,共<text class="redText">{{totalTempNums}}</text>件
+						</view>
+					</view>
+					<view v-else>
+						<u-empty :src="`/static/nodata.png`" icon-size="180" text="暂无临配订单" mode="list" :margin-top="30"></u-empty>
+					</view>
+					<view v-for="item in tempPartList" :key="item.id" class="flex align-center item-list">
+						<view>
+							<u-image border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
 						</view>
 						</view>
-						<view class="item-head">
-							<text>{{item.productCode}}</text>
-							<text class="item-no">{{item.shelfPlaceCode}}</text>
+						<view>
+							<view class="item-name">
+							  <text>{{item.productName}}</text>
+							</view>
+							<view class="item-nums">
+								X <text>{{item.qty}}{{item.unit||''}}</text>
+							</view>
+							<view class="item-head">
+								<text>{{item.productCode}}</text>
+								<text class="item-no">{{item.shelfPlaceCode}}</text>
+							</view>
 						</view>
 						</view>
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="info" v-if="info && state == 1">
+			<view class="info" v-if="info && info.shelfOrder && state == 1">
 				<view class="infoList">
 				<view class="infoList">
 					<view class="title">单据信息</view>
 					<view class="title">单据信息</view>
 					<view class="statu"></view>
 					<view class="statu"></view>
 				</view>
 				</view>
 				<view class="infoList">
 				<view class="infoList">
 					<text>订单编号</text>
 					<text>订单编号</text>
-					<text>{{info.shelfOrderNo||'--'}}</text>
+					<text>{{info.shelfOrder.shelfOrderNo||'--'}}</text>
 				</view>
 				</view>
 				<view class="infoList">
 				<view class="infoList">
 					<text>下单时间</text>
 					<text>下单时间</text>
-					<text>{{info.createDate||'--'}}</text>
+					<text>{{info.shelfOrder.createDate||'--'}}</text>
 				</view>
 				</view>
 				<view class="infoList">
 				<view class="infoList">
 					<text>下单人员</text>
 					<text>下单人员</text>
-					<text>{{info.orderPersonName || '--'}}</text>
+					<text>{{info.shelfOrder.orderPersonName || '--'}}</text>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -81,29 +115,51 @@
 			   statusText: '',
 			   statusText: '',
 			   statusIcon: '', // 结算状态icon
 			   statusIcon: '', // 结算状态icon
 			   partList: [], // 配件列表
 			   partList: [], // 配件列表
-			   state: null
+			   tempPartList: [], 
+			   state: null,
+			   current: 0,
+			   shelfOrderSn: ''
 		   }
 		   }
 	   },
 	   },
 	   onLoad(option) { 
 	   onLoad(option) { 
-		   console.log(option,'option')
-		  this.info =  JSON.parse(decodeURIComponent(option.data.replace(/%/g, '%25')))
+		  this.info = option.data?JSON.parse(decodeURIComponent(option.data)):null
 		  this.state = option.state
 		  this.state = option.state
 		  if(option.state==1){
 		  if(option.state==1){
 			  this.statusText = '提交成功'
 			  this.statusText = '提交成功'
 			  this.statusIcon = 'checkmark-circle'
 			  this.statusIcon = 'checkmark-circle'
 			  // 获取配件列表
 			  // 获取配件列表
-			  this.partList = this.info.shelfOrderDetailList
+			  this.partList = this.info.shelfOrder ? this.info.shelfOrder.shelfOrderDetailList : []
+			  this.tempPartList = this.info.shelfTempBill ? this.info.shelfTempBill.detailList : [],
+			  this.shelfOrderSn = this.info.shelfOrder ? this.info.shelfOrder.shelfOrderSn : ''
+			  this.current = this.partList.length ? 0 : 1
 		  }else{
 		  }else{
 			  this.statusText = '提交失败'
 			  this.statusText = '提交失败'
 			  this.statusIcon = 'close-circle'
 			  this.statusIcon = 'close-circle'
 		  }
 		  }
+		  
+		  // 更改标题栏背景色
+		  uni.setNavigationBarColor({
+		  	frontColor: '#ffffff',
+		  	backgroundColor: option.state==1 ? '#1283d4':'#ff5500',
+		  })
 	   },
 	   },
 	   computed: {
 	   computed: {
 		   totalNums(){
 		   totalNums(){
 			   let ret = 0
 			   let ret = 0
-			   this.partList.map(item => {
-				   ret += item.totalQty
-			   })
+			   if(this.partList){
+				   this.partList.map(item => {
+				   	 ret += item.totalQty
+				   })
+			   }
+			   return ret
+		   },
+		   totalTempNums(){
+			   let ret = 0
+			   if(this.tempPartList){
+				   this.tempPartList.map(item => {
+				   	 ret += item.qty
+				   })
+			   }
 			   return ret
 			   return ret
 		   }
 		   }
 	   },
 	   },
@@ -111,11 +167,18 @@
 		 back(){
 		 back(){
 			uni.navigateBack() 
 			uni.navigateBack() 
 		 },
 		 },
+		 changeTab(index){
+			 this.current = index
+		 },
 		 // 扫码取货
 		 // 扫码取货
 		 toScan(){
 		 toScan(){
 			 uni.redirectTo({
 			 uni.redirectTo({
-			 	url:"/pages/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.info.shelfOrderSn
+			 	url:"/pages/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.shelfOrderSn
 			 })
 			 })
+		 },
+		 // 一键取货
+		 onceQh(){
+			 
 		 },
 		 },
 		 // 去结算
 		 // 去结算
 		 toSettle(){
 		 toSettle(){
@@ -174,8 +237,8 @@
 						font-size: 32rpx;
 						font-size: 32rpx;
 					}
 					}
 					.back{
 					.back{
-						color: #fff;
-						border:2rpx solid #fff;
+						background: #fff;
+						color: #0485F6;
 					}
 					}
 					.action{
 					.action{
 						background: #fff;
 						background: #fff;
@@ -200,7 +263,8 @@
 				padding:20rpx 0;
 				padding:20rpx 0;
 				border-bottom: 2rpx solid #f2f2f2;
 				border-bottom: 2rpx solid #f2f2f2;
 				.title{
 				.title{
-					font-weight: bold;
+					color: #999;
+					font-size: 28rpx;
 				}
 				}
 				> text{
 				> text{
 					&:first-child{
 					&:first-child{

+ 12 - 70
pages/digitalShelf/scanBarcode/scanBarcode.vue

@@ -42,12 +42,12 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<view class="footer flex align-center" v-if="info">
-			<u-button v-if="!hasScanFinish" :throttle-time="100" @click="scanCode" :style="{ background: '#1283d4', color: '#fff' }" shape="circle" type="info">
+		<view class="footer flex align_center justify_center" v-if="info">
+			<u-button v-if="!hasScanFinish" :throttle-time="100" @click="scanCode" :custom-style="{ background: '#1283d4', color: '#fff' }" shape="circle" type="info">
 				<u-icon name="scan" color="#fff" size="32"></u-icon>
 				<u-icon name="scan" color="#fff" size="32"></u-icon>
 				点击扫码
 				点击扫码
 			</u-button>
 			</u-button>
-			<u-button v-else :throttle-time="100" @click="outShelfOrder" :style="{ background: '#1283d4', color: '#fff' }" shape="circle" type="info">
+			<u-button v-else :throttle-time="100" @click="outShelfOrder" :custom-style="{ background: '#1283d4', color: '#fff' }" shape="circle" type="info">
 				确认取货
 				确认取货
 			</u-button>
 			</u-button>
 		</view>
 		</view>
@@ -76,12 +76,10 @@ export default {
 		   return ret
 		   return ret
 	   },
 	   },
 	   hasScanFinish(){
 	   hasScanFinish(){
-		   return this.info.totalQty == this.info.confirmQty
+		   return this.info&&this.info.totalQty == this.info.confirmQty
 	   }
 	   }
 	},
 	},
 	onReady() {
 	onReady() {
-		// 初始化摄像头
-		this.init()
 	},
 	},
 	onLoad(options) {
 	onLoad(options) {
 		this.shelfOrderSn = options.shelfOrderSn
 		this.shelfOrderSn = options.shelfOrderSn
@@ -90,40 +88,18 @@ export default {
 	methods: {
 	methods: {
 		// 扫码
 		// 扫码
 		scanCode(){
 		scanCode(){
-			// this.mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-			// this.mpaasScanModule.mpaasScan({
-			// 	// 扫码识别类型,参数可多选,qrCode、barCode,不设置,默认识别所有
-			// 	'scanType':  ['qrCode','barCode'],
-			// 	// 是否隐藏相册,默认false不隐藏
-			// 	'hideAlbum': false
-			// },
-			// (ret) => {
-			// 	// 返回值中,resp_code 表示返回结果值,10:用户取消,11:其他错误,1000:成功
-			// 	// 返回值中,resp_message 表示返回结果信息
-			// 	// 返回值中,resp_result 表示扫码结果,只有成功才会有返回
-			// 	if(ret.resp_code == '1000'){
-			// 		this.scanResult(ret.resp_result)
-			// 	}
-			// })
-
-			this.mpaasScanModule = uni.requireNativePlugin("wss-scan")
-			this.mpaasScanModule.scan(
-				{
-					"scanType":["QRCODE","CODE93","CODE128","DATAMATRIX"],
-					"scanMode":"Customized",
-					"scanStyle":{"scanFrameSizePlus":{"width":200,"height":200},"scanFrameSize":200,"scanLight":"visible","scanText":"对准物品二维码","scanTitle":"扫码取货"}
-				},
-				(result) => {
-					console.log(result)
-					if(result.scanStatus == 1){
-						this.scanResult(result.scanValue)
-					}
-				})
+			// 允许从相机和相册扫码
+			uni.scanCode({
+				success: function (res) {
+					console.log('条码类型:' + res.scanType);
+					console.log('条码内容:' + res.result);
+					this.scanResult(res.result)
+				}
+			});
 		},
 		},
 		// 获取详情
 		// 获取详情
 		getDetail(type){
 		getDetail(type){
 		  findBySnShelfOrder({sn: this.shelfOrderSn}).then(res => {
 		  findBySnShelfOrder({sn: this.shelfOrderSn}).then(res => {
-			  console.log(res,'++++++++')
 			  if(res.status == 200){
 			  if(res.status == 200){
 				  this.info = res.data
 				  this.info = res.data
 				  this.partList = res.data.shelfOrderDetailList
 				  this.partList = res.data.shelfOrderDetailList
@@ -209,40 +185,6 @@ export default {
 				title: title
 				title: title
 			})
 			})
 		},
 		},
-		init(){
-			// const _this = this
-			// // 初始化
-			//  this.barcode = plus.barcode.create('barcode', [plus.barcode.QR], {
-			// 		top:'0px',
-			// 		left:'0px',
-			// 		width: '100%',
-			// 		height: '35%',
-			// 		position: 'static',
-			// 		frameColor: '#00aaff',
-			// 		scanbarColor: '#00aaff'
-			// 	});
-			// // 设置高度
-			// const query = uni.createSelectorQuery().in(this);
-			// query.select('#barcode').boundingClientRect(data => {
-			// 	this.barcode.setStyle({
-			// 			height: data.height	+ 'px'	// 调整扫码控件的位置
-			// 		});
-			// }).exec();
-			// // 扫码成功后
-			// this.barcode.onmarked = function(type, result) {
-			// 	_this.scanResult(result)
-			// }
-			// // 扫码识别出错
-			// this.barcode.onerror = function(error){
-			// 	console.log(error)
-			// 	_this.message("二维码错误!")
-			// 	_this.barcode.start()
-			// }
-
-			//  const currentWebview = this.$mp.page.$getAppWebview();
-			//  currentWebview.append(this.barcode);
-			//  this.barcode.start();
-		}
 	}
 	}
 }
 }
 </script>
 </script>

+ 0 - 377
pages/digitalShelf/temproaryStockIn/moreShelfProduct.vue

@@ -1,377 +0,0 @@
-<template>
-	<view class="moreShelfPart flex flex_column">
-		<view class="moreShelfPart-search">
-			<u-search
-			placeholder="请输入关键字查询" 
-			v-model="queryWord" 
-			:show-action="isGobleSearch" 
-			@focus="isGobleSearch=true" 
-			@blur="searchPart"
-			@custom="searchPart" 
-			@search="searchPart" 
-			@clear="searchPart"
-			:action-style="{'color': '#fff', 'font-size': '24upx', 'background-color': '#57a3f3', 'border-radius': '6upx', 'padding': '12upx 0'}">
-			</u-search>
-		</view>
-		<view class="moreShelfPart-body">
-			<scroll-view
-			class="nav-right" 
-			scroll-y 
-			@scrolltolower="onreachBottom">
-				<!-- vin适配配件 -->
-				<view>
-					<view class="nav-right-title">该车适配</view>
-					<view class="nav-right-item" v-for="(item, index) in vinPartList" :key="item.id">
-						<view class="uni-col-2">
-							<u-image :src="item.images+'?x-oss-process=image/resize,m_fixed,h_120,w_120,color_ffffff'"  @click="viewImg(item)" border-radius="30" width="120" height="120" bg-color="#EBEBEB" ></u-image>
-						</view>
-						<view class="item-info uni-col-10">
-							<view class="item-name">
-								<text>{{item.name}}</text>
-							</view>
-							<view class="item-detail">
-								<view class="nav-right-item-btns flex align_center justify_between">
-									<view>
-										<text class="item-detail-text">{{item.code}}</text>
-									</view>
-									<view>
-										<u-button :throttle-time="100" class="item-btn" v-if="!item.checked" type="primary" :style="{background:'#1283d4'}" shape="circle"  size="mini" @click="choosePart(item)">选择</u-button>
-										<u-button :throttle-time="100" class="item-btn" v-else type="success" shape="circle" size="mini" @click="choosePart(item,0)">已选择</u-button>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view v-if="vinPartList&&vinPartList.length==0">
-						<u-empty v-if="vinstatus!='loading'" :src="`/static/nodata.png`" icon-size="120" text="暂无配件" mode="list" :margin-top="30"></u-empty>
-					</view>
-					<view style="padding: 20upx;" v-if="vinstatus=='loading'" >
-						<u-loadmore :status="vinstatus" />
-					</view>
-				</view>
-				<!-- 其它配件 -->
-				<view class="nav-right-title" style="margin-top: 20rpx;">其它配件</view>
-				<view class="nav-right-item" v-for="(item, index) in partList" :key="item.id">
-					<view class="uni-col-2">
-						<u-image :src="item.images+'?x-oss-process=image/resize,m_fixed,h_120,w_120,color_ffffff'" @click="viewImg(item)" border-radius="30" width="120" height="120" bg-color="#EBEBEB" ></u-image>
-					</view>
-					<view class="item-info uni-col-10">
-						<view class="item-name">
-							<text>{{item.name}}</text>
-						</view>
-						<view class="item-detail">
-							<view class="nav-right-item-btns flex align_center justify_between">
-								<view>
-									<text class="item-detail-text">{{item.code}}</text>
-								</view>
-								<view>
-									<u-button :throttle-time="100" class="item-btn" v-if="!item.checked" type="primary" :style="{background:'#1283d4'}" shape="circle"  size="mini" @click="choosePart(item)">选择</u-button>
-									<u-button :throttle-time="100" class="item-btn" v-else type="success" shape="circle" size="mini" @click="choosePart(item,1)">已选择</u-button>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view v-if="partList&&partList.length==0">
-					<u-empty v-if="status!='loading'" :src="`/static/nodata.png`" icon-size="240" :text="noDataText" mode="list" :margin-top="50"></u-empty>
-				</view>
-				<view style="padding: 20upx;" v-if="total>pageSize || status=='loading'">
-					<u-loadmore :status="status" />
-				</view>
-			</scroll-view>
-		</view>
-		<view class="moreShelfPart-footer">
-			您可以选择更多数字货架上暂时没有库存的配件进行临配
-		</view>
-	</view>
-</template>
-
-<script>
-	import { getShelfProductList, getShelfProductType, queryPartCodeByVin, getShelfQueryList } from '@/api/shelf'
-	export default {
-		data() {
-			return {
-				queryWord: '',
-				isGobleSearch: false,
-				vinPartList: [],
-				partList: [],
-				pageNo:1,
-				pageSize: 10,
-				vinCode: [],
-				vinNumber: '',
-				total: 0, // 列表总数
-				noDataText: '暂无配件',
-				status: 'loading',
-				vinstatus: 'loading'
-			}
-		},
-		onLoad(opts) {
-			this.vinNumber = opts.vinNumber
-			if(this.vinNumber){
-				this.getCarCodeByVin()
-			}else{
-				this.vinstatus = 'nomore'
-				this.getShelfProductList()
-			}
-		},
-		methods: {
-			viewImg(item){
-				uni.previewImage({
-					urls: [item.images]
-				})
-			},
-			clearSearch(){
-				this.queryWord = ''
-				this.pageNo = 1
-				this.partList = []
-			},
-			// 搜索配件
-			searchPart(){
-				this.getShelfProductList()
-			},
-			getCarCodeByVin(){
-				queryPartCodeByVin({vinNumber:this.vinNumber}).then(res => {
-					console.log(res,'this.vinCode')
-					if(res.status == 200){
-						this.vinCode = res.data
-						this.getVinShelfPartList()
-						this.getShelfProductList()
-					}
-				})
-			},
-			// 根据客户vin查询该车可用数字货架中的配件
-			getVinShelfPartList(){
-				let params = {
-				      queryWord: this.queryWord,
-				      partsClsId: '',
-				      vin: this.vinNumber,
-					  codeList: this.vinCode,
-					  currentInven:0
-				  }
-				this.vinstatus = 'loading'
-				getShelfQueryList(params).then(res => {
-					console.log(res,'getVinShelfPartList')
-					this.vinPartList = res.data.length ? this.fiterChecked(res.data) : []
-					this.vinstatus = 'nomore'
-				})
-			},
-			// 获取数字货架配件列表
-			getShelfProductList(){
-				const _this = this
-				let params = {
-				    pageNo: this.pageNo,
-				    pageSize: this.pageSize,
-					excludeCodeList: this.vinCode,
-					queryWord: this.queryWord,
-					currentInven:0
-				}
-				console.log(params)
-				_this.status = 'loading'
-				getShelfProductList(params).then(res => {
-					uni.hideLoading()
-					console.log(res,'获取数字货架配件列表')
-					if(res.status == 200){
-						let list = res.data.list
-						console.log(list)
-						if (list && list.length>0){
-							// 分页 拼接数据
-							if (_this.pageNo != 1) {
-								_this.partList = _this.partList ? _this.partList.concat(this.fiterChecked(list)) : this.fiterChecked(list)
-							} else {
-								_this.partList = this.fiterChecked(list)
-							}
-							this.total = res.data.count
-							console.log(_this.status)
-							if (_this.partList.length == res.data.count) {
-								_this.status = 'nomore'
-							} else {
-								_this.status = 'loadmore'
-							}
-							console.log(_this.status)
-						} else {
-							console.log(_this.status)
-							_this.partList = list || []
-							this.total = 0
-							_this.status = 'nomore'
-						}
-						console.log(_this.status)
-						_this.noDataText = '暂无配件'
-					}else{
-						_this.status = 'loadmore'
-						_this.partList = []
-						_this.total = 0
-						_this.noDataText = res.message ? res.message : '网络似乎出错了,请稍后再试'
-					}
-				})
-			},
-			// 加载更多
-			onreachBottom () {
-				if(this.partList.length < this.total ){
-					if(this.isGobleSearch&&this.queryWord==''){
-						return
-					}
-					this.pageNo++
-					this.getShelfProductList()
-				}else{
-					this.status = "nomore"
-				}
-			},
-			// 过滤已选择的
-			fiterChecked (list){
-				this.$store.state.vuex_shelfChoosePart.map(item => {
-					let p = list.find(k => {
-						return k.productSn == item.productSn
-					})
-					if(p){
-						p.checked = true
-					}
-				})
-				return list
-			},
-			// 对比已选择项目
-			hasChecked (row){
-				let b = this.$store.state.vuex_shelfChoosePart
-				let has = b.findIndex(item => {
-					return item.productSn && item.productSn == row.productSn
-				})
-				return has
-			},
-			// 选择配件
-			choosePart(item,type){
-				const hs = this.hasChecked(item)
-				const b = this.$store.state.vuex_shelfChoosePart
-				// 取消选择
-				if(hs>=0){
-					item.checked = false
-					b.splice(hs,1)
-				}else{
-					item.checked = true
-					item.qty = 1
-					b.push(item)
-				}
-				if(type==0){
-					this.vinPartList.splice()
-				}else{
-					this.partList.splice()
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="less">
-	.moreShelfPart{
-		height: 100vh;
-		.moreShelfPart-search{
-			padding: 20rpx;
-		}
-		.moreShelfPart-body{
-			flex-grow: 1;
-			background-color: #fff;
-		}
-		.moreShelfPart-footer{
-			padding: 20rpx;
-			color: #191919;
-			font-size: 26rpx;
-			text-align: center;
-		}
-		.nav-right{
-			padding: 0 30upx;
-			height: calc(100vh - 180rpx);
-			box-sizing: border-box;
-			.nav-right-title{
-				font-weight: bold;
-				font-size: 32upx;
-				padding: 10rpx 0;
-			}
-			.nav-right-item{
-				padding: 10upx;
-				border-bottom: 2rpx solid #f5f5f5;
-				display: flex;
-				.item-info{
-					padding-left: 20rpx;
-					.item-name{
-						font-size: 32upx;
-						display: flex;
-						align-items: center;
-						>image{
-							width: 38rpx;
-							height: 38rpx;
-							margin-right: 10rpx;
-						}
-						>text{
-							flex: 1;
-							word-break: break-all;
-						}
-					}
-					.item-detail{
-						.item-detail-info{
-							padding: 10upx 0 4upx;
-						}
-						.item-detail-text{
-							font-size: 24upx;
-							color: #999;
-							margin-right: 20upx;
-							word-break: break-all;
-						}
-						.item-price{
-							margin-top: 10upx;
-							.item-detail-text{
-								color: #333;
-							}
-						}
-						 
-						.nav-right-item-btns{
-							text-align: right;
-							margin-top: 10rpx;
-							> view{
-								&:first-child{
-									.item-btn {
-										margin-right: 10upx;
-										width: auto;
-									}
-								}
-								&:last-child{
-									.item-btn {
-										margin-left: 10upx;
-									}
-								}
-							}
-							.item-btn-icon{
-								margin-left: 30upx;
-								vertical-align: middle;
-							}
-							.item-btn {
-								width: 112upx;
-								&:after{
-									border-color: #aaa;
-								}
-							}
-							.item-btn.btn-unselected{
-								background-color: #2db7f5!important;;
-								border-color: #2db7f5!important;;
-							}
-							.item-btn.btn-selected{
-								background-color: #19be6b!important;;
-								border-color: #19be6b!important;
-							}
-						}
-					}
-				}
-				.item-btn{
-					margin: 0;
-					width: 112upx;
-					color: #fff;
-				}
-				.item-btn.btn-unselected{
-					background-color: #2db7f5!important;;
-					border-color: #2db7f5!important;;
-				}
-				.item-btn.btn-selected{
-					background-color: #19be6b!important;;
-					border-color: #19be6b!important;
-				}
-			}
-		}
-	}
-</style>

+ 0 - 246
pages/digitalShelf/temproaryStockIn/temproaryStockIn.vue

@@ -1,246 +0,0 @@
-<template>
-	<view class="temproaryPages flex flex_column">
-		<view class="temproary-head">
-			<view>经销商:{{$store.state.vuex_storeShelf.dealerName}}</view>
-			<view class="notes">具体的临配价格请与配件经销商沟通确认</view>
-		</view>
-		<view class="temproary-body">
-			<div class="cpb_cart-box flex flex_column">
-				<div class="cpb_cart-tit">
-					<div class="flex align_center">
-						<span class="line"></span>
-						<span>选择配件</span>
-					</div>
-					<div class="add" @click="morePart">添加更多临配配件</div>
-				</div>
-				<div class="cpb_cart-list">
-					<view class="nav-right-item flex" v-for="(item, index) in partList" :key="item.id">
-						<view class="uni-col-2">
-							<u-image :src="item.images+'?x-oss-process=image/resize,m_fixed,h_120,w_120,color_ffffff'" @click="viewImg(item)" border-radius="30" width="120" height="120" bg-color="#EBEBEB" ></u-image>
-						</view>
-						<view class="item-info uni-col-10">
-							<view class="item-name">
-								<text>{{item.name}}</text>
-							</view>
-							<view class="item-detail">
-								<view class="item-detail-info">
-									<view class="flex justify_between">
-										<view class="item-detail-text flex_1">
-											<text class="item-detail-text">{{item.code}}</text>
-										</view>
-										<view class="item-detail-text">
-											<u-number-box v-model="item.qty" @change="numberChange" :index="'cart_'+item.productSn" :min="0"></u-number-box>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</div>
-			</div>
-		</view>
-		<view class="temproary-footer">
-			<u-button type="primary" @click="submitForm" :custom-style="{background:'#1283d4',fontSize:'32rpx'}" shape="circle">确认提交</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { shelfTemporarySave } from '@/api/shelf.js'
-	export default {
-		data() {
-			return {
-				vinNumber: '',
-				dealerPhone: ''
-			}
-		},
-		computed: {
-			partList() {
-				return this.$store.state.vuex_shelfChoosePart
-			}
-		},
-		onLoad(option) {
-			this.vinNumber = option.vinNumber
-		},
-		onReady() {
-			const shelfInfo = this.$store.state.vuex_storeShelf
-			this.dealerPhone = shelfInfo&&shelfInfo.contactMobile ? shelfInfo.contactMobile : ''
-			// #ifdef APP-PLUS
-			var webView = this.$mp.page.$getAppWebview();
-			if(this.dealerPhone==''){
-				webView.setTitleNViewButtonStyle(0,{text:"",color:"#FFFFFF"}); 
-			}
-			// #endif
-		},
-		// 点击导航栏按钮
-		onNavigationBarButtonTap() {
-			if(this.dealerPhone!=''){
-				uni.makePhoneCall({
-					phoneNumber: this.dealerPhone
-				})
-			}
-		},
-		methods: {
-			viewImg(item){
-				uni.previewImage({
-					urls: [item.images]
-				})
-			},
-			numberChange(e){
-				console.log(e)
-				const rowIndex = this.partList.findIndex(item => 'cart_'+item.productSn == e.index)
-				if(e.value == 0){
-					this.partList.splice(rowIndex,1)
-				}
-			},
-			formatData(){
-				let ret = []
-				this.partList.map(item => {
-						ret.push({
-						 "productSn" : item.productSn,
-						 "price": item.cost,
-						 "qty":item.qty
-						})
-				})
-				return ret
-			},
-			// 更多配件
-			morePart(){
-				uni.navigateTo({
-					url:"/pages/digitalShelf/temproaryStockIn/moreShelfProduct?vinNumber="+this.vinNumber
-				})
-			},
-			// 确认提交
-			submitForm(){
-				if(this.partList.length){
-					shelfTemporarySave({
-					 "temporaryDispatchingBillDetailApiEntityList": this.formatData()
-					}).then(res => {
-						uni.showToast({icon: 'none',title: res.message})
-						if(res.status == 200){
-							setTimeout(()=>{
-								uni.navigateBack()
-							},500)
-						}
-					})
-				}else{
-					uni.showToast({icon: 'none',title: "请选择配件"})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="less">
-.temproaryPages{
-	height: 100vh;
-	.temproary-head{
-		background-color: #fff;
-		padding: 20rpx;
-		font-size: 32rpx;
-		.notes{
-			font-size: 30rpx;
-			color: #FF9528;
-		}
-	}
-	.temproary-footer{
-		background-color: #fff;
-		padding: 20rpx 10%;
-	}
-	.temproary-body{
-		flex-grow: 1;
-	}
-	.nav-right-item{
-		background-color: #fff;
-		padding: 15upx 25upx;
-		border-bottom: 2rpx solid #f5f5f5;
-		.item-info{
-			padding-left: 20upx;
-			.item-name{
-				font-size: 32upx;
-				color: #191919;
-				display: flex;
-				align-items: center;
-				>image{
-					width: 38rpx;
-					height: 38rpx;
-					margin-right: 10rpx;
-				}
-				>text{
-					flex: 1;
-					word-break: break-all;
-				}
-			}
-			.item-detail{
-				.item-detail-info{
-					padding: 10upx 0 4upx;
-					> view{
-						padding-bottom: 10rpx;
-						align-items: center;
-						.item-detail-text{
-							color: #999;
-							.phtxt{
-								color: #0485F6;
-								font-size: 28upx;
-							}
-							.item-price{
-								color: #FB1E1E;
-								font-size: 28upx;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	.cpb_cart-box{
-		width: 100%;
-		padding: 20rpx 0 0;
-		font-size: 32rpx;
-		height: 100%;
-		.cpb_cart-tit{
-			background-color: #fff;
-			padding: 20rpx;
-			display: flex;
-			justify-content: space-between;
-			.add{
-				color: #0485F6;
-			}
-			.line{
-				width: 8rpx;
-				height: 34rpx;
-				background-color: #0485F6;
-				border-radius: 6rpx;
-				margin-right: 15rpx;
-			}
-		}
-		.cpb_cart-list{
-			flex-grow: 1;
-			overflow: auto;
-			.item-info{
-				border-bottom:2rpx solid #f8f8f8;
-			}
-			.item-detail{
-				.item-detail-info{
-					padding: 10upx 0 4upx;
-					> view{
-						padding-bottom: 30rpx;
-						align-items: center;
-						.item-detail-text{
-							color: #999;
-							.phtxt{
-								color: #0485F6;
-								font-size: 28upx;
-							}
-							.item-price{
-								color: #FB1E1E;
-								font-size: 28upx;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
-</style>

+ 42 - 6
pages/index/index.vue

@@ -10,14 +10,14 @@
 				<scrollBox :list="list"></scrollBox>
 				<scrollBox :list="list"></scrollBox>
 			</view>
 			</view>
 			<!-- 保证金 -->
 			<!-- 保证金 -->
-			<view class="notices flex align_center">
-				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有一笔保证金待支付 ¥2,000.00</view> <text>立即支付>></text>
+			<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>立即支付>></text>
 			</view>
 			</view>
 			<!-- 名片 -->
 			<!-- 名片 -->
 			<view class="userCard flex align_center justify_between" @click="toUser">
 			<view class="userCard flex align_center justify_between" @click="toUser">
 				<view class="userCard-info flex align_center justify_between">
 				<view class="userCard-info flex align_center justify_between">
 					<view>
 					<view>
-						<u-image v-if="!hasLogin" src="/static/def_personal_avatar.png" width="90" height="90"></u-image>
+						<u-image v-if="!hasLogin" src="/static/def_personal_avatar.png" width="60" height="60"></u-image>
 						<open-data v-else type="userAvatarUrl" class="user-photo"></open-data>
 						<open-data v-else type="userAvatarUrl" class="user-photo"></open-data>
 					</view>
 					</view>
 					<view>
 					<view>
@@ -63,12 +63,14 @@
 	    mapMutations
 	    mapMutations
 	} from 'vuex'
 	} from 'vuex'
 	import scrollBox from '@/components/scrollBox.vue'
 	import scrollBox from '@/components/scrollBox.vue'
+	import { shelfBondRecordWaitPayRecord, findStoreShelf } from '@/api/shelf.js'
 	export default {
 	export default {
 		components: {
 		components: {
 			scrollBox
 			scrollBox
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
+				bondRecord: null, // 保证金
 				list:[
 				list:[
 				{
 				{
 					userName: '一部'
 					userName: '一部'
@@ -92,12 +94,38 @@
 			}
 			}
 		},
 		},
 		computed: {
 		computed: {
-			...mapState(['hasLogin'])
+			...mapState(['hasLogin']),
+			hasShelf(){
+				return this.$store.state.vuex_storeShelf
+			}
 		},
 		},
 		onLoad() {
 		onLoad() {
-
+			this.getStoreShelf()
 		},
 		},
 		methods: {
 		methods: {
+			// 查询是否支持数字货架
+			getStoreShelf(){
+				findStoreShelf().then(res => {
+						console.log(res)
+						this.$store.state.vuex_storeShelf = res.data;
+						if(res.data){
+							// 保证金查询
+							this.getShelfBWPayRecord()
+						}
+				})
+			},
+			// 获取保证金金额
+			getShelfBWPayRecord(){
+				const data = this.$store.state.vuex_storeShelf
+				shelfBondRecordWaitPayRecord({shelfSn: data.shelfSn, storeSn: data.storeSn}).then(res => {
+					console.log(res,'获取保证金金额')
+					this.bondRecord = res.data
+				})
+			},
+			// 保证金支付
+			toPayBondAmount(){
+				 
+			},
 			// 去扫描
 			// 去扫描
 			openCamera(){
 			openCamera(){
 				uni.navigateTo({
 				uni.navigateTo({
@@ -146,7 +174,7 @@
 			flex-grow: 1;
 			flex-grow: 1;
 			padding: 0.5em 1em;
 			padding: 0.5em 1em;
 			.notices{
 			.notices{
-				padding: 0.5em 0 1em;
+				padding: 0.5em 0 0;
 				view{
 				view{
 					color: #f2a557;
 					color: #f2a557;
 				}
 				}
@@ -156,6 +184,7 @@
 				}
 				}
 			}
 			}
 			.userCard{
 			.userCard{
+				margin-top: 0.8em;
 				padding:0.8em;
 				padding:0.8em;
 				background: #fff;
 				background: #fff;
 				border-radius: 1em;
 				border-radius: 1em;
@@ -170,6 +199,13 @@
 						}
 						}
 					}
 					}
 				}
 				}
+				.user-photo{
+					display: block;
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 50%;
+					overflow: hidden;
+				}
 			}
 			}
 			.scanButton{
 			.scanButton{
 				margin: 0.6em 0;
 				margin: 0.6em 0;

+ 2 - 2
pages/scan-frame/scan-frame.vue

@@ -122,11 +122,10 @@ export default {
 		  filePath: filePath,
 		  filePath: filePath,
 		  encoding: 'base64',
 		  encoding: 'base64',
 		  success: (base) => {
 		  success: (base) => {
-			const base64Str = 'data:image/' + this.imageInfo.type + ';base64,' + base.data
 			// 拿到base64,不需要base64  就把上层的转换去掉
 			// 拿到base64,不需要base64  就把上层的转换去掉
 			this.scanShow = true
 			this.scanShow = true
 			// 此处为后端接口 传base64图片 进行ocr识别
 			// 此处为后端接口 传base64图片 进行ocr识别
-			this.parseVinNo(base64Str)
+			this.parseVinNo(base.data)
 		  },
 		  },
 		  fail: (err) => {
 		  fail: (err) => {
 			uni.hideLoading()
 			uni.hideLoading()
@@ -148,6 +147,7 @@ export default {
 	// 识别vin
 	// 识别vin
 	parseVinNo(data) {
 	parseVinNo(data) {
 		const _this = this
 		const _this = this
+		const base64Str = 'data:image/' + this.imageInfo.type + ';base64,' + data
 		vinCode({
 		vinCode({
 			imageByte: data
 			imageByte: data
 		}).then(res => {
 		}).then(res => {

二進制
static/icon_delete@3x.png


二進制
static/icon_shopping@3x.png


+ 6 - 40
store/index.js

@@ -34,7 +34,7 @@ const store = new Vuex.Store({
          * 是否需要强制登录
          * 是否需要强制登录
          */
          */
         forcedLogin: false,
         forcedLogin: false,
-        hasLogin: false,
+        hasLogin: true,
 		openid: "",
 		openid: "",
 		isOpenLocation: false, // 用户是否开启授权开启定位
 		isOpenLocation: false, // 用户是否开启授权开启定位
 		orderStatusList: [], // 服务订单状态数据字典数据
 		orderStatusList: [], // 服务订单状态数据字典数据
@@ -42,9 +42,11 @@ const store = new Vuex.Store({
 		// 加上vuex_前缀,是防止变量名冲突,也让人一目了然
 		// 加上vuex_前缀,是防止变量名冲突,也让人一目了然
 		vuex_carBrandList: lifeData.vuex_carBrandList ? lifeData.vuex_carBrandList : [] ,// 车型品牌数据
 		vuex_carBrandList: lifeData.vuex_carBrandList ? lifeData.vuex_carBrandList : [] ,// 车型品牌数据
 		vuex_carType: {}, // 选择的车辆品牌
 		vuex_carType: {}, // 选择的车辆品牌
-		// 检测单详情数据
-		vuex_checkOrderData:null,
-		deviceNo: ""
+		deviceNo: "",
+		vuex_storeShelf: null, // 数字货架是否启用
+		vuex_settleRecordDetail: null, // 结算记录详情
+		vuex_settleOrderDetail: null, // 结算记录订单详情
+		vuex_shelfChoosePart: [], // 数字货架临配选择配件
     },
     },
 	getters:{
 	getters:{
 		getOpeid(state){
 		getOpeid(state){
@@ -53,7 +55,6 @@ const store = new Vuex.Store({
 	},
 	},
     mutations: {
     mutations: {
         login(state, userInfo) {
         login(state, userInfo) {
-			console.log(userInfo,'--token')
             state.hasLogin = true;
             state.hasLogin = true;
 			uni.setStorageSync('token', userInfo.token);
 			uni.setStorageSync('token', userInfo.token);
 			uni.setStorageSync('userInfo', userInfo.user);
 			uni.setStorageSync('userInfo', userInfo.user);
@@ -66,9 +67,6 @@ const store = new Vuex.Store({
 		openId(state,id) {
 		openId(state,id) {
 			state.openid = id
 			state.openid = id
 		},
 		},
-		checkOrder(state,data) {
-			state.vuex_checkOrderData = data
-		},
 		$uStore(state, payload) {
 		$uStore(state, payload) {
 			// 判断是否多层级调用,state中为对象存在的情况,诸如user.info.score = 1
 			// 判断是否多层级调用,state中为对象存在的情况,诸如user.info.score = 1
 			let nameArr = payload.name.split('.');
 			let nameArr = payload.name.split('.');
@@ -124,30 +122,6 @@ const store = new Vuex.Store({
 				}
 				}
 			})
 			})
 		},
 		},
-		// 版本检测
-		checekAppUpdate(){
-			const updateManager = uni.getUpdateManager();
-			updateManager.onCheckForUpdate(function (res) {
-			  // 请求完新版本信息的回调
-			  console.log(res.hasUpdate);
-			});
-			updateManager.onUpdateReady(function (res) {
-			  uni.showModal({
-			    title: '更新提示',
-			    content: '新版本已经准备好,是否重启应用?',
-			    success(res) {
-			      if (res.confirm) {
-			        // 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
-			        updateManager.applyUpdate();
-			      }
-			    }
-			  });
-			
-			});
-			updateManager.onUpdateFailed(function (res) {
-			  // 新的版本下载失败
-			});
-		},
 		// 检测是否登录
 		// 检测是否登录
 		checkLogin(context,data){
 		checkLogin(context,data){
 			checkLogin().then(res => {
 			checkLogin().then(res => {
@@ -166,17 +140,14 @@ const store = new Vuex.Store({
 					// 判断手机设置是否开启对微信的定位服务
 					// 判断手机设置是否开启对微信的定位服务
 					const systemInfo = uni.getSystemInfoSync()
 					const systemInfo = uni.getSystemInfoSync()
 					if(systemInfo.locationAuthorized) {
 					if(systemInfo.locationAuthorized) {
-						console.log('授权定位开启----------')
 						context.commit('isOpenLocation', true)
 						context.commit('isOpenLocation', true)
 					} else {
 					} else {
-						console.log('授权定位未开启----------')
 						context.commit('isOpenLocation', false)
 						context.commit('isOpenLocation', false)
 					}
 					}
 			    },
 			    },
 				fail() {
 				fail() {
 					uni.getSetting({
 					uni.getSetting({
 					   success(res) {
 					   success(res) {
-					      console.log(res.authSetting,'gggggggggg')
 						  if(!res.authSetting['scope.userLocation'] || !res.authSetting['scope.userLocationBackground']){
 						  if(!res.authSetting['scope.userLocation'] || !res.authSetting['scope.userLocationBackground']){
 							context.commit('isOpenLocation', false)
 							context.commit('isOpenLocation', false)
 						  } else {
 						  } else {
@@ -197,11 +168,6 @@ const store = new Vuex.Store({
 				context.commit('orderStatusList', res.data || [])
 				context.commit('orderStatusList', res.data || [])
 			})
 			})
 		},
 		},
-		// 获取检测单详情数据
-		getCheckOrderData(context,data){
-			console.log(data,'==========data============index.js')
-			context.commit('checkOrder', data)
-		}
 	}
 	}
 })
 })