From e48b3bb6dabc80e3b0729f96e4ecd064a06c7e46 Mon Sep 17 00:00:00 2001
From: wangjiahai <1556608@qq.com>
Date: Tue, 21 Nov 2023 16:54:30 +0800
Subject: [PATCH] 1111

---
 App.vue                   |  9 +++---
 common/config.js          |  2 +-
 common/request.api.js     |  1 +
 common/wxSilentLogin.js   | 68 ++++++++++++++++-----------------------
 pages.json                | 22 ++++++-------
 pages/index/BindPhone.vue | 66 ++++++++++++++++---------------------
 6 files changed, 73 insertions(+), 95 deletions(-)

diff --git a/App.vue b/App.vue
index c312486..b4ce378 100644
--- a/App.vue
+++ b/App.vue
@@ -1,13 +1,12 @@
 <script>
 	import config from "common/config.js";
 	export default {
-			globalData: {
-				wxSilentLoginURL: config.baseUrl+"/v1/app/wxuser/wxSilentLogin",
-			},
+		globalData: {
+			wxSilentLoginURL: config.baseUrl + "/lpkcustomer/wxSilentLogin",
+			sid: ""
+		},
 		onLaunch: function() {
-			
 			this.WxSilentLogin()
-			
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/common/config.js b/common/config.js
index ac11c7d..7289e49 100644
--- a/common/config.js
+++ b/common/config.js
@@ -6,7 +6,7 @@
  * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
  */
 module.exports = {
-	baseUrl: 'http://192.168.1.193:7201',
+	baseUrl: 'http://192.168.0.108:7201',
 	// baseUrl: 'https://jianguan.yyundong.com',
 	// baseUrl: 'http://jianguan.yyundong.com/api',
 	tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
diff --git a/common/request.api.js b/common/request.api.js
index 34306d4..467c580 100644
--- a/common/request.api.js
+++ b/common/request.api.js
@@ -2,6 +2,7 @@ import request from '@/utils/requester.js'
 
 export default {
 	login: (params = {}) => request.post("/wxmpapi/sysuser/login", params),
+	wxBindMobile: (params = {}) => request.post("/lpkcustomer/wxBindMobile", params),
 	sayhello: (params = {}) => request.get("/sayb", params),
 	getSalesReport: (params = {}) => request.get("/system/reportCenter/getSalesReport", params),
 	getGoodsOnWay: (params = {}) => request.get("/system/reportCenter/getGoodsOnWay", params),
diff --git a/common/wxSilentLogin.js b/common/wxSilentLogin.js
index 6ac3ec6..7df3bf9 100644
--- a/common/wxSilentLogin.js
+++ b/common/wxSilentLogin.js
@@ -1,4 +1,3 @@
-
 const wxSilentLogin = () => {
 	return new Promise((resolve, reject) => {
 		wx.login({
@@ -30,58 +29,47 @@ const wxSilentLogin = () => {
 							if (res.statusCode == 200) {
 								if (!res.data.success) {
 
-									// if (res.data.code == 500) {
-									// 	uni.showModal({
-									// 		title: '温馨提示',
-									// 		content: '您的平台应用未被授权，请联系工作人员。',
-									// 		showCancel: false,
-									// 		success: function(res) {
-									// 			if (res.confirm) {
-									// 				wx.exitMiniProgram({
-									// 					success: function() {},
-									// 					fail: function() {}
-									// 				})
-									// 			} else {
-									// 				console.log('点击了取消')
-									// 			}
-									// 		}
-									// 	})
-
+									if (res.data.code == "110") {
+										console.log(res.data.data);
+										//  未绑定用户
+										// uni.navigateTo({
+										// 	url: '/pages/index/BindPhone?openid=' +
+										// 		res.data.data.wxMpOpenid
+										// })
 
-									// 	return
-									// }
-
-									// if (res.data.code == 100) {
-									//  未绑定用户
-									uni.navigateTo({
-										url: '../index/BindPhone?openid=' +
-											res.data.data.openid+"&unionid="+
-											res.data.data.unionid
-									})
-									// }
+										uni.navigateTo({
+											url: '/pages/index/BindPhone?openid=' +
+												res.data.data.wxMpOpenid
+										})
+									}
 
 								} else {
 
 									console.log("Http网络请求res", res)
 									console.log("Global-Auth-Token", res.data.data
 										.token)
-									
-									
+
+
 									getApp().globalData.username = res.data.data
 										.name
 									getApp().globalData.token = res.data.data.token
 									getApp().globalData.sid = res.data.data.sid
 									getApp().globalData.mobile = res.data.data
 										.mobile
-									
-									getApp().globalData.isAdmin = res.data.data.isAdmin
-									getApp().globalData.orgSidPath = res.data.data.orgSidPath
-									getApp().globalData.orgNamePath = res.data.data.orgNamePath
-									getApp().globalData.organizationSid = res.data.data.organizationSid
-									getApp().globalData.headImage = res.data.data.headImage
-									
-										getApp().globalData.isLogin = true
-									
+
+									getApp().globalData.isAdmin = res.data.data
+										.isAdmin
+									getApp().globalData.orgSidPath = res.data.data
+										.orgSidPath
+									getApp().globalData.orgNamePath = res.data.data
+										.orgNamePath
+									getApp().globalData.organizationSid = res.data
+										.data.organizationSid
+									getApp().globalData.headImage = res.data.data
+										.headImage
+
+									getApp().globalData.isLogin = true
+
 									uni.setStorageSync("Global-Auth-Token", res.data
 										.data.token)
 									uni.setStorageSync("sid", res.data.data.sid)
diff --git a/pages.json b/pages.json
index a639d35..a43ac5a 100644
--- a/pages.json
+++ b/pages.json
@@ -15,7 +15,16 @@
 					"scrollIndicator": false //禁用原生导航栏,
 				}
 			}
-		
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "绑定账号",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"scrollIndicator": false //禁用原生导航栏,
+				}
+			}
 		}
 	],
 	"globalStyle": {
@@ -31,19 +40,10 @@
 		"backgroundColor": "#ffffff",
 		"list": [{
 			"pagePath": "pages/card/card",
-			"iconPath": "static/home_n.png",
-			"selectedIconPath": "static/home_s.png",
 			"text": "首页"
 		}, {
-			"pagePath": "pages/index/msg",
-			"iconPath": "static/msg_n.png",
-			"selectedIconPath": "static/msg_s.png",
+			"pagePath": "pages/index/index",
 			"text": "通知"
-		}, {
-			"pagePath": "pages/index/me",
-			"iconPath": "static/me_n.png",
-			"selectedIconPath": "static/me_s.png",
-			"text": "我的"
 		}]
 	},
 	"uniIdRouter": {}
diff --git a/pages/index/BindPhone.vue b/pages/index/BindPhone.vue
index 1aa87fe..7f81ff9 100644
--- a/pages/index/BindPhone.vue
+++ b/pages/index/BindPhone.vue
@@ -19,24 +19,24 @@
 		</view>
 
 
-		<view class="inputRow">
+		<!-- 	<view class="inputRow">
 			<image src="../../static/baseIcon/code.png" mode="aspectFill" class="drawableLeft"></image>
 			<input type="number" @input="codeText" maxlength="6" placeholder="请输入验证码" class="input" />
-		</view>
+		</view> -->
 
 
 		<view class="btn" @click="next">
 			<text class="btnText">绑定账号</text>
 		</view>
-		
-		<view  v-show="!isShow">
+
+		<view v-show="!isShow">
 			<view style="display: flex;flex-direction: column;justify-content: center;width: 100%;margin-top: 50px;">
 				<text style="width: 100%;text-align: center;font-size: 35px;color: #f00;">抱歉！</text>
 				<text style="margin: 20px; text-align: center;font-size: 30px;color: #f00;">您的平台应用未被授权，请联系工作人员。</text>
 			</view>
-			
+
 		</view>
-		
+
 
 	</view>
 </template>
@@ -45,7 +45,7 @@
 	export default {
 		data() {
 			return {
-				isShow:true,
+				isShow: true,
 				// 状态栏高度
 				statusBarHeight: 0,
 				// 导航栏高度
@@ -54,25 +54,15 @@
 					mobile: '',
 					openid: '',
 					code: '',
-					unionid:""
+					unionid: ""
 				}
 			};
 		},
-		
+
 		//第一次加载时调用
 		created() {
 			//获取手机状态栏高度
 			this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
-			
-			this.$bus.$on('isShow', msg => {
-				//这里获取到http工具js文件中传过来的wholeSpin值
-				console.log("isShows>>>>>", msg)
-				
-				this.isShow = msg
-				
-				console.log("isShows>>>>>", 	this.isShow)
-					
-			});
 		},
 		onShow() {
 			/*  #ifdef  MP-WEIXIN */
@@ -80,44 +70,44 @@
 			/* #endif */
 		},
 		onLoad(options) {
-				console.log('=======', options)
+			console.log('=======', options)
 			this.page.openid = options.openid
 			this.page.unionid = options.unionid
-				console.log('this.page', this.page)
-		
+			console.log('this.page', this.page)
+
 		},
 		methods: {
 			next() {
 				var mobileLength = this.page.mobile.length;
 				var codeLength = this.page.code.length;
 				if (mobileLength == 0) {
-					this.Toast("请输入手机号")
-					return;
-				}
-				if (codeLength == 0) {
-					this.Toast("验证码不能为空")
+					uni.showToast({
+						icon: 'error',
+						title: '手机号不能为空'
+					})
 					return;
 				}
+
 				let _this = this
 				console.log('1111', _this.page)
 				_this.$api.wxBindMobile(_this.page).then((resp) => {
 					// if (resp.success) {
 					console.log('1111', resp)
 
-					getApp().globalData.username = resp.userName
-					getApp().globalData.token = resp.token
-					getApp().globalData.sid = resp.sid
-					getApp().globalData.mobile = resp.mobile
-					getApp().globalData.isLogin = true
+					getApp().globalData.sid = resp
+					// getApp().globalData.token = resp.token
+					// getApp().globalData.sid = resp.sid
+					// getApp().globalData.mobile = resp.mobile
+					// getApp().globalData.isLogin = true
 
 					// _this.WritePreference("sysUserSid", res.data)
 					// _this.WritePreference("isLogin", true)
 					// getApp().globalData.isLogin = true
 					// getApp().globalData.sysUserSid = res.data
 
-					uni.navigateBack({
-						delta: 10,
-					});
+					uni.switchTab({
+						url: '/pages/card/card'
+					})
 
 					// uni.switchTab({
 					// 	url: '/pages/home/WorkFragment'
@@ -130,7 +120,7 @@
 					// 	showCancel: false,
 					// 	success: function(res) {
 					// 		if (res.confirm) {
-								
+
 					// 		} else {
 					// 			console.log('点击了取消')
 					// 		}
@@ -179,8 +169,8 @@
 			send(e) { //发送验证码
 				console.log(e);
 				this.isShow = e.success
-				console.log("this.isShow",this.isShow);
-				
+				console.log("this.isShow", this.isShow);
+
 			},
 			codeText(e) {
 				//验证码