api调试初始化

api/home.js

@@ -0,0 +1,48 @@
+
+
+import request from "@/utils/request.js";
+
+/**
+ * 查询轮播数据
+ * @returns {*}
+ */
+export function getAdsList() {
+	return request.get("v1/ads-list");
+}
+
+/**
+ * 获取购物车列表
+ * @param numType boolean true 购物车数量,false=购物车产品数量
+ */
+export function getCartCounts(numType) {
+	return request.get("cart/count", {
+		numType: numType === undefined ? 0 : numType
+	});
+}
+/**
+ * 获取购物车列表
+ * 
+ */
+export function getCartList(data) {
+	return request.get("cart/list", data);
+}
+
+/**
+ * 修改购物车
+ * 
+ */
+export function getResetCart(data) {
+	return request.post("v2/reset_cart", data);
+}
+
+/**
+ * 修改购物车数量
+ * @param int cartId  购物车id
+ * @param int number 修改数量
+ */
+export function changeCartNum(cartId, number) {
+	return request.post("cart/num", {
+		id: cartId,
+		number: number
+	});
+}

api/user.js

@@ -2,12 +2,22 @@
 
 import request from "@/utils/request.js";
 
+/**
+ * 账号密码登录
+ * 
+ */
+export function getLoginAccount(data) {
+	return request.post('/v1/login_account',data,{
+		noAuth: true
+	});
+}
+
 /**
  * 获取用户信息
  * 
  */
 export function getUserInfo() {
-	return request.get('user');
+	return request.get('mock/user');
 }
 
 /**

components/Authorize.vue

@@ -10,7 +10,8 @@
 				<button class="item grant" @click="setUserInfo">去授权</button>
 				<!-- #endif -->
 				<!-- #ifdef MP -->
-				<button class="item grant" type="primary" open-type="getPhoneNumber" lang="zh_CN" @getphonenumber="setUserInfo">去授权</button>
+				<button class="item grant" type="primary" open-type="getPhoneNumber" lang="zh_CN"
+					@getphonenumber="setUserInfo">去授权</button>
 				<!-- #endif -->
 			</view>
 		</view>
@@ -160,10 +161,13 @@ export default {
 				this.logoUrl = Cache.get(LOGO_URL);
 				return;
 			}
-			getLogo().then(res => {
-				that.logoUrl = res.data.logo_url;
-				Cache.set(LOGO_URL, that.logoUrl);
-			});
+			let logoUrl = "https://demo26.crmeb.net/statics/system_images/login_logo.jpeg"
+			that.logoUrl = logoUrl;
+			Cache.set(LOGO_URL, logoUrl);
+			// getLogo().then(res => {
+			// 	that.logoUrl = res.data.logo_url;
+			// 	Cache.set(LOGO_URL, that.logoUrl);
+			// });
 		},
 		close() {
 			let pages = getCurrentPages(),
@@ -192,6 +196,7 @@ export default {
 	transform: translateY(-50%);
 	z-index: 320;
 }
+
 .Popup image {
 	width: 150rpx;
 	height: 150rpx;
@@ -200,18 +205,21 @@ export default {
 	border: 8rpx solid #fff;
 	border-radius: 50%;
 }
+
 .Popup .title {
 	font-size: 28rpx;
 	color: #000;
 	text-align: center;
 	margin-top: 30rpx;
 }
+
 .Popup .tip {
 	font-size: 22rpx;
 	color: #555;
 	padding: 0 24rpx;
 	margin-top: 25rpx;
 }
+
 .Popup .bottom .item {
 	width: 50%;
 	height: 80rpx;
@@ -222,12 +230,15 @@ export default {
 	color: #666;
 	margin-top: 54rpx;
 }
+
 .Popup .bottom .item.on {
 	width: 100%;
 }
+
 .flex {
 	display: flex;
 }
+
 .Popup .bottom .item.grant {
 	font-size: 28rpx;
 	color: #fff;
@@ -236,6 +247,7 @@ export default {
 	border-radius: 0;
 	padding: 0;
 }
+
 .mask {
 	position: fixed;
 	top: 0;

config/app.js

@@ -2,7 +2,8 @@ module.exports = {
 	// 小程序配置
 	// #ifdef MP || APP-PLUS
 	// 请求域名 格式： https://您的域名
-	HTTP_REQUEST_URL: `http://v4.crmeb.net`,
+	HTTP_REQUEST_URL: `http://wine.gzzzyd.com`,
+	// HTTP_REQUEST_URL: `v4.crmeb.net`,
 	// #endif
 	
 	// H5配置

pages/index/diy/index_mall.vue

@@ -49,8 +49,7 @@
 			<!-- 爆款专区 -->
 			<view class="sale-group">
 				<view class="sale-content">
-					<view class="title">爆款专区 <view class="more">更多 <image src="../../static/arrow-r@2x.png"
-								mode="aspectFit"></image>
+					<view class="title">爆款专区 <view class="more"> 
 						</view>
 					</view>
 					<view class="goods-scroll">
@@ -102,6 +101,7 @@
 <script>
 import headerSerch from './components/headerSerch';
 import goodListMall from './components/goodListMall';
+import {getAdsList} from '../../../api/home.js'
 import {
 	goShopDetail
 } from '@/libs/order.js';
@@ -645,10 +645,17 @@ export default {
 			}]
 		}
 	},
+	mounted() {
+		this.getAdsList()
+	},
 	onLoad() {
-
 	},
 	methods: {
+		getAdsList() {
+			getAdsList().then(res => {
+				console.log(res);
+			});
+		},
 		// 促销列表的点击事件；
 		changeTab(type) {
 			this.goodType = type;

pages/users/components/login_mobile/index.vue

@@ -6,9 +6,12 @@
 				<input type="text" v-model="account" :placeholder="$t(`输入手机号`)" maxlength="11" />
 			</view>
 			<view class="input-item">
+				<input type="password" v-model="password" :placeholder="$t(`输入密码`)" maxlength="30" />
+			</view>
+			<!-- <view class="input-item">
 				<input type="text" v-model="codeNum" :placeholder="$t(`输入验证码`)" maxlength="6" />
 				<button class="code" :disabled="disabled" @click="code">{{text}}</button>
-			</view>
+			</view> -->
 			<view class="sub_btn" @click="loginBtn">{{$t(`立即登录`)}}</view>
 		</view>
 	</view>
@@ -24,7 +27,8 @@
 		getCodeApi,
 		getUserInfo,
 		phoneSilenceAuth,
-		phoneWxSilenceAuth
+		phoneWxSilenceAuth,
+		getLoginAccount
 	} from "@/api/user";
 	import {
 		bindingPhone
@@ -43,14 +47,15 @@
 		},
 		data() {
 			return {
+				password: '123456789',
 				keyCode: '',
-				account: '',
+				account: '18286053319',
 				codeNum: ''
 			}
 		},
-		mixins: [sendVerifyCode],
+		mixins: [],
 		mounted() {
-			this.getCode();
+			// this.getCode();
 		},
 		methods: {
 			// 获取验证码
@@ -100,22 +105,36 @@
 				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
 					title: that.$t(`请输入正确的手机号码`)
 				});
-				if (!that.codeNum) return that.$util.Tips({
-					title: that.$t(`请填写验证码`)
-				});
-				if (!/^[\w\d]+$/i.test(that.codeNum)) return that.$util.Tips({
-					title: that.$t(`请输入正确的验证码`)
+				if (!that.password) return that.$util.Tips({
+					title: that.$t(`请填写登录密码`)
 				});
+				// if (!that.codeNum) return that.$util.Tips({
+				// 	title: that.$t(`请填写验证码`)
+				// });
+				// if (!/^[\w\d]+$/i.test(that.codeNum)) return that.$util.Tips({
+				// 	title: that.$t(`请输入正确的验证码`)
+				// });
 				uni.showLoading({
 					title: that.$t(`正在登录中`)
 				});
-				Routine.getCode()
-					.then(code => {
-						this.phoneSilenceAuth(code);
-					})
-					.catch(error => {
-						uni.hideLoading();
+				getLoginAccount({
+					username: that.account,
+					password: that.password
+				}).then(res => {
+					console.log(res);
+					this.$store.commit('LOGIN', {
+						token: res.data.token,
+						time: time
 					});
+					this.getUserInfo();
+				})
+				// Routine.getCode()
+				// 	.then(code => {
+				// 		this.phoneSilenceAuth(code);
+				// 	})
+				// 	.catch(error => {
+				// 		uni.hideLoading();
+				// 	});
 				// #endif
 				// #ifdef H5
 				if (!that.account) return that.$util.Tips({

pages/users/login/index.vue

@@ -34,7 +34,8 @@
 				<view class="item">
 					<view class="acea-row row-middle">
 						<image src="../static/code_2.png" style="width: 28rpx; height: 32rpx;"></image>
-						<input type="text" :placeholder="$t(`填写验证码`)" maxlength="6" class="codeIput" v-model="captcha" />
+						<input type="text" :placeholder="$t(`填写验证码`)" maxlength="6" class="codeIput"
+							v-model="captcha" />
 						<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">
 							{{ text }}
 						</button>
@@ -48,29 +49,29 @@
 					</view>
 				</view>
 			</view>
-			<view class="logon" @click="loginMobile" v-if="current !== 0">{{$t(`登录`)}}</view>
-			<view class="logon" @click="submit" v-if="current === 0">{{$t(`登录`)}}</view>
+			<view class="logon" @click="loginMobile" v-if="current !== 0">{{ $t(`登录`) }}</view>
+			<view class="logon" @click="submit" v-if="current === 0">{{ $t(`登录`) }}</view>
 			<!-- #ifndef APP-PLUS -->
 			<view class="tips">
-				<view v-if="current==0" @click="current = 1">{{$t(`快速登录`)}}</view>
-				<view v-if="current==1" @click="current = 0">{{$t(`账号登录`)}}</view>
+				<view v-if="current == 0" @click="current = 1">{{ $t(`快速登录`) }}</view>
+				<view v-if="current == 1" @click="current = 0">{{ $t(`账号登录`) }}</view>
 			</view>
 			<!-- #endif -->
 			<!-- #ifdef APP-PLUS -->
 			<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
 				<view class="hds">
 					<span class="line"></span>
-					<p>{{$t(`其他方式登录`)}}</p>
+					<p>{{ $t(`其他方式登录`) }}</p>
 					<span class="line"></span>
 				</view>
 				<view class="btn-wrapper">
 					<view class="btn wx" @click="wxLogin">
 						<span class="iconfont icon-s-weixindenglu1"></span>
 					</view>
-					<view class="btn mima" v-if="current == 1" @click="current =0">
+					<view class="btn mima" v-if="current == 1" @click="current = 0">
 						<span class="iconfont icon-s-mimadenglu1"></span>
 					</view>
-					<view class="btn yanzheng" v-if="current == 0" @click="current =1">
+					<view class="btn yanzheng" v-if="current == 0" @click="current = 1">
 						<span class="iconfont icon-s-yanzhengmadenglu1"></span>
 					</view>
 					<view class="apple-btn" @click="appleLogin" v-if="appleShow">
@@ -81,10 +82,10 @@
 			<!-- #endif -->
 			<view class="protocol">
 				<checkbox-group @change='ChangeIsDefault'>
-					<checkbox :class="inAnimation?'trembling':''" @animationend='inAnimation=false'
-						:checked="protocol ? true : false" />{{$t(`已阅读并同意`)}} <text class="main-color"
-						@click="privacy(4)">{{$t(`《用户协议》`)}}</text>
-					{{$t(`与`)}}<text class="main-color" @click="privacy(3)">{{$t(`《隐私协议》`)}}</text>
+					<checkbox :class="inAnimation ? 'trembling' : ''" @animationend='inAnimation = false'
+						:checked="protocol ? true : false" />{{ $t(`已阅读并同意`) }} <text class="main-color"
+						@click="privacy(4)">{{ $t(`《用户协议》`) }}</text>
+					{{ $t(`与`) }}<text class="main-color" @click="privacy(3)">{{ $t(`《隐私协议》`) }}</text>
 				</checkbox-group>
 			</view>
 		</view>
@@ -92,482 +93,346 @@
 	</view>
 </template>
 <script>
-	import dayjs from "@/plugin/dayjs/dayjs.min.js";
-	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	import {
-		loginH5,
-		loginMobile,
-		registerVerify,
-		register,
-		getCodeApi,
-		getUserInfo,
-		appleLogin
-	} from "@/api/user";
-	import attrs, {
-		required,
-		alpha_num,
-		chs_phone
-	} from "@/utils/validate";
-	import {
-		getLogo
-	} from "@/api/public";
-	// import cookie from "@/utils/store/cookie";
-	import {
-		VUE_APP_API_URL
-	} from "@/utils";
-	// #ifdef APP-PLUS
-	import {
-		wechatAppAuth
-	} from '@/api/api.js'
-	// #endif
-	const BACK_URL = "login_back_url";
-	import colors from '@/mixins/color.js';
-	export default {
-		name: "Login",
-		mixins: [sendVerifyCode, colors],
-		data: function() {
-			return {
-				inAnimation: false,
-				protocol: false,
-				navList: [this.$t(`快速登录`),this.$t(`账号登录`)],
-				current: 1,
-				account: "",
-				password: "",
-				captcha: "",
-				formItem: 1,
-				type: "login",
-				logoUrl: "",
-				keyCode: "",
-				codeUrl: "",
-				codeVal: "",
-				isShowCode: false,
-				appLoginStatus: false, // 微信登录强制绑定手机号码状态
-				appUserInfo: null, // 微信登录保存的用户信息
-				appleLoginStatus: false, // 苹果登录强制绑定手机号码状态
-				appleUserInfo: null,
-				appleShow: false, // 苹果登录版本必须要求ios13以上的
-				keyLock: true
-			};
-		},
-		watch: {
-			formItem: function(nval, oVal) {
-				if (nval == 1) {
-					this.type = 'login'
-				} else {
-					this.type = 'register'
+import dayjs from "@/plugin/dayjs/dayjs.min.js";
+import sendVerifyCode from "@/mixins/SendVerifyCode";
+import {
+	loginH5,
+	loginMobile,
+	registerVerify,
+	register,
+	getCodeApi,
+	getUserInfo,
+	appleLogin
+} from "@/api/user";
+import attrs, {
+	required,
+	alpha_num,
+	chs_phone
+} from "@/utils/validate";
+import {
+	getLogo
+} from "@/api/public";
+// import cookie from "@/utils/store/cookie";
+import {
+	VUE_APP_API_URL
+} from "@/utils";
+// #ifdef APP-PLUS
+import {
+	wechatAppAuth
+} from '@/api/api.js'
+// #endif
+const BACK_URL = "login_back_url";
+import colors from '@/mixins/color.js';
+export default {
+	name: "Login",
+	mixins: [sendVerifyCode, colors],
+	data: function () {
+		return {
+			inAnimation: false,
+			protocol: false,
+			navList: [this.$t(`快速登录`), this.$t(`账号登录`)],
+			current: 1,
+			account: "",
+			password: "",
+			captcha: "",
+			formItem: 1,
+			type: "login",
+			logoUrl: "",
+			keyCode: "",
+			codeUrl: "",
+			codeVal: "",
+			isShowCode: false,
+			appLoginStatus: false, // 微信登录强制绑定手机号码状态
+			appUserInfo: null, // 微信登录保存的用户信息
+			appleLoginStatus: false, // 苹果登录强制绑定手机号码状态
+			appleUserInfo: null,
+			appleShow: false, // 苹果登录版本必须要求ios13以上的
+			keyLock: true
+		};
+	},
+	watch: {
+		formItem: function (nval, oVal) {
+			if (nval == 1) {
+				this.type = 'login'
+			} else {
+				this.type = 'register'
+			}
+		}
+	},
+	onLoad() {
+		let self = this
+		uni.getSystemInfo({
+			success: (res) => {
+				if (res.platform.toLowerCase() == 'ios' && this.getSystem(res.system)) {
+					self.appleShow = true
 				}
 			}
+		});
+	},
+	mounted: function () {
+		// this.getCode();
+		this.getLogoImage();
+	},
+	methods: {
+		ChangeIsDefault(e) {
+			this.$set(this, 'protocol', !this.protocol);
 		},
-		onLoad() {
-			let self = this
-			uni.getSystemInfo({
-				success: (res) => {
-					if (res.platform.toLowerCase() == 'ios' && this.getSystem(res.system)) {
-						self.appleShow = true
-					}
-				}
-			});
+		privacy(type) {
+			uni.navigateTo({
+				url: "/pages/users/privacy/index?type=" + type
+			})
 		},
-		mounted: function() {
-			// this.getCode();
-			this.getLogoImage();
+		// IOS 版本号判断
+		getSystem(system) {
+			let str
+			system.toLowerCase().indexOf('ios') === -1 ? str = system : str = system.split(' ')[1]
+			if (str.indexOf('.'))
+				return str.split('.')[0] >= 13
+			return str >= 13
 		},
-		methods: {
-			ChangeIsDefault(e) {
-				this.$set(this, 'protocol', !this.protocol);
-			},
-			privacy(type) {
-				uni.navigateTo({
-					url: "/pages/users/privacy/index?type=" + type
-				})
-			},
-			// IOS 版本号判断
-			getSystem(system) {
-				let str
-				system.toLowerCase().indexOf('ios') === -1 ? str = system : str = system.split(' ')[1]
-				if (str.indexOf('.'))
-					return str.split('.')[0] >= 13
-				return str >= 13
-			},
-			// 苹果登录
-			appleLogin() {
-				let self = this
-				this.account = ''
-				this.captcha = ''
-				if (!self.protocol) {
-					this.inAnimation = true
-					return self.$util.Tips({
-						title: '请先阅读并同意协议'
+		// 苹果登录
+		appleLogin() {
+			let self = this
+			this.account = ''
+			this.captcha = ''
+			if (!self.protocol) {
+				this.inAnimation = true
+				return self.$util.Tips({
+					title: '请先阅读并同意协议'
+				});
+			}
+			uni.showLoading({
+				title: this.$t(`登录中`)
+			})
+			uni.login({
+				provider: 'apple',
+				timeout: 10000,
+				success(loginRes) {
+					uni.getUserInfo({
+						provider: 'apple',
+						success: function (infoRes) {
+							self.appleUserInfo = infoRes.userInfo
+							self.appleLoginApi()
+						},
+						fail() {
+							uni.showToast({
+								title: self.$t(`获取用户信息失败`),
+								icon: 'none',
+								duration: 2000
+							})
+						},
+						complete() {
+							uni.hideLoading()
+						}
 					});
+				},
+				fail(error) {
+					console.log(error)
 				}
-				uni.showLoading({
-					title: this.$t(`登录中`)
-				})
-				uni.login({
-					provider: 'apple',
-					timeout: 10000,
-					success(loginRes) {
-						uni.getUserInfo({
-							provider: 'apple',
-							success: function(infoRes) {
-								self.appleUserInfo = infoRes.userInfo
-								self.appleLoginApi()
-							},
-							fail() {
-								uni.showToast({
-									title: self.$t(`获取用户信息失败`),
-									icon: 'none',
-									duration: 2000
-								})
-							},
-							complete() {
-								uni.hideLoading()
-							}
-						});
-					},
-					fail(error) {
-						console.log(error)
-					}
-				})
-			},
-			// 苹果登录Api
-			appleLoginApi() {
-				let self = this
-				appleLogin({
-					openId: self.appleUserInfo.openId,
-					email: self.appleUserInfo.email || '',
-					phone: this.account,
-					captcha: this.captcha
-				}).then(({
-					data
-				}) => {
-					if (data.isbind) {
-						uni.showModal({
-							title: self.$t(`提示`),
-							content: self.$t(`请绑定手机号后，继续操作`),
-							showCancel: false,
-							success: function(res) {
-								if (res.confirm) {
-									self.current = 1
-									self.appleLoginStatus = true
-								}
-							}
-						});
-					} else {
-						self.$store.commit("LOGIN", {
-							'token': data.token,
-							'time': data.expires_time - self.$Cache.time()
-						});
-						let backUrl = self.$Cache.get(BACK_URL) || "/pages/index/index";
-						self.$Cache.clear(BACK_URL);
-						self.$store.commit("SETUID", data.userInfo.uid);
-						uni.reLaunch({
-							url: backUrl
-						});
-					}
-				}).catch(error => {
+			})
+		},
+		// 苹果登录Api
+		appleLoginApi() {
+			let self = this
+			appleLogin({
+				openId: self.appleUserInfo.openId,
+				email: self.appleUserInfo.email || '',
+				phone: this.account,
+				captcha: this.captcha
+			}).then(({
+				data
+			}) => {
+				if (data.isbind) {
 					uni.showModal({
 						title: self.$t(`提示`),
-						content: self.$t(`错误信息`) + `${error}`,
-						success: function(res) {
+						content: self.$t(`请绑定手机号后，继续操作`),
+						showCancel: false,
+						success: function (res) {
 							if (res.confirm) {
-								console.log(self.$t(`用户点击确定`));
-							} else if (res.cancel) {
-								console.log(self.$t(`用户点击取消`));
+								self.current = 1
+								self.appleLoginStatus = true
 							}
 						}
 					});
-				})
-			},
-			// App微信登录
-			wxLogin() {
-				let self = this
-				this.account = ''
-				this.captcha = ''
-				if (!self.protocol) {
-					this.inAnimation = true
-					return self.$util.Tips({
-						title: '请先阅读并同意协议'
+				} else {
+					self.$store.commit("LOGIN", {
+						'token': data.token,
+						'time': data.expires_time - self.$Cache.time()
+					});
+					let backUrl = self.$Cache.get(BACK_URL) || "/pages/index/index";
+					self.$Cache.clear(BACK_URL);
+					self.$store.commit("SETUID", data.userInfo.uid);
+					uni.reLaunch({
+						url: backUrl
 					});
 				}
-				uni.showLoading({
-					title: self.$t(`登录中`)
-				})
-				uni.login({
-					provider: 'weixin',
-					success: function(loginRes) {
-						// 获取用户信息
-						uni.getUserInfo({
-							provider: 'weixin',
-							success: function(infoRes) {
-								self.appUserInfo = infoRes.userInfo
-								self.wxLoginApi()
-							},
-							fail() {
-								uni.showToast({
-									title: self.$t(`获取用户信息失败`),
-									icon: 'none',
-									duration: 2000
-								})
-							},
-							complete() {
-								uni.hideLoading()
-							}
-						});
-					},
-					fail() {
-						uni.showToast({
-							title: self.$t(`登录失败`),
-							icon: 'none',
-							duration: 2000
-						})
+			}).catch(error => {
+				uni.showModal({
+					title: self.$t(`提示`),
+					content: self.$t(`错误信息`) + `${error}`,
+					success: function (res) {
+						if (res.confirm) {
+							console.log(self.$t(`用户点击确定`));
+						} else if (res.cancel) {
+							console.log(self.$t(`用户点击取消`));
+						}
 					}
 				});
-			},
-
-			wxLoginApi() {
-				let self = this
-				wechatAppAuth({
-					userInfo: self.appUserInfo,
-					phone: this.account,
-					code: this.captcha
-				}).then(({
-					data
-				}) => {
-					if (data.isbind) {
-						uni.showModal({
-							title: self.$t(`提示`),
-							content: self.$t(`请绑定手机号后，继续操作`),
-							showCancel: false,
-							success: function(res) {
-								if (res.confirm) {
-									self.current = 1
-									self.appLoginStatus = true
-								}
-							}
-						});
-					} else {
-						self.$store.commit("LOGIN", {
-							'token': data.token,
-							'time': data.expires_time - self.$Cache.time()
-						});
-						let backUrl = self.$Cache.get(BACK_URL) || "/pages/index/index";
-						self.$Cache.clear(BACK_URL);
-						self.$store.commit("SETUID", data.userInfo.uid);
-						uni.reLaunch({
-							url: backUrl
-						});
-					}
-				}).catch(error => {
+			})
+		},
+		// App微信登录
+		wxLogin() {
+			let self = this
+			this.account = ''
+			this.captcha = ''
+			if (!self.protocol) {
+				this.inAnimation = true
+				return self.$util.Tips({
+					title: '请先阅读并同意协议'
+				});
+			}
+			uni.showLoading({
+				title: self.$t(`登录中`)
+			})
+			uni.login({
+				provider: 'weixin',
+				success: function (loginRes) {
+					// 获取用户信息
+					uni.getUserInfo({
+						provider: 'weixin',
+						success: function (infoRes) {
+							self.appUserInfo = infoRes.userInfo
+							self.wxLoginApi()
+						},
+						fail() {
+							uni.showToast({
+								title: self.$t(`获取用户信息失败`),
+								icon: 'none',
+								duration: 2000
+							})
+						},
+						complete() {
+							uni.hideLoading()
+						}
+					});
+				},
+				fail() {
+					uni.showToast({
+						title: self.$t(`登录失败`),
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			});
+		},
+
+		wxLoginApi() {
+			let self = this
+			wechatAppAuth({
+				userInfo: self.appUserInfo,
+				phone: this.account,
+				code: this.captcha
+			}).then(({
+				data
+			}) => {
+				if (data.isbind) {
 					uni.showModal({
 						title: self.$t(`提示`),
-						content: self.$t(`错误信息`) + `${error}`,
-						success: function(res) {
+						content: self.$t(`请绑定手机号后，继续操作`),
+						showCancel: false,
+						success: function (res) {
 							if (res.confirm) {
-								console.log(self.$t(`用户点击确定`));
-							} else if (res.cancel) {
-								console.log(self.$t(`用户点击取消`));
+								self.current = 1
+								self.appLoginStatus = true
 							}
 						}
 					});
-				})
-			},
-			again() {
-				this.codeUrl =
-					VUE_APP_API_URL +
-					"/sms_captcha?" +
-					"key=" +
-					this.keyCode +
-					Date.parse(new Date());
-			},
-			code() {
-				let that = this
-				if (!that.protocol) {
-					this.inAnimation = true
-					return that.$util.Tips({
-						title: '请先阅读并同意协议'
-					});
-				}
-				getCodeApi()
-					.then(res => {
-						that.keyCode = res.data.key;
-						that.getCode();
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			async getLogoImage() {
-				let that = this;
-				getLogo(2).then(res => {
-					that.logoUrl = res.data.logo_url;
-				});
-			},
-			async loginMobile() {
-				let that = this;
-				if (!that.protocol) {
-					this.inAnimation = true
-					return that.$util.Tips({
-						title: '请先阅读并同意协议'
-					});
-				}
-				if (!that.account) return that.$util.Tips({
-					title: that.$t(`请填写手机号码`)
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: that.$t(`请输入正确的手机号码`)
-				});
-				if (!that.captcha) return that.$util.Tips({
-					title: that.$t(`请填写验证码`)
-				});
-				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
-					title: that.$t(`请输入正确的验证码`)
-				});
-				if (that.appLoginStatus) {
-					that.wxLoginApi()
-				} else if (that.appleLoginStatus) {
-					that.appleLoginApi()
 				} else {
-					if (this.keyLock) {
-						this.keyLock = !this.keyLock
-					} else {
-						return that.$util.Tips({
-							title: that.$t(`请勿重复点击`)
-						});
-					}
-					loginMobile({
-							phone: that.account,
-							captcha: that.captcha,
-							spread: that.$Cache.get("spread")
-						})
-						.then(res => {
-							let data = res.data;
-							that.$store.commit("LOGIN", {
-								'token': data.token,
-								'time': data.expires_time - this.$Cache.time()
-							});
-							let backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-							that.$Cache.clear(BACK_URL);
-							getUserInfo().then(res => {
-								this.keyLock = true
-								that.$store.commit("SETUID", res.data.uid);
-								if (backUrl.indexOf('/pages/users/login/index') !== -1) {
-									backUrl = '/pages/index/index';
-								}
-								uni.reLaunch({
-									url: backUrl
-								});
-							})
-						})
-						.catch(res => {
-							this.keyLock = true
-							that.$util.Tips({
-								title: res
-							});
-						});
-				}
-
-			},
-			async register() {
-				let that = this;
-				if (!that.protocol) {
-					this.inAnimation = true
-					return that.$util.Tips({
-						title: '请先阅读并同意协议'
-					});
-				}
-				if (!that.account) return that.$util.Tips({
-					title: that.$t(`请填写手机号码`)
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: that.$t(`请输入正确的手机号码`)
-				});
-				if (!that.captcha) return that.$util.Tips({
-					title: that.$t(`请填写验证码`)
-				});
-				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
-					title: that.$t(`请输入正确的验证码`)
-				});
-				if (!that.password) return that.$util.Tips({
-					title: that.$t(`请填写密码`)
-				});
-				if (/^([0-9]|[a-z]|[A-Z]){0,6}$/i.test(that.password)) return that.$util.Tips({
-					title: that.$t(`您输入的密码过于简单`)
-				});
-				register({
-						account: that.account,
-						captcha: that.captcha,
-						password: that.password,
-						spread: that.$Cache.get("spread")
-					})
-					.then(res => {
-						that.$util.Tips({
-							title: res
-						});
-						that.formItem = 1;
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
+					self.$store.commit("LOGIN", {
+						'token': data.token,
+						'time': data.expires_time - self.$Cache.time()
 					});
-			},
-			async getCode() {
-				let that = this;
-				if (!that.protocol) {
-					this.inAnimation = true
-					return that.$util.Tips({
-						title: '请先阅读并同意协议'
+					let backUrl = self.$Cache.get(BACK_URL) || "/pages/index/index";
+					self.$Cache.clear(BACK_URL);
+					self.$store.commit("SETUID", data.userInfo.uid);
+					uni.reLaunch({
+						url: backUrl
 					});
 				}
-				if (!that.account) return that.$util.Tips({
-					title: that.$t(`请填写手机号码`)
+			}).catch(error => {
+				uni.showModal({
+					title: self.$t(`提示`),
+					content: self.$t(`错误信息`) + `${error}`,
+					success: function (res) {
+						if (res.confirm) {
+							console.log(self.$t(`用户点击确定`));
+						} else if (res.cancel) {
+							console.log(self.$t(`用户点击取消`));
+						}
+					}
 				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: that.$t(`请输入正确的手机号码`)
+			})
+		},
+		again() {
+			this.codeUrl =
+				VUE_APP_API_URL +
+				"/sms_captcha?" +
+				"key=" +
+				this.keyCode +
+				Date.parse(new Date());
+		},
+		code() {
+			let that = this
+			if (!that.protocol) {
+				this.inAnimation = true
+				return that.$util.Tips({
+					title: '请先阅读并同意协议'
 				});
-				if (that.formItem == 2) that.type = "register";
-
-				await registerVerify({
-						phone: that.account,
-						type: that.type,
-						key: that.keyCode,
-						code: that.codeVal
-					})
-					.then(res => {
-						that.$util.Tips({
-							title: res.msg
-						});
-						that.sendCode();
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			navTap: function(index) {
-				this.current = index;
-			},
-			async submit() {
-				let that = this;
-				if (!that.protocol) {
-					this.inAnimation = true
-					return that.$util.Tips({
-						title: '请先阅读并同意协议'
+			}
+			getCodeApi()
+				.then(res => {
+					that.keyCode = res.data.key;
+					that.getCode();
+				})
+				.catch(res => {
+					that.$util.Tips({
+						title: res
 					});
-				}
-				if (!that.account) return that.$util.Tips({
-					title: that.$t(`请填写账号`)
-				});
-				if (!/^[\w\d]{5,16}$/i.test(that.account)) return that.$util.Tips({
-					title: that.$t(`请输入正确的账号`)
 				});
-				if (!that.password) return that.$util.Tips({
-					title: that.$t(`请填写密码`)
+		},
+		async getLogoImage() {
+			let that = this;
+			let logoUrl = "https://demo26.crmeb.net/statics/system_images/login_logo.jpeg"
+			that.logoUrl = logoUrl;
+			getLogo(2).then(res => {
+				that.logoUrl = res.data.logo_url;
+			});
+		},
+		async loginMobile() {
+			let that = this;
+			if (!that.protocol) {
+				this.inAnimation = true
+				return that.$util.Tips({
+					title: '请先阅读并同意协议'
 				});
+			}
+			if (!that.account) return that.$util.Tips({
+				title: that.$t(`请填写手机号码`)
+			});
+			if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+				title: that.$t(`请输入正确的手机号码`)
+			});
+			if (!that.captcha) return that.$util.Tips({
+				title: that.$t(`请填写验证码`)
+			});
+			if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
+				title: that.$t(`请输入正确的验证码`)
+			});
+			if (that.appLoginStatus) {
+				that.wxLoginApi()
+			} else if (that.appleLoginStatus) {
+				that.appleLoginApi()
+			} else {
 				if (this.keyLock) {
 					this.keyLock = !this.keyLock
 				} else {
@@ -575,14 +440,13 @@
 						title: that.$t(`请勿重复点击`)
 					});
 				}
-				loginH5({
-						account: that.account,
-						password: that.password,
-						spread: that.$Cache.get("spread")
-					})
-					.then(({
-						data
-					}) => {
+				loginMobile({
+					phone: that.account,
+					captcha: that.captcha,
+					spread: that.$Cache.get("spread")
+				})
+					.then(res => {
+						let data = res.data;
 						that.$store.commit("LOGIN", {
 							'token': data.token,
 							'time': data.expires_time - this.$Cache.time()
@@ -592,204 +456,346 @@
 						getUserInfo().then(res => {
 							this.keyLock = true
 							that.$store.commit("SETUID", res.data.uid);
+							if (backUrl.indexOf('/pages/users/login/index') !== -1) {
+								backUrl = '/pages/index/index';
+							}
 							uni.reLaunch({
 								url: backUrl
 							});
-						}).catch(error => {
-							this.keyLock = true
 						})
 					})
-					.catch(e => {
+					.catch(res => {
 						this.keyLock = true
 						that.$util.Tips({
-							title: e
+							title: res
 						});
 					});
 			}
+
+		},
+		async register() {
+			let that = this;
+			if (!that.protocol) {
+				this.inAnimation = true
+				return that.$util.Tips({
+					title: '请先阅读并同意协议'
+				});
+			}
+			if (!that.account) return that.$util.Tips({
+				title: that.$t(`请填写手机号码`)
+			});
+			if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+				title: that.$t(`请输入正确的手机号码`)
+			});
+			if (!that.captcha) return that.$util.Tips({
+				title: that.$t(`请填写验证码`)
+			});
+			if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
+				title: that.$t(`请输入正确的验证码`)
+			});
+			if (!that.password) return that.$util.Tips({
+				title: that.$t(`请填写密码`)
+			});
+			if (/^([0-9]|[a-z]|[A-Z]){0,6}$/i.test(that.password)) return that.$util.Tips({
+				title: that.$t(`您输入的密码过于简单`)
+			});
+			register({
+				account: that.account,
+				captcha: that.captcha,
+				password: that.password,
+				spread: that.$Cache.get("spread")
+			})
+				.then(res => {
+					that.$util.Tips({
+						title: res
+					});
+					that.formItem = 1;
+				})
+				.catch(res => {
+					that.$util.Tips({
+						title: res
+					});
+				});
+		},
+		async getCode() {
+			let that = this;
+			if (!that.protocol) {
+				this.inAnimation = true
+				return that.$util.Tips({
+					title: '请先阅读并同意协议'
+				});
+			}
+			if (!that.account) return that.$util.Tips({
+				title: that.$t(`请填写手机号码`)
+			});
+			if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+				title: that.$t(`请输入正确的手机号码`)
+			});
+			if (that.formItem == 2) that.type = "register";
+
+			await registerVerify({
+				phone: that.account,
+				type: that.type,
+				key: that.keyCode,
+				code: that.codeVal
+			})
+				.then(res => {
+					that.$util.Tips({
+						title: res.msg
+					});
+					that.sendCode();
+				})
+				.catch(res => {
+					that.$util.Tips({
+						title: res
+					});
+				});
+		},
+		navTap: function (index) {
+			this.current = index;
+		},
+		async submit() {
+			let that = this;
+			if (!that.protocol) {
+				this.inAnimation = true
+				return that.$util.Tips({
+					title: '请先阅读并同意协议'
+				});
+			}
+			if (!that.account) return that.$util.Tips({
+				title: that.$t(`请填写账号`)
+			});
+			if (!/^[\w\d]{5,16}$/i.test(that.account)) return that.$util.Tips({
+				title: that.$t(`请输入正确的账号`)
+			});
+			if (!that.password) return that.$util.Tips({
+				title: that.$t(`请填写密码`)
+			});
+			if (this.keyLock) {
+				this.keyLock = !this.keyLock
+			} else {
+				return that.$util.Tips({
+					title: that.$t(`请勿重复点击`)
+				});
+			}
+			loginH5({
+				account: that.account,
+				password: that.password,
+				spread: that.$Cache.get("spread")
+			})
+				.then(({
+					data
+				}) => {
+					that.$store.commit("LOGIN", {
+						'token': data.token,
+						'time': data.expires_time - this.$Cache.time()
+					});
+					let backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+					that.$Cache.clear(BACK_URL);
+					getUserInfo().then(res => {
+						this.keyLock = true
+						that.$store.commit("SETUID", res.data.uid);
+						uni.reLaunch({
+							url: backUrl
+						});
+					}).catch(error => {
+						this.keyLock = true
+					})
+				})
+				.catch(e => {
+					this.keyLock = true
+					that.$util.Tips({
+						title: e
+					});
+				});
 		}
-	};
+	}
+};
 </script>
 <style>
-	page {
-		background: #fff;
-	}
+page {
+	background: #fff;
+}
 </style>
 <style lang="scss">
-	.appLogin {
-		margin-top: 60rpx;
+.appLogin {
+	margin-top: 60rpx;
 
-		.hds {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			font-size: 24rpx;
-			color: #B4B4B4;
+	.hds {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 24rpx;
+		color: #B4B4B4;
 
-			.line {
-				width: 68rpx;
-				height: 1rpx;
-				background: #CCCCCC;
-			}
+		.line {
+			width: 68rpx;
+			height: 1rpx;
+			background: #CCCCCC;
+		}
 
-			p {
-				margin: 0 20rpx;
-			}
+		p {
+			margin: 0 20rpx;
 		}
+	}
+
+	.btn-wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 30rpx;
 
-		.btn-wrapper {
+		.btn {
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			margin-top: 30rpx;
-
-			.btn {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 68rpx;
-				height: 68rpx;
-				border-radius: 50%;
-			}
-
-			.apple-btn {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 68rpx;
-				height: 68rpx;
-				border-radius: 50%;
-				background: #000;
+			width: 68rpx;
+			height: 68rpx;
+			border-radius: 50%;
+		}
 
+		.apple-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 68rpx;
+			height: 68rpx;
+			border-radius: 50%;
+			background: #000;
 
-				.icon-s-pingguo {
-					color: #fff;
-					font-size: 44rpx;
-				}
-			}
 
-			.iconfont {
-				font-size: 40rpx;
+			.icon-s-pingguo {
 				color: #fff;
+				font-size: 44rpx;
 			}
+		}
 
-			.wx {
-				margin-right: 30rpx;
-				background-color: #61C64F;
-			}
+		.iconfont {
+			font-size: 40rpx;
+			color: #fff;
+		}
 
-			.mima {
-				margin-right: 30rpx;
-				background-color: #28B3E9;
-			}
+		.wx {
+			margin-right: 30rpx;
+			background-color: #61C64F;
+		}
 
-			.yanzheng {
-				margin-right: 30rpx;
-				background-color: #F89C23;
-			}
+		.mima {
+			margin-right: 30rpx;
+			background-color: #28B3E9;
+		}
 
+		.yanzheng {
+			margin-right: 30rpx;
+			background-color: #F89C23;
 		}
-	}
 
-	.code img {
-		width: 100%;
-		height: 100%;
 	}
+}
 
-	.acea-row.row-middle {
-		input {
-			margin-left: 20rpx;
-			display: block;
-		}
+.code img {
+	width: 100%;
+	height: 100%;
+}
+
+.acea-row.row-middle {
+	input {
+		margin-left: 20rpx;
+		display: block;
 	}
+}
 
-	.login-wrapper {
-		padding: 30rpx;
+.login-wrapper {
+	padding: 30rpx;
 
-		.shading {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 100%;
+	.shading {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
 
-			/* #ifdef APP-VUE */
-			margin-top: 50rpx;
-			/* #endif */
-			/* #ifndef APP-VUE */
+		/* #ifdef APP-VUE */
+		margin-top: 50rpx;
+		/* #endif */
+		/* #ifndef APP-VUE */
 
