dedsudiyu дней назад: 5
Родитель
Сommit
e12c48d51c
9 измененных файлов с 175 добавлено и 425 удалено
  1. 1 34
      api/index.js
  2. 50 0
      api/indexAKY.js
  3. 9 1
      api/request/config.js
  4. 0 356
      api/request/request.js
  5. 85 0
      api/request/requestAKY.js
  6. 1 1
      manifest.json
  7. 0 3
      pages/commodityInfo.vue
  8. 10 12
      pages/home.vue
  9. 19 18
      pages/login.vue

+ 1 - 34
api/index.js

@@ -1,4 +1,4 @@
-import { apiResquest,apiResquestForm,apiResquestJsonList,apiResquestFormVideo,apiResquestTimer } from '@/api/request/request.js'
+import { apiResquest } from '@/api/request/request.js'
 
 //mock开关
 const USE_MOCK = true; 
@@ -17,39 +17,6 @@ const mockResponse = (data) => {
   });
 };
 
-// 登录
-export const login = (data) => {
-  if (USE_MOCK) {
-    return mockResponse({
-			token:'123456',
-			phone:'13333333333',
-			userId:'123',
-		});
-  }
-  return apiResquest({
-    url: `/demo/demo/demo1`,
-    method: 'POST',
-    data: { ...data }
-  })
-};
-
-// 获取用户信息
-export const getUserInfo = (data) => {
-  if (USE_MOCK) {
-    return mockResponse({
-      userName:'张三',
-			phone:'13333333333',
-			points:'999',
-    });
-  }
-
-  return apiResquest({
-    url: `/demo/demo/demo2`,
-    method: 'GET',
-    data: data,
-  })
-};
-
 // 获取商品信息
 export const getCommodityInfo = (data) => {
   // if (USE_MOCK) {

+ 50 - 0
api/indexAKY.js

@@ -0,0 +1,50 @@
+import { apiResquest } from '@/api/request/requestAKY.js'
+
+//mock开关
+const USE_MOCK = true; 
+const mockResponse = (data) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve({
+				data: {
+					code: 200,
+					message: "success",
+					data: data
+				},
+				statusCode: 200
+      });
+    }, 500);
+  });
+};
+
+// 登录
+export const login = (data) => {
+  // if (USE_MOCK) {
+  //   return mockResponse({
+		// 	token:'123456',
+		// 	phone:'13333333333',
+		// 	userId:'123',
+		// });
+  // }
+  return apiResquest({
+    url: `/sdaq/Api/CheckUsr.php`,
+    method: 'GET',
+    data: data,
+  })
+};
+
+// 获取用户信息
+export const getUserInfo = (data) => {
+  // if (USE_MOCK) {
+  //   return mockResponse({
+  //     userName:'张三',
+		// 	phone:'13333333333',
+		// 	points:'999',
+  //   });
+  // }
+  return apiResquest({
+    url: `/sdaq/Api/GetUpoint.php`,
+    method: 'GET',
+    data: data,
+  })
+};

+ 9 - 1
api/request/config.js

@@ -1,5 +1,13 @@
 const config = {
-	base_url: 'http://192.168.1.55:8080', //安科院
+	//缙云山
+	base_url: 'https://sdaqcom.anquanyue.cn/sdaqSale',
+	aky_url: 'https://sdaqcom.anquanyue.cn', 
+	//萁山
+	// base_url: 'https://qssdaq.anquanyue.cn/qssdaqSale',
+	// aky_url: 'https://qssdaq.anquanyue.cn',
+	//方斗山
+	// base_url: 'https://fdssdaq.anquanyue.cn/fdssdaqSale',
+	// aky_url: 'https://fdssdaq.anquanyue.cn',
 	APP_ID: "app_20260603181947",
 	APP_SECRET: "sk_a7f3e9d2c8b5014f6a2e9d7c3b8a5f1e",
 }

+ 0 - 356
api/request/request.js

