From b431e3c7dd5073c043b73c3d988cdcfc58e3369b Mon Sep 17 00:00:00 2001
From: caolc <572275724@qq.com>
Date: Wed, 2 Nov 2022 22:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AppletCode/pages/index/index.vue          | 15 +++----
 BagStation/pages/components/price-tab.vue |  6 +--
 package-lock.json                         | 51 +----------------------
 utils/request.js                          |  8 ++--
 4 files changed, 15 insertions(+), 65 deletions(-)

diff --git a/AppletCode/pages/index/index.vue b/AppletCode/pages/index/index.vue
index 26013eb..5dfbdd9 100644
--- a/AppletCode/pages/index/index.vue
+++ b/AppletCode/pages/index/index.vue
@@ -187,13 +187,14 @@
 					})
 					return
 				}
-				if (!this.replace.verification) {
-					uni.showToast({
-						title: '请输入验证码',
-						icon: 'none'
-					})
-					return
-				}
+				// if (!this.replace.verification) {
+				// 	uni.showToast({
+				// 		title: '请输入验证码',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
+				
 				// this.postData.phone = this.replace.phone;
 				// this.animation = true;
 				// this.postData.name = '';
diff --git a/BagStation/pages/components/price-tab.vue b/BagStation/pages/components/price-tab.vue
index 89d1777..3d90064 100644
--- a/BagStation/pages/components/price-tab.vue
+++ b/BagStation/pages/components/price-tab.vue
@@ -115,10 +115,8 @@
 					// console.log(String(value).split('.')[1].substring(2,4),String(value).split('.')[1].length,'*-*-*-*-');
 					// console.log( Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}`)+0.01,'************');
 					// return String(value).split('.')[1]&&String(value).split('.')[1].length>2? Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}`)+0.01 :Number(value).toFixed(2);
-					return String(value).split('.')[1]&&String(value).split('.')[1].length>2? Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,1)}${ Number(String(value).split('.')[1].substring(1,2)) + 1}`)  :Number(value).toFixed(2);
-					// console.log(value,String(value).split('.')[1],'***');
-					
-					// return Number(value).toFixed(2)
+					return String(value).split('.')[1]&&String(value).split('.')[1].length>2? 
+					 Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,3)}`).toFixed(2) :Number(value).toFixed(2);
 				} else {
 					return Number(value).toFixed(2)
 				}
diff --git a/package-lock.json b/package-lock.json
index b252cce..7d3af08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,57 +1,8 @@
 {
   "name": "wechat-oil-company",
   "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "wechat-oil-company",
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "crypto-js": "^4.0.0",
-        "js-md5": "^0.7.3"
-      }
-    },
-    "node_modules/axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
-      "dependencies": {
-        "follow-redirects": "^1.10.0"
-      }
-    },
-    "node_modules/crypto-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.nlark.com/crypto-js/download/crypto-js-4.0.0.tgz",
-      "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
-      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "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="
-    }
-  },
   "dependencies": {
     "axios": {
       "version": "0.21.1",
diff --git a/utils/request.js b/utils/request.js
index 63c8095..8505b0c 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,15 +1,15 @@
 import axios from 'axios'
 import utils from '@/utils/encode'
 // const env = process.env.NODE_ENV
-const env = 'production'/*  */
+// const env = 'production'/*  */
 // const env = 'test'
-// const env = 'production'
+const env = 'production'
  // 45
-const testUrl = 'http://192.168.0.45:38080'
+const testUrl = 'http://192.168.0.54:38080'
 // const productUrl = 'https://www.xingoil.com/adminapi'
 
 const productUrl = 'http://uat.xingoil.com/adminapi'
-// const productUrl = 'http://192.168.0.191:38080' 
+// const productUrl = 'http://192.168.0.191:38080' 	
 // const productUrl = 'http://121.196.213.68/adminapi'
 const service = axios.create({
 	baseURL: env == 'production' ? productUrl : testUrl,