feat-1

manifest.json

@@ -52,7 +52,9 @@
     "mp-weixin" : {
         "appid" : "wxf8cc1f7fffc41354",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "postcss" : true,
+            "minified" : false
         },
         "usingComponents" : true
     },

pages/login.vue

@@ -2,6 +2,7 @@
 	<view class="normal-login-container">
 		<view class="logo-content align-center justify-center flex">
 			<!-- <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix" /> -->
+			 <image :src="imagePath" mode="aspectFit" style="width: 100rpx;height: 100rpx;"></image>
 			<text class="title">乐融融</text>
 		</view>
 		<!-- <view class="login-form-content">
@@ -18,6 +19,9 @@
         <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
       </view>
     </view> -->
+	<view>
+		
+	</view>
 
 		<up-popup :show="show" mode="bottom" @close="close" @open="open">
 			<view class="popup-content">
@@ -52,6 +56,7 @@
 	} from '@/api/login';
 
 	import store from "@/store"
+	const imagePath = '/static/logo.png';
 
 	// 获取全局配置
 	// const globalConfig = getApp().globalData.config; // 注意：getApp()是特定于小程序的方法
@@ -80,7 +85,6 @@
 	function close() {
 		// 关闭逻辑，设置 show 为 false  
 		show.value = false;
-		// console.log('close');  
 	}
 
 
@@ -114,49 +118,49 @@
 
 	// 登录方法
 	const handleLogin = async () => {
-		uni.showLoading({
-			title: "登录中，请耐心等待..."
-		}); // 使用uni-app的loading方法替代$modal.loading
-		// 获取服务商信息
-		uni.getProvider({
-			service: "oauth",
-			success: (res) => {
-				console.log(res);
-			}
-		});
-		
-		// 获取code
-		uni.login({
-			provider: 'weixin',
-			success: (res) => {
-				loginForm.code = res.code;
-				// 获取用户信息
-				uni.getUserInfo({
-					success: (res) => {
-						console.log("用户信息", res);
-					}
-				});
-				
-				pwdLogin();
-
-				uni.hideLoading()
-			},
-		});
-	};
-
+			uni.showLoading({
+				title: "登录中，请耐心等待..."
+			}); // 使用uni-app的loading方法替代$modal.loading
+			// 获取服务商信息
+			uni.getProvider({
+				service: "oauth",
+				success: (res) => {
+					console.log(res);
+				}
+			});
+			
+			// 获取code
+			uni.login({
+				provider: 'weixin',
+				success: (res) => {
+					loginForm.code = res.code;
+					// 获取用户信息
+					uni.getUserInfo({
+						success: (res) => {
+							console.log("用户信息", res);
+						}
+					});
+					
+					pwdLogin();
+	
+					uni.hideLoading()
+				},
+			});
+		};
+	
 	// 密码登录
 	const pwdLogin = async () => {
+		console.log('>>>>>>>234568');
 		if (!store) {
 			console.error("Store is not defined");
 			return;
 		}
 		store.dispatch('Login', loginForm).then(() => {
 			// uni.hideLoading(); // 关闭加载提示
-			// console.log(  uni.hideLoading,'12313')
-			console.log('11111');
 			loginSuccess();
 		})
 	};
+	
 
 	// 登录成功后，处理函数
 	const loginSuccess = () => {

store/modules/user.ts

@@ -48,6 +48,7 @@ const user: Module<UserState, UserState> = {
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {
         login(username, password, code, uuid).then((res: any) => {
+			// console.log(login(),'接口调用了')
           setToken(res.token)
           commit('SET_TOKEN', res.token)
           resolve(res)

unpackage/dist/dev/mp-weixin/.gitignore

@@ -0,0 +1,14 @@
+# Windows
+[Dd]esktop.ini
+Thumbs.db
+$RECYCLE.BIN/
+
+# macOS
+.DS_Store
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+
+# Node.js
+node_modules/

unpackage/dist/dev/mp-weixin/pages/login.js

@@ -26,6 +26,7 @@ if (!Math) {
 const _sfc_main = {
   __name: "login",
   setup(__props) {
+    const imagePath = "/static/logo.png";
     common_vendor.ref(false);
     const loginForm = common_vendor.reactive({
       username: "admin",
@@ -74,12 +75,12 @@ const _sfc_main = {
       });
     };
     const pwdLogin = async () => {
+      console.log(">>>>>>>234568");
       if (!store_index.store) {
         console.error("Store is not defined");
         return;
       }
       store_index.store.dispatch("Login", loginForm).then(() => {
-        console.log("11111");
         loginSuccess();
       });
     };
@@ -93,19 +94,20 @@ const _sfc_main = {
     });
     return (_ctx, _cache) => {
       return {
-        a: common_vendor.p({
+        a: imagePath,
+        b: common_vendor.p({
           src: _ctx.src
         }),
-        b: common_vendor.o(handleLogin),
-        c: common_vendor.p({
+        c: common_vendor.o(handleLogin),
+        d: common_vendor.p({
           type: "success",
           shape: "circle"
         }),
-        d: common_vendor.o(handleUserAgrement),
-        e: common_vendor.o(handlePrivacy),
-        f: common_vendor.o(close),
-        g: common_vendor.o(open),
-        h: common_vendor.p({
+        e: common_vendor.o(handleUserAgrement),
+        f: common_vendor.o(handlePrivacy),
+        g: common_vendor.o(close),
+        h: common_vendor.o(open),
+        i: common_vendor.p({
           show: show.value,
           mode: "bottom"
         })

unpackage/dist/dev/mp-weixin/project.config.json

@@ -7,7 +7,7 @@
   "setting": {
     "urlCheck": false,
     "es6": true,
-    "postcss": false,
+    "postcss": true,
     "minified": false,
     "newFeature": true,
     "bigPackageSizeSupport": true,

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -2,7 +2,8 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "mp-weixin",
   "setting": {
-    "compileHotReLoad": false
+    "compileHotReLoad": false,
+    "urlCheck": false
   },
   "condition": {
     "miniprogram": {