@@ -85,362 +85,6 @@ export const apiResquest = (prams) => {
 	})
 }
 
-export const apiResquestOutside = (prams) => {
-	return new Promise((resolve, reject) => {
-		let url =  prams.url;
-		uni.showLoading({
-			title: '加载中',
-			mask: true
-		});
-		// get请求映射params参数
-		if (prams.method === 'GET' && prams.data) {
-			url = url + '?' + tansParams(prams.data);
-			url = url.slice(0, -1);
-			prams.data = {};
-		}
-
-		return uni.request({
-			timeout:10000,
-			url: url,
-			data: {
-				...prams.data
-			},
-			method: prams.method,
-			header: {
-				'content-type': 'application/json;charset=utf-8',
-				'Authorization': uni.getStorageSync('token')
-			},
-			success: (res) => {
-				// 成功
-				uni.hideLoading()
-				if (res.statusCode == 200) {
-					if (res.data.code == 200) {
-						resolve(res);
-					} else if (res.data.code == 401) {
-						loginTimeout();
-					} else {
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: res.data.message,
-							duration: 2000
-						});
-						resolve(res);
-					}
-				} else if (res.statusCode == 401) {
-					loginTimeout();
-				} else {
-					uni.showToast({
-						mask: true,
-						icon: "none",
-						position: "center",
-						title: '连接异常,请联系管理员.',
-						duration: 2000
-					});
-					resolve(res);
-				}
-			},
-			fail: (err) => {
-				// 失败
-				uni.hideLoading()
-				uni.showToast({
-					mask: true,
-					icon: "none",
-					position: "center",
-					title: '出错啦~请联系管理员!',
-					duration: 2000
-				});
-			},
-			complete: () => {
-				// 完成
-			}
-		});
-	})
-}
-export const apiResquestForm = (prams) => {
-	return new Promise((resolve, reject) => {
-		let url = config.base_url + prams.url;
-		uni.showLoading({
-			title: '加载中',
-			mask: true
-		});
-		// get请求映射params参数
-		if (prams.method === 'GET' && prams.data) {
-			url = url + '?' + tansParams(prams.data);
-			url = url.slice(0, -1);
-			prams.data = {};
-		}
-		return uni.request({
-			timeout:10000,
-			url: url,
-			data: {
-				...prams.data
-			},
-			method: prams.method,
-			header: {
-				'content-type': 'application/x-www-form-urlencoded',
-				'Authorization': uni.getStorageSync('token')
-			},
-			success: (res) => {
-				// 成功
-				uni.hideLoading()
-				if (res.statusCode == 200) {
-					if (res.data.code == 200) {
-						resolve(res);
-					} else if (res.data.code == 401) {
-						loginTimeout();
-					} else {
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: res.data.message,
-							duration: 2000
-						});
-						resolve(res);
-					}
-				} else if (res.statusCode == 401) {
-					loginTimeout();
-				} else {
-					uni.showToast({
-						mask: true,
-						icon: "none",
-						position: "center",
-						title: '连接异常,请联系管理员.',
-						duration: 2000
-					});
-					resolve(res);
-				}
-			},
-			fail: (err) => {
-				// 失败
-				uni.hideLoading()
-				uni.showToast({
-					mask: true,
-					icon: "none",
-					position: "center",
-					title: '出错啦~请联系管理员!',
-					duration: 2000
-				});
-			},
-			complete: () => {
-				// 完成
-			}
-		});
-	})
-}
-export const apiResquestJsonList = (prams) => {
-	return new Promise((resolve, reject) => {
-		let url = config.base_url + prams.url;
-		uni.showLoading({
-			title: '加载中',
-			mask: true
-		});
-		// get请求映射params参数
-		if (prams.method === 'GET' && prams.data) {
-			url = url + '?' + tansParams(prams.data);
-			url = url.slice(0, -1);
-			prams.data = {};
-		}
-		return uni.request({
-			timeout:10000,
-			url: url,
-			data: prams.data,
-			method: prams.method,
-			header: {
-				'content-type': 'application/json',
-				'Authorization': uni.getStorageSync('token')
-			},
-			success: (res) => {
-				// 成功
-				uni.hideLoading()
-				if (res.statusCode == 200) {
-					if (res.data.code == 200) {
-						resolve(res);
-					} else if (res.data.code == 401) {
-						loginTimeout();
-					} else {
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: res.data.message,
-							duration: 2000
-						});
-						resolve(res);
-					}
-				} else if (res.statusCode == 401) {
-					loginTimeout();
-				} else {
-					uni.showToast({
-						mask: true,
-						icon: "none",
-						position: "center",
-						title: '连接异常,请联系管理员.',
-						duration: 2000
-					});
-					resolve(res);
-				}
-			},
-			fail: (err) => {
-				// 失败
-				uni.hideLoading()
-				uni.showToast({
-					mask: true,
-					icon: "none",
-					position: "center",
-					title: '出错啦~请联系管理员!',
-					duration: 2000
-				});
-			},
-			complete: () => {
-				// 完成
-			}
-		});
-	})
-}
-export const apiResquestFormVideo = (prams) => {
-	return new Promise((resolve, reject) => {
-		let url = uni.getStorageSync('cameraExtranetAgent') + prams.url;
-		uni.showLoading({
-			title: '加载中',
-			mask: true
-		});
-		// get请求映射params参数
-		if (prams.method === 'GET' && prams.data) {
-			url = url + '?' + tansParams(prams.data);
-			url = url.slice(0, -1);
-			prams.data = {};
-		}
-		return uni.request({
-			timeout:10000,
-			url: url,
-			data: {
-				...prams.data
-			},
-			method: prams.method,
-			header: {
-				'content-type': 'application/x-www-form-urlencoded',
-				'Authorization': uni.getStorageSync('token')
-			},
-			success: (res) => {
-				// 成功
-				uni.hideLoading()
-				if (res.statusCode == 200) {
-					if (res.data.code == 200) {
-						resolve(res);
-					} else if (res.data.code == 401) {
-						loginTimeout();
-					} else {
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: res.data.message,
-							duration: 2000
-						});
-						resolve(res);
-					}
-				} else if (res.statusCode == 401) {
-					loginTimeout();
-				} else {
-					uni.showToast({
-						mask: true,
-						icon: "none",
-						position: "center",
-						title: '连接异常,请联系管理员.',
-						duration: 2000
-					});
-					resolve(res);
-				}
-			},
-			fail: (err) => {
-				// 失败
-				uni.hideLoading()
-				uni.showToast({
-					mask: true,
-					icon: "none",
-					position: "center",
-					title: '出错啦~请联系管理员!',
-					duration: 2000
-				});
-			},
-			complete: () => {
-				// 完成
-			}
-		});
-	})
-}
-export const apiResquestTimer = (prams) => {
-	return new Promise((resolve, reject) => {
-		let url = config.base_url + prams.url;
-		// get请求映射params参数
-		if (prams.method === 'GET' && prams.data) {
-			url = url + '?' + tansParams(prams.data);
-			url = url.slice(0, -1);
-			prams.data = {};
-		}
-
-		return uni.request({
-			timeout:10000,
-			url: url,
-			data: {
-				...prams.data
-			},
-			method: prams.method,
-			header: {
-				'content-type': 'application/json;charset=utf-8',
-				'Authorization': uni.getStorageSync('token')
-			},
-			success: (res) => {
-				// 成功
-				uni.hideLoading()
-				if (res.statusCode == 200) {
-					if (res.data.code == 200) {
-						resolve(res);
-					} else if (res.data.code == 401) {
-						loginTimeout();
-					} else {
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: res.data.message,
-							duration: 2000
-						});
-						resolve(res);
-					}
-				} else if (res.statusCode == 401) {
-					loginTimeout();
-				} else {
-					uni.showToast({
-						mask: true,
-						icon: "none",
-						position: "center",
-						title: '连接异常,请联系管理员.',
-						duration: 2000
-					});
-					resolve(res);
-				}
-			},
-			fail: (err) => {
-				// 失败
-				uni.hideLoading()
-				uni.showToast({
-					mask: true,
-					icon: "none",
-					position: "center",
-					title: '出错啦~请联系管理员!',
-					duration: 2000
-				});
-			},
-			complete: () => {
-				// 完成
-			}
-		});
-	})
-}
 //登录超时-退出至登录页面
 export function loginTimeout(params) {
 	uni.showToast({

+ 85 - 0
api/request/requestAKY.js

@@ -0,0 +1,85 @@
+import {
+	config
+} from './config.js'
+import {
+	tansParams
+} from "./util.js";
+import {
+	hex_md5
+} from '@/utils/md5.js';
+export const apiResquest = (prams) => {
+	return new Promise((resolve, reject) => {
+		let url = config.aky_url + prams.url;
+		uni.showLoading({
+			title: '加载中',
+			mask: true
+		});
+		// get请求映射params参数
+		if (prams.method === 'GET' && prams.data) {
+			url = url + '?' + tansParams(prams.data);
+			url = url.slice(0, -1);
+			prams.data = {};
+		}
+
+		return uni.request({
+			timeout: 10000,
+			url: url,
+			data: {
+				...prams.data
+			},
+			method: prams.method,
+			header: {
+				// 'content-type': 'application/json',
+				'content-type': 'application/json;charset=utf-8',
+			},
+			success: (res) => {
+				// 成功
+				uni.hideLoading()
+				if (res.data.code == 1) {
+					resolve(res);
+				} else if (res.data.code == 401) {
+					loginTimeout();
+				} else {
+					uni.showToast({
+						mask: true,
+						icon: "none",
+						position: "center",
+						title: res.data.msg,
+						duration: 2000
+					});
+					resolve(res);
+				}
+			},
+			fail: (err) => {
+				// 失败
+				uni.hideLoading()
+				uni.showToast({
+					mask: true,
+					icon: "none",
+					position: "center",
+					title: '出错啦~请联系管理员!',
+					duration: 2000
+				});
+			},
+			complete: () => {
+				// 完成
+			}
+		});
+	})
+}
+//登录超时-退出至登录页面
+export function loginTimeout(params) {
+	uni.showToast({
+		mask: true,
+		icon: "none",
+		position: "center",
+		title: "登录超时,请重新登录~",
+		duration: 2000
+	});
+	uni.removeStorageSync('token');
+	setTimeout(function() {
+		uni.redirectTo({
+			url: '/pages/login',
+		});
+	}, 2000);
+}

+ 1 - 1
manifest.json

@@ -71,7 +71,7 @@
     "vueVersion" : "3",
     "h5" : {
         "router" : {
-            "base" : "/h5/"
+            "base" : "/"
         }
     }
 }

+ 0 - 3
pages/commodityInfo.vue

@@ -111,8 +111,6 @@
 				let self = this;
 				const numA = safeToNumber(uni.getStorageSync('points'))
 				const numB = safeToNumber(this.commodityData.price);
-				console.log('numA',numA)
-				console.log('numB',numB)
 				if(numB>numA){
 					uni.showToast({
 						mask: true,
@@ -123,7 +121,6 @@
 					});
 					return
 				}
-				
 				uni.showModal({
 					title: '提示',
 					content: '确认兑换?',

+ 10 - 12
pages/home.vue

@@ -3,15 +3,15 @@
 	<view class="home">
 		<view class="user-card">
 			<view class="avatar">
-				<text>{{ userData.userName ? userData.userName.charAt(0) : '?' }}</text>
+				<text>{{ userData.uname ? userData.uname.charAt(0) : '?' }}</text>
 			</view>
 			<view class="user-detail">
-				<view class="user-name">{{ userData.userName || '未登录' }}</view>
-				<view class="user-phone">{{ userData.phone || '---' }}</view>
+				<view class="user-name">{{ userData.uname || '未登录' }}</view>
+				<view class="user-phone">{{ userData.mob || '---' }}</view>
 			</view>
 			<view class="points-section">
 				<text class="points-label">当前积分</text>
-				<text class="points-value">{{ userData.points ?? 0 }}</text>
+				<text class="points-value">{{ userData.point ?? 0 }}</text>
 			</view>
 		</view>
 		<view class="flex-null-1"></view>
@@ -26,15 +26,15 @@
 </template>
 
 <script>
-	import { getUserInfo } from '@/api/index';
+	import { getUserInfo } from '@/api/indexAKY';
 	import { browserDetection } from '@/utils/auth';
 	export default {
 		data() {
 			return {
 				userData: {
-					userName: '',
-					phone: '',
-					points: '',
+					uname: '',
+					mob: '',
+					point: '',
 				},
 			}
 		},
@@ -46,14 +46,13 @@
 			async getUserInfo() {
 				let obj = {
 					token: uni.getStorageSync('token'),
-					phone: uni.getStorageSync('phone'),
 				}
 				const {
 					data
 				} = await getUserInfo(obj)
-				if (data.code == 200) {
+				if (data.code == 1) {
 					this.$set(this, 'userData', data.data);
-					uni.setStorageSync('points',data.data.points)
+					uni.setStorageSync('points',data.data.point+'')
 				}
 			},
 			scanCode() {
@@ -61,7 +60,6 @@
 				// 	url: "/pages/scanCodePage",
 				// });
 				let result = 'http://192.168.166.11?mid=202504161656&sid=12&pid=1&pri=1';
-				// let result = 'http://192.168.166.11?mid=20250416165612&sid=12&pid=1&pri=1';
 				uni.navigateTo({
 					url: '/pages/commodityInfo?q=' +
 						encodeURIComponent(JSON.stringify(result))

+ 19 - 18
pages/login.vue

@@ -11,12 +11,12 @@
 					<input type="text" v-model="username" @confirm="login()" placeholder="请输入手机号" maxlength="30">
 				</view>
 			</view>
-			<view class="input-max-box-two">
+			<!-- <view class="input-max-box-two">
 				<view class="input-box">
 					<img src="@/static/img_log_in_password.png">
 					<input type="password" v-model="password" @confirm="login()" placeholder="请输入密码" maxlength="30">
 				</view>
-			</view>
+			</view> -->
 			<view class="button-box" @click="login()">登录</view>
 		</view>
 		<view class="flex-null-2"></view>
@@ -29,7 +29,7 @@
 	} from '@/utils/md5.js';
 	import {
 		login
-	} from '@/api/index';
+	} from '@/api/indexAKY';
 	import {
 		browserDetection
 	} from '@/utils/auth';
@@ -60,27 +60,28 @@
 					});
 					return
 				}
-				if (!this.password) {
-					uni.showToast({
-						mask: true,
-						icon: "none",
-						position: "center",
-						title: "请输入密码",
-						duration: 2000
-					});
-					return
-				}
+				// if (!this.password) {
+				// 	uni.showToast({
+				// 		mask: true,
+				// 		icon: "none",
+				// 		position: "center",
+				// 		title: "请输入密码",
+				// 		duration: 2000
+				// 	});
+				// 	return
+				// }
 				let obj = {
-					account: this.username,
-					password: hex_md5(this.password),
+					// account: this.username,
+					// password: hex_md5(this.password),
+					mob : this.username,
+					// password: hex_md5(this.password),
 				}
 				const {
 					data
 				} = await login(obj)
-				if (data.code == 200) {
+				if (data.code == 1) {
+					console.log('data',data);
 					uni.setStorageSync('token', data.data.token);
-					uni.setStorageSync('phone', data.data.phone);
-					uni.setStorageSync('userId', data.data.userId);
 					uni.redirectTo({
 						url: '/pages/home',
 					});