2021-11-17

manifest.json

@@ -153,17 +153,18 @@
         "domain" : "",
         "router" : {
             "base" : "/index/",
-            "mode" : "history"
+            "mode" : "hash"
         },
         "devServer" : {
-           "proxy": {
-           	"/api": {
-           		"target": "http://m.manyuanchunjia.com/api", //请求的目标域名
-           		"changeOrigin": true,
-           		// "secure": false,
-           		"pathRewrite": {}
-           	}
-           }
+            "proxy" : {
+                "/api" : {
+                    // "target" : "http://m.manyuanchunjia.com/api", //请求的目标域名
+                    "target" : "http://myc.frp.liuniu946.com/api", //请求的目标域名
+                    "changeOrigin" : true,
+                    // "secure": false,
+                    "pathRewrite" : {}
+                }
+            }
         },
         "optimization" : {
             "treeShaking" : {

pages/contract/start.vue

@@ -4,7 +4,7 @@
 		<view class="popup">
 			<view class="title">温馨提示</view>
 			<scroll-view :scroll-y="true" class="content">
-				<text>欢迎使用正一商城APP。我们非常重视您的用户权益和个人信息的保护，在您使用正一商城APP服务前，请认真阅读</text>
+				<text>欢迎使用满园春线上商城。我们非常重视您的用户权益和个人信息的保护，在您使用满园春线上商城服务前，请认真阅读</text>
 				<text class="money" @click="goUser">《用户协议》</text>
 				<text>和</text>
 				<text class="money" @click="goYs">《隐私政策》</text>

pages/index/index.vue

@@ -173,11 +173,12 @@ export default {
 	},
 	onLoad(option) {
 		let agree = uni.getStorageSync('agree') || false;
+		//#ifdef APP-PLUS
 		// 判断是否已经同意协议
 		if (!agree) {
 			uni.redirectTo({ url: '/pages/contract/start' });
 		}
-		
+		//#endif
  		if (option.spread) {
 			// 存储邀请人
 			uni.setStorage({

pages/public/wxLogin.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="content">
 		<!-- #ifndef H5 -->
-		<image class="bg-img" src="/static/img/img09.png" mode=" scaleToFill"></image>
+		<!-- <image class="bg-img" :src="baseURL+urlFile+'/img/img09.png'" mode=" scaleToFill"></image> -->
 		<view class="logo-img-box">
-			<image class="logo-img" src="/static/img/img10.png" mode=" aspectFit"></image>
+			<!-- <image class="logo-img" src="https://zhxc2030.com/img/logo.jpg" mode=" aspectFit"></image> -->
 			<button class="userInfo" type="warn" open-type="getUserInfo" @getuserinfo='userInfoData'>
 				<text class="iconfont iconweixin"></text>
 				<text>
@@ -16,13 +16,15 @@
 </template>
 
 <script>
+	import { getUserInfo } from '@/api/login.js';
 // #ifdef H5
 import { loginWinxin } from '@/utils/wxAuthorized';
 // #endif
 // #ifdef MP-WEIXIN
 import { loginWinxinMp } from '@/utils/wxMinProgram';
+import { wechatMpAuth } from '@/api/wx';
 // #endif
-import { mapMutations } from 'vuex';
+import { mapMutations,mapState } from 'vuex';
 export default {
 	data() {
 		return {
@@ -33,25 +35,92 @@ export default {
 	onLoad(option) {
 		this.loadData();
 	},
+	computed: {
+		...mapState(['baseURL','urlFile']) 
+	},
 	methods: {
+		...mapMutations('user',['login', 'setUserInfo']),
 		loadData() {
+			let obj = this;
 			// #ifdef H5
 			loginWinxin();
 			// #endif
 			// #ifdef MP-WEIXIN
-			loginWinxinMp().then((e) => {
-				this.code = e.code;
+			loginWinxinMp().then(() => {
+					wx.login({
+						success(e) {
+							console.log(e);
+							obj.code = e.code;
+						},
+						fill:function (e) {
+							console.log(e)
+						}
+					})
 			});
 			// #endif
 		},
 		// 用户确认授权
 		userInfoData(e){
 			this.userInfo = e;
-			uni.navigateTo({
-				url:'/pages/redirect/redirect?code='+this.code
-			})
+			console.log(e)
+			this.loadMp()	
+		},
+		// #ifdef MP-WEIXIN
+		loadMp() {
+			let obj = this;
+			// 获取登录授权页数据
+			let user = obj.userInfo;
+			console.log(user)
+			// 获取推广人id
+			let spread_spid = uni.getStorageSync('spread') || '';
+			// #ifdef MP
+			let spread_code = uni.getStorageSync('spread_code') || '';
+			// #endif
+			wechatMpAuth({
+				code: obj.code,
+				iv: user.target.iv,
+				encryptedData: user.target.encryptedData,
+				spread_spid: spread_spid,
+				// #ifdef MP
+				spread_code: spread_code,
+				// #endif
+			}).then(({ data }) => {
+				obj.wchatAuth(data);
+				console.log(data)
+			});
+		},
+		// #endif
+		wchatAuth(data) {
+			let obj = this;
+			// 保存token
+			uni.setStorageSync('token', data.token);
+			// 获取用户基础信息
+			getUserInfo({}).then(e => {
+				obj.login();
+				// 保存返回用户数据
+				obj.setUserInfo(e.data);
+				console.log(uni.getStorageSync('present'),'地址')
+				let ur = uni.getStorageSync('present') || '/pages/index/index';
+				console.log(ur,'缓存的地址')
+				// 用于处理缓存bug
+				if (ur=='pages/shop/product') {
+					ur = '/pages/index/index'
+				}
+				uni.navigateTo({
+					url: ur,
+					fail(e) {
+						uni.navigateTo({
+							url: ur,
+							fail(e) {
+								uni.navigateTo({
+									url: '/pages/index/index',
+								});
+							}
+						});
+					}
+				});
+			});
 		}
-		
 	}
 };
 </script>
@@ -80,6 +149,6 @@ page,
 	margin-top: 50rpx;
 	color: #FFFFFF;
 	border-radius: 99rpx;
-	background-color: $base-color;
+	background-color: $base-color !important;
 }
 </style>

store/index.js

@@ -5,8 +5,8 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
 	state: {
-		baseURL:"http://m.manyuanchunjia.com",//'http://eb.shuibo.net',//请求地址配置 
-		// baseURL:"http://cys.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置
+		baseURL:"http://m.manyuanchunjia.com",//请求地址配置 
+		// baseURL:"http://myc.frp.liuniu946.com",//请求地址配置
 		loginInterceptor:true,//是否打开强制登录
 		urlFile:'/index',//项目部署所在文件夹
 		// #ifdef H5 || MP-WEIXIN

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/0ac5e9b0-3184-11ec-9899-d553ef9ce885
+https://ide.dcloud.net.cn/build/download/326c7d90-4350-11ec-b2ea-994c51939fc3

utils/newRequest.js

@@ -174,4 +174,4 @@ let service = {
 };
 
 
-export default service
+export default service

utils/request.js

@@ -83,4 +83,4 @@ let upFilse = service.upFilse;
 export {
 	upFilse
 };
-export default service.open;
+export default service.open;