-			margin-top: 200rpx;
-			/* #endif */
+		margin-top: 200rpx;
+		/* #endif */
 
 
-			image {
-				width: 240rpx;
-				height: 240rpx;
-			}
+		image {
+			width: 240rpx;
+			height: 240rpx;
 		}
+	}
 
-		.whiteBg {
-			margin-top: 100rpx;
+	.whiteBg {
+		margin-top: 100rpx;
 
-			.list {
-				border-radius: 16rpx;
-				overflow: hidden;
+		.list {
+			border-radius: 16rpx;
+			overflow: hidden;
 
-				.item {
-					border-bottom: 1px solid #F0F0F0;
-					background: #fff;
+			.item {
+				border-bottom: 1px solid #F0F0F0;
+				background: #fff;
 
-					.row-middle {
-						position: relative;
-						padding: 16rpx 45rpx;
+				.row-middle {
+					position: relative;
+					padding: 16rpx 45rpx;
 
-						input {
-							flex: 1;
-							font-size: 28rpx;
-							height: 80rpx;
-						}
+					input {
+						flex: 1;
+						font-size: 28rpx;
+						height: 80rpx;
+					}
 
-						.code {
-							position: absolute;
-							right: 30rpx;
-							top: 50%;
-							color: var(--view-theme);
-							font-size: 26rpx;
-							transform: translateY(-50%);
-						}
+					.code {
+						position: absolute;
+						right: 30rpx;
+						top: 50%;
+						color: var(--view-theme);
+						font-size: 26rpx;
+						transform: translateY(-50%);
 					}
 				}
 			}
+		}
 
-			.logon {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 100%;
-				height: 86rpx;
-				margin-top: 80rpx;
-				background-color: var(--view-theme);
-				border-radius: 120rpx;
-				color: #FFFFFF;
-				font-size: 30rpx;
-			}
+		.logon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 100%;
+			height: 86rpx;
+			margin-top: 80rpx;
+			background-color: var(--view-theme);
+			border-radius: 120rpx;
+			color: #FFFFFF;
+			font-size: 30rpx;
+		}
 
-			.tips {
-				margin: 30rpx;
-				text-align: center;
-				color: #999;
-			}
+		.tips {
+			margin: 30rpx;
+			text-align: center;
+			color: #999;
 		}
 	}
-	.protocol {
-		margin-top: 40rpx;
-		color: #999999;
-		font-size: 24rpx;
-		text-align: center;
-		bottom: 20rpx;
-	}
-	.trembling {
-		animation: shake 0.6s;
-	}
-	.main-color {
-		color: var(--view-theme);
-	}
+}
+
+.protocol {
+	margin-top: 40rpx;
+	color: #999999;
+	font-size: 24rpx;
+	text-align: center;
+	bottom: 20rpx;
+}
+
+.trembling {
+	animation: shake 0.6s;
+}
+
+.main-color {
+	color: var(--view-theme);
+}
 </style>

pages/users/wechat_login/index.vue

@@ -88,9 +88,10 @@
 			if (uni.getUserProfile) {
 				this.canUseGetUserProfile = true
 			}
-			getLogo().then(res => {
-				this.logoUrl = res.data.logo_url;
-			});
+			this.logoUrl = "https://demo26.crmeb.net/statics/system_images/login_logo.jpeg";
+			// getLogo().then(res => {
+			// 	this.logoUrl = res.data.logo_url;
+			// });
 			let that = this;
 			// #ifdef MP
 			Routine.getCode()

utils/request.js

@@ -41,14 +41,15 @@ function baseRequest(url, method, data, {
 			header: header,
 			data: data || {},
 			success: (res) => {
+				console.log(res);
 				if (noVerify)
 					reslove(res.data, res);
-				else if (res.data.status == 200)
+				else if (res.data.code == 200)
 					reslove(res.data, res);
-				else if ([110002, 110003, 110004].indexOf(res.data.status) !== -1) {
+				else if ([401, 110003, 110004].indexOf(res.data.code) !== -1) {
 					toLogin();
 					reject(res.data);
-				} else if (res.data.status == 100103) {
+				} else if (res.data.code == 100103) {
 					uni.showModal({
 						title: i18n.t(`提示`),
 						content: res.data.msg,