lilei 4 anni fa
parent
commit
8bfa1f6158
6 ha cambiato i file con 26 aggiunte e 18 eliminazioni
  1. 1 1
      App.vue
  2. 1 1
      libs/axios.js
  3. 12 6
      libs/tools.js
  4. 12 10
      pages/index/index.vue
  5. BIN
      static/liucheng.png
  6. BIN
      static/shouyi.png

+ 1 - 1
App.vue

@@ -1,6 +1,6 @@
 <script>
 	// const uat_URL = 'https://carwash.test.zyucgj.com/gc-shop/' // 预发布
-	const uat_URL = 'http://192.168.16.102:8302/gc-shop/' // 本地
+	const uat_URL = 'http://192.168.16.103:8302/gc-shop/' // 本地
 	const pro_URL = 'https://carwash.zyucgj.com/gc-shop/'  // 生产
 	const buildType = 0 // 打包环境对应类型,1 生产 0 预发布
 	const buildURL = buildType ? pro_URL : uat_URL // 打包后实际对应的url

+ 1 - 1
libs/axios.js

@@ -44,7 +44,7 @@ const request = (opts, hasToken) => {
 							icon:'none',
 							title: ret.message,
 							mask: true,
-							duration: 3000 
+							duration: 5000 
 						})
 					}
 					resolve(ret)

+ 12 - 6
libs/tools.js

@@ -10,13 +10,19 @@ export function objToUrl(obj) {
   return uri;
 }
 
-export function getQueryString(url,name) {
-    var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
-    var r = url.match(reg);
-    if (r != null) {
-        return unescape(r[2]);
+export function parseQueryString(url) {
+    var obj = {};
+    var keyvalue = [];
+    var key = "",
+        value = "";
+    var paraString = url.substring(url.indexOf("?") + 1, url.length).split("&");
+    for (var i in paraString) {
+        keyvalue = paraString[i].split("=");
+        key = keyvalue[0];
+        value = keyvalue[1];
+        obj[key] = value;
     }
-    return null;
+    return obj;
 }
 
 

+ 12 - 10
pages/index/index.vue

@@ -70,7 +70,7 @@
 	import {getLookUpDatas,openDevice} from '@/api/data.js'
 	import {stationList} from '@/api/station.js'
 	import {checkLogin} from '@/api/login.js'
-	import {getQueryString} from '@/libs/tools.js'
+	import {parseQueryString} from '@/libs/tools.js'
 	export default {
 		data() {
 			return {
@@ -249,10 +249,6 @@
 			// 扫码核销
 			smHx(){
 				const _this = this
-				// uni.navigateTo({
-				// 	url: '/pages/checkOut/checkOut'
-				// })
-				// return
 				uni.scanCode({
 					success(e) {
 						console.log(e)
@@ -263,7 +259,9 @@
 						}
 						// 小程序码,用户核销
 						if(e.scanType == 'WX_CODE'){
-							
+							// uni.navigateTo({
+							// 	url: '/pages/checkOut/checkOut'
+							// })
 						}
 					},
 					fail(err) {
@@ -273,11 +271,15 @@
 			},
 			// 开箱
 			openDevice(data){
-				openDevice({
-					id: getQueryString(data,"id"),
-					type: getQueryString(data,"type")
-				}).then(res => {
+				let params = parseQueryString(data)
+				openDevice(params).then(res => {
 					console.log(res)
+					if(res.status == 200){
+						uni.showToast({
+							icon:"none",
+							title:"开启成功"
+						})
+					}
 				})
 			},
 			// 查看网点

BIN
static/liucheng.png


BIN
static/shouyi.png