111

package-lock.json

@@ -1,8 +1,109 @@
 {
 	"name": "lsm_oil_site",
 	"version": "1.0.0",
-  "lockfileVersion": 1,
+	"lockfileVersion": 2,
 	"requires": true,
+	"packages": {
+		"": {
+			"name": "lsm_oil_site",
+			"version": "1.0.0",
+			"license": "ISC",
+			"dependencies": {
+				"axios": "^0.19.2",
+				"crypto-js": "4.0.0",
+				"js-cookie": "2.2.1",
+				"js-md5": "0.7.3",
+				"jsencrypt": "^3.0.0-rc.1",
+				"tki-qrcode": "^0.1.6",
+				"tsc": "^2.0.3",
+				"typescript": "^4.3.5",
+				"uview-ui": "^1.8.4"
+			}
+		},
+		"node_modules/axios": {
+			"version": "0.19.2",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+			"integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+			"deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410",
+			"dependencies": {
+				"follow-redirects": "1.5.10"
+			}
+		},
+		"node_modules/crypto-js": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.0.0.tgz",
+			"integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
+		},
+		"node_modules/debug": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+			"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/follow-redirects": {
+			"version": "1.5.10",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+			"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+			"dependencies": {
+				"debug": "=3.1.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/js-cookie": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz",
+			"integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg="
+		},
+		"node_modules/js-md5": {
+			"version": "0.7.3",
+			"resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz",
+			"integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I="
+		},
+		"node_modules/jsencrypt": {
+			"version": "3.0.0-rc.1",
+			"resolved": "https://registry.npm.taobao.org/jsencrypt/download/jsencrypt-3.0.0-rc.1.tgz",
+			"integrity": "sha1-DgpHRLpDzFV/tc9i/oZGvOtWGxw="
+		},
+		"node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+		},
+		"node_modules/tki-qrcode": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz",
+			"integrity": "sha1-cTc9nEs/iUT6pU0+6Ziroz2X3n8="
+		},
+		"node_modules/tsc": {
+			"version": "2.0.3",
+			"resolved": "https://registry.nlark.com/tsc/download/tsc-2.0.3.tgz",
+			"integrity": "sha1-A3/leeO9Z6XL2qYEtDxsGZGwS+8=",
+			"bin": {
+				"tsc": "bin/tsc"
+			}
+		},
+		"node_modules/typescript": {
+			"version": "4.3.5",
+			"resolved": "https://registry.nlark.com/typescript/download/typescript-4.3.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftypescript%2Fdownload%2Ftypescript-4.3.5.tgz",
+			"integrity": "sha1-TRw3zBbok5c8RaBohrcRMjTxGfQ=",
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=4.2.0"
+			}
+		},
+		"node_modules/uview-ui": {
+			"version": "1.8.4",
+			"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz",
+			"integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA=="
+		}
+	},
 	"dependencies": {
 		"axios": {
 			"version": "0.19.2",

pages/stationDetail/ZYSite.vue

@@ -106,7 +106,7 @@
 					
 					<view  style="flex-grow: 1; display: flex;" @tap="showModel='show'">
 						<view v-if="hz(carNumber.charAt(0))" class="sign">
-						{{carNumber.charAt(0)||''}}
+						<text v-if="carNumber">{{carNumber.charAt(0)||''}}</text>
 						<uni-icons color="#ffffff" type="forward" size="15"></uni-icons>
 						</view>
 					    <view class="flexcenter">{{carNumber.substr(1,6)||'请输入车牌号'}}</view>
@@ -203,13 +203,15 @@
 								<text>约￥{{insertResult.vMoney|numberFilter}}</text>
 							</view>
 							<view class="cu-form-group" v-else>
-								<view class="title newtitle"> {{siteData.siteType=='2'?'加气金额':'加油金额'}}</view>
+								<view class="title newtitle"> {{siteData.siteType=='2'?'加气升数':'加油金额'}}</view>
-								<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气金额':'加油金额'}`" @input="checkNumber" type="digit" @blur="getMoney"
+								<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气升数':'加油金额'}`" @input="checkNumber" type="digit" @blur="getMoney"
 									v-model="insertResult.vol" name="input" />
 								<view style="width: 170rpx;text-align: end;" class="textEllipsis">
 									<text class="">
 										<!-- 约 {{ vlom? vlom:'xxx.x'  }} L clc 注销 -->
-										{{vlom?'约' +  ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'KG':'L'):''}}
+										<text v-if="siteData.siteType!='2'">{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}</text>
+										<text v-if="siteData.siteType=='2'">{{vlom?'约' +  ( insertResult.vDoMoney ? insertResult.vDoMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}</text>
+										<!-- {{vlom?'约' +  ( (Math.round(vlom*100)/100).toFixed(2) ) + 'L':''}} -->
 									</text>
 								</view>  
 							</view>
@@ -537,7 +539,8 @@
 						userType: uerTyps,
 						xoilAmountGun: e.detail.value,
 						priceId: this.activeSitePrice,
-						companyId: this.siteData.companyId
+						companyId: this.siteData.companyId,
+						createSource:this.siteData.siteType=='2'?'XOIL':''
 					}
 				}
 				this.xoilAmountGun = e.detail.value
@@ -950,7 +953,7 @@
 						oilCardType: this.siteData.oilCardNature, //类型：String  必有字段  备注：油卡性质 1：个人 2：企业 3：外请
 						accountCardCode: this.siteData.accountCardCode, //类型：String  必有字段  备注：油卡卡号
 						siteUserName: "1", //类型：String  必有字段  备注：加油员名称
-						version: 1, //类型：Number  必有字段  备注：版本号
+						version: this.siteData.siteType=='2'?'XOIL':'', //类型：Number  必有字段  备注：版本号
 						xoilAmountGun: this.insertResult.vol, //类型：String  必有字段  备注：加油升数
 					}
 				} else {
@@ -975,7 +978,7 @@
 						oilCardType: this.siteData.oilCardNature, //类型：String  必有字段  备注：油卡性质 1：个人 2：企业 3：外请
 						accountCardCode: this.siteData.accountCardCode, //类型：String  必有字段  备注：油卡卡号
 						siteUserName: "1", //类型：String  必有字段  备注：加油员名称
-						version: 1, //类型：Number  必有字段  备注：版本号
+						version: this.siteData.siteType=='2'?'XOIL':'', //类型：Number  必有字段  备注：版本号
 						xoilAmountGun: this.insertResult.vol, //类型：String  必有字段  备注：加油升数
 					}
 				}

utils/request.js

@@ -7,7 +7,7 @@ import utils from '@/utils/encode'
 //42 洛超  /29 孙志华 /40 阿浩
 // 测试日日顺时需要连阿浩
 
-const testUrl = 'http://192.168.0.28:38080'
+const testUrl = 'http://192.168.0.31:38080'
 // const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old
 const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
 // const productionUrl = 'http://121.196.213.68/adminapi' //预生产