lhl пре 2 година
родитељ
комит
db8737513f
78 измењених фајлова са 445 додато и 400 уклоњено
  1. 2 2
      manifest.json
  2. 1 1
      pages.json
  3. 6 3
      pages/order/createOrder.vue
  4. 6 9
      pages/public/forget.vue
  5. 410 372
      pages/public/login.vue
  6. 1 1
      pages/public/register.vue
  7. 1 1
      pages/set/addressManage.vue
  8. 6 1
      pages/set/password.vue
  9. 1 1
      pages/set/phone.vue
  10. 1 1
      pages/set/userinfo.vue
  11. 7 5
      pages/user/user.vue
  12. 1 1
      pages/user/yue.vue
  13. BIN
      unpackage/dist/build/h5/h5.rar
  14. 2 2
      unpackage/dist/build/h5/index.html
  15. 0 0
      unpackage/dist/build/h5/static/index.63b34199.css
  16. 0 0
      unpackage/dist/build/h5/static/js/chunk-vendors.48a05ccf.js
  17. 0 0
      unpackage/dist/build/h5/static/js/chunk-vendors.69adbd1d.js
  18. 0 0
      unpackage/dist/build/h5/static/js/index.669c7917.js
  19. 0 0
      unpackage/dist/build/h5/static/js/index.cb558777.js
  20. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-cart.3a1b292b.js
  21. 0 0
      unpackage/dist/build/h5/static/js/pages-category-category.9e286eb0.js
  22. 0 0
      unpackage/dist/build/h5/static/js/pages-index-artDetail.3a1054ac.js
  23. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.332bbced.js
  24. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index~pages-user-user.be8b9a5c.js
  25. 0 0
      unpackage/dist/build/h5/static/js/pages-money-account.8e107f75.js
  26. 0 0
      unpackage/dist/build/h5/static/js/pages-money-pay.b75b9e96.js
  27. 0 0
      unpackage/dist/build/h5/static/js/pages-money-paySuccess.8a2bda22.js
  28. 0 0
      unpackage/dist/build/h5/static/js/pages-money-recharge.3349cd82.js
  29. 0 0
      unpackage/dist/build/h5/static/js/pages-money-wallet.1ee68f4b.js
  30. 0 0
      unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-award~pages-user-favorites~pages-user-jf~pages-user-~27f9d3cc.de0feb42.js
  31. 0 0
      unpackage/dist/build/h5/static/js/pages-money-withdrawal.dac41d1d.js
  32. 0 0
      unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-reply~pages-set-ad~51b461c3.090648d9.js
  33. 0 0
      unpackage/dist/build/h5/static/js/pages-order-createOrder.4a408acd.js
  34. 0 0
      unpackage/dist/build/h5/static/js/pages-order-createOrder.719db638.js
  35. 0 0
      unpackage/dist/build/h5/static/js/pages-order-evaluate.51fbffc7.js
  36. 0 0
      unpackage/dist/build/h5/static/js/pages-order-evaluate.c31b4504.js
  37. 0 0
      unpackage/dist/build/h5/static/js/pages-order-expressInfo.2d3276a8.js
  38. 0 0
      unpackage/dist/build/h5/static/js/pages-order-order.2a64ac11.js
  39. 0 0
      unpackage/dist/build/h5/static/js/pages-order-orderDetail.9ddcc958.js
  40. 0 0
      unpackage/dist/build/h5/static/js/pages-order-orderRefund.adae9bf2.js
  41. 0 0
      unpackage/dist/build/h5/static/js/pages-product-list.6599541b.js
  42. 0 0
      unpackage/dist/build/h5/static/js/pages-product-product.de21b46f.js
  43. 0 0
      unpackage/dist/build/h5/static/js/pages-product-reply.5156d212.js
  44. 0 0
      unpackage/dist/build/h5/static/js/pages-product-reply.58f26965.js
  45. 0 0
      unpackage/dist/build/h5/static/js/pages-product-search.e4f86fe7.js
  46. 0 0
      unpackage/dist/build/h5/static/js/pages-public-forget.37b35602.js
  47. 0 0
      unpackage/dist/build/h5/static/js/pages-public-forget.ae981aaa.js
  48. 0 0
      unpackage/dist/build/h5/static/js/pages-public-login.77644cef.js
  49. 0 0
      unpackage/dist/build/h5/static/js/pages-public-login.b818aaf5.js
  50. 0 0
      unpackage/dist/build/h5/static/js/pages-public-register.6adee3ee.js
  51. 0 0
      unpackage/dist/build/h5/static/js/pages-public-register.c7b59c91.js
  52. 0 0
      unpackage/dist/build/h5/static/js/pages-public-wxLogin.ee209d42.js
  53. 0 0
      unpackage/dist/build/h5/static/js/pages-redirect-redirect.1ad2fc6d.js
  54. 0 0
      unpackage/dist/build/h5/static/js/pages-set-address.fc0a8829.js
  55. 0 0
      unpackage/dist/build/h5/static/js/pages-set-addressManage.455dee8d.js
  56. 0 0
      unpackage/dist/build/h5/static/js/pages-set-addressManage.845104e4.js
  57. 0 0
      unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-user-user.bc3c7340.js
  58. 0 0
      unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-user-xzdl.ec38008b.js
  59. 0 0
      unpackage/dist/build/h5/static/js/pages-set-password.bbc55dea.js
  60. 0 0
      unpackage/dist/build/h5/static/js/pages-set-password.c7ef1f02.js
  61. 0 0
      unpackage/dist/build/h5/static/js/pages-set-phone.6ef914e3.js
  62. 0 0
      unpackage/dist/build/h5/static/js/pages-set-phone.d3b8c5f2.js
  63. 0 0
      unpackage/dist/build/h5/static/js/pages-set-set.9f224d52.js
  64. 0 0
      unpackage/dist/build/h5/static/js/pages-set-userinfo.4348cffc.js
  65. 0 0
      unpackage/dist/build/h5/static/js/pages-set-userinfo.c4412bbd.js
  66. 0 0
      unpackage/dist/build/h5/static/js/pages-user-award.52f3a820.js
  67. 0 0
      unpackage/dist/build/h5/static/js/pages-user-favorites.517c0716.js
  68. 0 0
      unpackage/dist/build/h5/static/js/pages-user-jf.107ba6f5.js
  69. 0 0
      unpackage/dist/build/h5/static/js/pages-user-shareQrCode.d918c028.js
  70. 0 0
      unpackage/dist/build/h5/static/js/pages-user-team.d87afe5b.js
  71. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.55fe8481.js
  72. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.6638e5b6.js
  73. 0 0
      unpackage/dist/build/h5/static/js/pages-user-withdrawal.f8a91dd2.js
  74. 0 0
      unpackage/dist/build/h5/static/js/pages-user-xzdl.bfd5be6f.js
  75. 0 0
      unpackage/dist/build/h5/static/js/pages-user-yjzye.d2893838.js
  76. 0 0
      unpackage/dist/build/h5/static/js/pages-user-yjzz.cd56d5c7.js
  77. 0 0
      unpackage/dist/build/h5/static/js/pages-user-yue.6f780f17.js
  78. 0 0
      unpackage/dist/build/h5/static/js/pages-user-yue.c12d0ac4.js

+ 2 - 2
manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "天美仕",
+    "name" : "商城",
     "appid" : "__UNI__CE920B0",
     "description" : "天美仕",
     "versionName" : "1.0.0",
@@ -65,7 +65,7 @@
         }
     },
     "h5" : {
-        "title" : "天美仕",
+        "title" : "商城",
         "domain" : "",
         "router" : {
             "base" : "/index/",

+ 1 - 1
pages.json

@@ -2,7 +2,7 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "天美仕",
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
 		},

Разлика између датотеке није приказан због своје велике величине
+ 6 - 3
pages/order/createOrder.vue


+ 6 - 9
pages/public/forget.vue

@@ -1,7 +1,10 @@
 <template>
 	<view class="container">
 		<view class="container_text">
-			<image class="banner-img" src="/static/img/img01.png" mode=" scaleToFill"></image>
+			<!-- <image class="banner-img" src="/static/img/img01.png" mode=" scaleToFill"></image> -->
+			<view class="banner-img" style="background-color: #f63332;">
+				
+			</view>
 		</view>
 		<view class="loginTitle"><text>手机号登录</text></view>
 		<view class="login_text">
@@ -108,12 +111,6 @@ export default {
 						console.log(err);
 					});
 			}
-		},
-		login() {
-			//返回登录
-			uni.navigateTo({
-				url: '/pages/public/login'
-			});
 		}
 	}
 };
@@ -163,7 +160,7 @@ page {
 				width: 325rpx !important;
 			}
 			.code {
-				color: #5dbc7c;
+				color: #f63332;
 				font-size: 23rpx;
 				border-left: 1px solid #eeeeee;
 				width: 150rpx;
@@ -174,7 +171,7 @@ page {
 	}
 	.uni-button-green {
 		color: #ffffff;
-		background-color: #5dbc7c;
+		background-color: #f63332;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
 	}

+ 410 - 372
pages/public/login.vue

@@ -1,376 +1,414 @@
-<template>
-	<view class="container">
-		<view class="container_text">
+<template>
+	<view class="container">
+		<view class="container_text">
 			<!-- <image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image> -->
 			<view class="banner-img" style="background-color: #f63332;">
-				
-			</view>
-		</view>
+
+			</view>
+		</view>
 		<view class="loginTitle"><text>登录</text></view>
-		
-		<view class="login_text">
-			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="username" focus placeholder="请输入手机号" /></view>
-			</view>
-			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus placeholder="请输入密码" /></view>
-			</view>
-			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
-			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true" hover-class="none" @click="register">注册</button></view>
-			<!-- <navigator url="./forget"><view class="forget">忘记密码</view></navigator> -->
-			
-			
-				</view>
-			</view>
-</template>
-
-<script>
-import { mapMutations } from 'vuex';
-import { login} from '@/api/login.js';
-import { getUserInfo} from '@/api/user.js';
-// #ifdef APP-PLUS
-// applelogin接口需要开发编写,基础项目中可能没有
-import { applelogin } from '@/api/set.js';
-// loginWx接口需要开发编写,基础项目中可能没有
-import { loginWx } from '@/api/login.js';
-// #endif
-// #ifdef H5
-import { loginWinxin } from '@/utils/wxAuthorized';
-// #endif
-export default {
-	data() {
-		return {
-			username: '',
-			passward: '',
-			// #ifdef APP-PLUS
-			is_ios: false ,//判断是否为ios手机
-			is_apple_login:false,//是否有ios授权登录功能
-			// #endif
-		};
-	},
-	onLoad() {
-		let obj = this;
-		// #ifdef APP-PLUS
-		let system = uni.getStorageSync('platform');
-		// 判断是否为ios
-		if (system == 'ios') {
-			obj.is_ios = true;
-		}
-		uni.getSystemInfo({
-			success(e) {
-				if(+e.system.split('.')[0]>=13){
-					obj.is_apple_login=true;
-				}
-			}
-		})
-		// #endif
-		if(!uni.getStorageInfoSync('username')) {
-			
-		}else {
-			this.username = uni.getStorageSync('username')
-			this.passward = uni.getStorageSync('passward')
+
+		<view class="login_text">
+			<view class="login_input flex">
+				<view class="login_img">
+					<image src="/static/icon/img03.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" v-model="username" focus placeholder="请输入手机号" />
+				</view>
+			</view>
+			<view class="login_input flex">
+				<view class="login_img">
+					<image src="/static/icon/img04.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus
+						placeholder="请输入密码" /></view>
+			</view>
+			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
+			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true"
+					hover-class="none" @click="register">注册</button></view>
+			<navigator url="./forget"><view class="forget">忘记密码</view></navigator>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapMutations
+	} from 'vuex';
+	import {
+		login
+	} from '@/api/login.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	// #ifdef APP-PLUS
+	// applelogin接口需要开发编写,基础项目中可能没有
+	import {
+		applelogin
+	} from '@/api/set.js';
+	// loginWx接口需要开发编写,基础项目中可能没有
+	import {
+		loginWx
+	} from '@/api/login.js';
+	// #endif
+	// #ifdef H5
+	import {
+		loginWinxin
+	} from '@/utils/wxAuthorized';
+	// #endif
+	export default {
+		data() {
+			return {
+				username: '',
+				passward: '',
+				// #ifdef APP-PLUS
+				is_ios: false, //判断是否为ios手机
+				is_apple_login: false, //是否有ios授权登录功能
+				// #endif
+			};
+		},
+		onLoad() {
+			let obj = this;
+			// #ifdef APP-PLUS
+			let system = uni.getStorageSync('platform');
+			// 判断是否为ios
+			if (system == 'ios') {
+				obj.is_ios = true;
+			}
+			uni.getSystemInfo({
+				success(e) {
+					if (+e.system.split('.')[0] >= 13) {
+						obj.is_apple_login = true;
+					}
+				}
+			})
+			// #endif
+			if (!uni.getStorageInfoSync('username')) {
+
+			} else {
+				this.username = uni.getStorageSync('username')
+				this.passward = uni.getStorageSync('passward')
+			}
+
+
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'login']),
+			// 微信登录
+			wecahtLogin(type) {
+				let obj = this;
+				// #ifdef H5
+				let weichatBrowser = uni.getStorageSync('weichatBrowser');
+				if (weichatBrowser) {
+					loginWinxin();
+				}
+				// #endif
+				// #ifdef APP-PLUS
+				uni.login({
+					provider: type,
+					success(e) {
+						uni.getUserInfo({
+							provider: type,
+							success(es) {
+								if (type === 'weixin') {
+									loginWx(es.userInfo)
+										.then(e => {
+											uni.setStorageSync('token', e.data.token);
+											getUserInfo({}).then(e => {
+												obj.login();
+												// 保存返回用户数据
+												obj.setUserInfo(e.data);
+												//成功跳转首页
+												uni.switchTab({
+													url: '/pages/index/index'
+												});
+											});
+										})
+										.catch(e => {
+											console.log(e);
+											uni.showModal({
+												content: JSON.stringify(e),
+												success() {},
+												fail() {}
+											});
+										});
+								}
+								if (type === 'apple') {
+									console.log(es.userInfo);
+									applelogin({
+											account: es.userInfo.openId,
+										})
+										.then(function(e) {
+											console.log(e, 'token')
+											uni.setStorageSync('token', e.data.token);
+											getUserInfo({}).then(e => {
+												obj.login();
+												// 保存返回用户数据
+												obj.setUserInfo(e.data);
+												//成功跳转首页
+												uni.switchTab({
+													url: '/pages/index/index'
+												});
+											});
+
+										})
+										.catch(function(e) {
+											console.log(e);
+										});
+								}
+
+							},
+							fail(es) {
+								uni.showModal({
+									content: JSON.stringify(es),
+									success() {
+										// obj.login();
+										// // 保存返回用户数据
+										// obj.setUserInfo(e.data);
+										// //成功跳转首页
+										// uni.switchTab({
+										// 	url: '/pages/index/index'
+										// });
+									}
+								});
+							}
+						});
+					},
+					fail(e) {
+						uni.showModal({
+							title: '提示',
+							content: JSON.stringify(e),
+							showCancel: false
+						});
+					}
+				});
+				// #endif
+			},
+			//登录
+			async toLogin() {
+				let obj = this;
+				obj.logining = true;
+				if (obj.username == '') {
+					obj.$api.msg('请输入手机号');
+					return;
+				}
+				if (obj.passward == '') {
+					obj.$api.msg('请输入密码');
+					return;
+				}
+				login({
+						account: obj.username,
+						password: obj.passward
+					})
+					.then(function(e) {
+						uni.setStorageSync('username', obj.username)
+						uni.setStorageSync('passward', obj.passward)
+						uni.setStorageSync('token', e.data.token);
+						getUserInfo({}).then(e => {
+							obj.login();
+							// 保存返回用户数据
+							obj.setUserInfo(e.data);
+							let ur = uni.getStorageSync('present') || '/pages/index/index';
+							//成功跳转首页
+							uni.switchTab({
+								url: ur,
+								fail(e) {
+									uni.navigateTo({
+										url: ur,
+										fail(e) {
+											uni.navigateTo({
+												url: '/pages/index/index',
+											});
+										}
+									});
+								}
+							});
+						});
+					})
+					.catch(function(e) {
+						console.log(e);
+					});
+			},
+			//跳转注册页
+			register() {
+				uni.navigateTo({
+					url: `/pages/public/register`
+				});
+			},
+			// 后退
+			navBack() {
+				uni.navigateBack();
+			}
 		}
-		
-		
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'login']),
-		// 微信登录
-		wecahtLogin(type) {
-			let obj = this;
-			// #ifdef H5
-			let weichatBrowser = uni.getStorageSync('weichatBrowser');
-			if (weichatBrowser) {
-				loginWinxin();
-			}
-			// #endif
-			// #ifdef APP-PLUS
-			uni.login({
-				provider: type,
-				success(e) {
-					uni.getUserInfo({
-						provider: type,
-						success(es) {
-							if(type==='weixin'){
-								loginWx(es.userInfo)
-									.then(e => {
-										uni.setStorageSync('token', e.data.token);
-										getUserInfo({}).then(e => {
-											obj.login();
-											// 保存返回用户数据
-											obj.setUserInfo(e.data);
-											//成功跳转首页
-											uni.switchTab({
-												url: '/pages/index/index'
-											});
-										});
-									})
-									.catch(e => {
-										console.log(e);
-										uni.showModal({
-											content: JSON.stringify(e),
-											success() {},
-											fail() {}
-										});
-									});
-							}
-							if(type==='apple'){
-								console.log(es.userInfo);
-								applelogin({
-									account: es.userInfo.openId,
-								})
-									.then(function(e) {
-										console.log(e,'token')
-										uni.setStorageSync('token', e.data.token);
-										getUserInfo({}).then(e => {
-											obj.login();
-											// 保存返回用户数据
-											obj.setUserInfo(e.data);
-											//成功跳转首页
-											uni.switchTab({
-												url: '/pages/index/index'
-											});
-										});
-										
-									})
-									.catch(function(e) {
-										console.log(e);
-									});
-							}
-							
-						},
-						fail(es) {
-							uni.showModal({
-								content: JSON.stringify(es),
-								success() {
-									// obj.login();
-									// // 保存返回用户数据
-									// obj.setUserInfo(e.data);
-									// //成功跳转首页
-									// uni.switchTab({
-									// 	url: '/pages/index/index'
-									// });
-								}
-							});
-						}
-					});
-				},
-				fail(e) {
-					uni.showModal({
-						title: '提示',
-						content: JSON.stringify(e),
-						showCancel: false
-					});
-				}
-			});
-			// #endif
-		},
-		//登录
-		async toLogin() {
-			let obj = this;
-			obj.logining = true;
-			if (obj.username == '') {
-				obj.$api.msg('请输入手机号');
-				return;
-			}
-			if (obj.passward == '') {
-				obj.$api.msg('请输入密码');
-				return;
-			}
-			login({
-				account: obj.username,
-				password: obj.passward
-			})
-				.then(function(e) {
-					uni.setStorageSync('username',obj.username)
-					uni.setStorageSync('passward',obj.passward)
-					uni.setStorageSync('token', e.data.token);
-					getUserInfo({}).then(e => {
-						obj.login();
-						// 保存返回用户数据
-						obj.setUserInfo(e.data);
-						let ur = uni.getStorageSync('present')|| '/pages/index/index';
-						//成功跳转首页
-						uni.switchTab({
-							url: ur,
-							fail(e) {
-								uni.navigateTo({
-									url: ur,
-									fail(e) {
-										uni.navigateTo({
-											url: '/pages/index/index',
-										});
-									}
-								});
-							}
-						});
-					});
-				})
-				.catch(function(e) {
-					console.log(e);
-				});
-		},
-		//跳转注册页
-		register() {
-			uni.navigateTo({
-				url: `/pages/public/register`
-			});
-		},
-		// 后退
-		navBack() {
-			uni.navigateBack();
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-	/* #ifdef APP-PLUS */
-	
-	.ios_login {
-		width: 260rpx;
-		border-radius: 12rpx;
-		justify-content: center;
-		border: 1px solid #212121;
-		margin: 24rpx auto;
-		padding: 10rpx;
-		background-color: #212121;
-		color: #ffffff;
-		.loginIcon {
-			width: 50rpx;
-			height: 50rpx;
-		}
-		.weixin_text {
-			line-height: 1;
-			margin-left: 20rpx;
-			color: #ffffff !important;
-		}
-	}
-	
-	/* #endif */
-	.ios_login {
-		width: 350rpx;
-		border-radius: 12rpx;
-		justify-content: center;
-		border: 1px solid #212121;
-		margin: 24rpx auto;
-		padding: 15rpx;
-		background-color: #212121;
-		color: #ffffff;
-		font-size: 32rpx;
-		.loginIcon {
-			font-size: 35rpx;
-			width: 35rpx;
-			height: 35rpx;
-		}
-		.weixin_text {
-			line-height: 1;
-			margin-left: 20rpx;
-			color: #ffffff !important;
-		}
-	}
-	
-page {
-	height: 100%;
-}
-.container {
-	width: 100%;
-	height: 100%;
-	background-size: 100%;
-}
-.container_text {
-	width: 100%;
-	height: 500rpx;
-	top: 0rpx;
-	.banner-img {
-		width: 100%;
-		height: 100%;
-	}
-}
-.login_text {
-	margin: auto 30rpx;
-	position: relative;
-	padding: 100rpx 102rpx;
-	background-color: #ffffff;
-	margin-top: -180rpx;
-	border-radius: 20rpx;
-	.login_input {
-		border-bottom: 1px solid #f0f0f0;
-		margin-bottom: 65rpx;
-		.login_img image {
-			height: 35rpx;
-			width: 29rpx;
-			margin-right: 20rpx;
-		}
-		.uni-input {
-			text-align: left;
-			width: 470rpx;
-			font-size: 28rpx !important;
-		}
-		.login_name {
-			color: #333333;
-		}
-	}
-
-	.other {
-		margin-top: 60rpx;
-		.fenge {
-			width: 30%;
-			height: 2rpx;
-			background-color: #eeeeee;
-		}
-		.qita {
-			font-size: 28rpx;
-			color: #999999;
-		}
-	}
-	.weixin {
-		width: 75rpx;
-		height: 75rpx;
-		margin: 25rpx auto;
-	}
-	.weixin image {
-		width: 100%;
-		height: 100%;
-	}
-	.weixin_text {
-		text-align: center;
-		font-size: 28rpx;
-		color: #999999;
-	}
-	.forget {
-		font-size: 28rpx;
-		width: 100%;
-		text-align: right;
-		color: #999999;
-	}
-
-	.uni-button-green {
-		color: #ffffff;
-		background-color: #ff4c4c;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-	}
-	.uni-button-green-plain {
-		border: 1px solid #ff4c4c;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-		color: #ff4c4c;
-		background-color: #ffffff;
-	}
-	.uni-button {
-		height: 85rpx;
-		line-height: 85rpx;
-	}
-}
-.loginTitle {
-	position: absolute;
-	top: 250rpx;
-	width: 100%;
-	text-align: center;
-	color: white;
-	font-size: 40rpx;
-}
-</style>
+	};
+</script>
+
+<style lang="scss">
+	/* #ifdef APP-PLUS */
+
+	.ios_login {
+		width: 260rpx;
+		border-radius: 12rpx;
+		justify-content: center;
+		border: 1px solid #212121;
+		margin: 24rpx auto;
+		padding: 10rpx;
+		background-color: #212121;
+		color: #ffffff;
+
+		.loginIcon {
+			width: 50rpx;
+			height: 50rpx;
+		}
+
+		.weixin_text {
+			line-height: 1;
+			margin-left: 20rpx;
+			color: #ffffff !important;
+		}
+	}
+
+	/* #endif */
+	.ios_login {
+		width: 350rpx;
+		border-radius: 12rpx;
+		justify-content: center;
+		border: 1px solid #212121;
+		margin: 24rpx auto;
+		padding: 15rpx;
+		background-color: #212121;
+		color: #ffffff;
+		font-size: 32rpx;
+
+		.loginIcon {
+			font-size: 35rpx;
+			width: 35rpx;
+			height: 35rpx;
+		}
+
+		.weixin_text {
+			line-height: 1;
+			margin-left: 20rpx;
+			color: #ffffff !important;
+		}
+	}
+
+	page {
+		height: 100%;
+	}
+
+	.container {
+		width: 100%;
+		height: 100%;
+		background-size: 100%;
+	}
+
+	.container_text {
+		width: 100%;
+		height: 500rpx;
+		top: 0rpx;
+
+		.banner-img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.login_text {
+		margin: auto 30rpx;
+		position: relative;
+		padding: 100rpx 102rpx;
+		background-color: #ffffff;
+		margin-top: -180rpx;
+		border-radius: 20rpx;
+
+		.login_input {
+			border-bottom: 1px solid #f0f0f0;
+			margin-bottom: 65rpx;
+
+			.login_img image {
+				height: 35rpx;
+				width: 29rpx;
+				margin-right: 20rpx;
+			}
+
+			.uni-input {
+				text-align: left;
+				width: 470rpx;
+				font-size: 28rpx !important;
+			}
+
+			.login_name {
+				color: #333333;
+			}
+		}
+
+		.other {
+			margin-top: 60rpx;
+
+			.fenge {
+				width: 30%;
+				height: 2rpx;
+				background-color: #eeeeee;
+			}
+
+			.qita {
+				font-size: 28rpx;
+				color: #999999;
+			}
+		}
+
+		.weixin {
+			width: 75rpx;
+			height: 75rpx;
+			margin: 25rpx auto;
+		}
+
+		.weixin image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.weixin_text {
+			text-align: center;
+			font-size: 28rpx;
+			color: #999999;
+		}
+
+		.forget {
+			font-size: 28rpx;
+			width: 100%;
+			text-align: right;
+			color: #999999;
+		}
+
+		.uni-button-green {
+			color: #ffffff;
+			background-color: #ff4c4c;
+			margin: 40rpx 10rpx;
+			border-radius: 50rpx;
+		}
+
+		.uni-button-green-plain {
+			border: 1px solid #ff4c4c;
+			margin: 40rpx 10rpx;
+			border-radius: 50rpx;
+			color: #ff4c4c;
+			background-color: #ffffff;
+		}
+
+		.uni-button {
+			height: 85rpx;
+			line-height: 85rpx;
+		}
+	}
+
+	.loginTitle {
+		position: absolute;
+		top: 250rpx;
+		width: 100%;
+		text-align: center;
+		color: white;
+		font-size: 40rpx;
+	}
+</style>

+ 1 - 1
pages/public/register.vue

@@ -79,7 +79,7 @@ export default {
 				obj.$api.msg('请输入电话号码');
 				return;
 			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.phone)) {
+			if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(this.phone)) {
 				obj.$api.msg('请输入正确的手机号');
 				return;
 			}

+ 1 - 1
pages/set/addressManage.vue

@@ -119,7 +119,7 @@ export default {
 				this.$api.msg('请填写收货人姓名');
 				return;
 			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.mobile)) {
+			if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(data.mobile)) {
 				this.$api.msg('请输入正确的手机号码');
 				return;
 			}

+ 6 - 1
pages/set/password.vue

@@ -91,7 +91,12 @@ export default {
 			})
 				.then(({ data }) => {
 					this.loding = false;
-					this.$api.msg('修改成功');
+					this.$api.msg('修改成功');
+					setTimeout(()=> {
+						uni.switchTab({
+							url:'/pages/user/user'
+						},1500)
+					})
 				})
 				.catch(err => {
 					this.loding = false;

+ 1 - 1
pages/set/phone.vue

@@ -57,7 +57,7 @@ export default {
 				this.$api.msg('请输入电话号码');
 				return;
 			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
+			if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(this.account)) {
 				this.$api.msg('请输入正确的手机号');
 				return;
 			}

+ 1 - 1
pages/set/userinfo.vue

@@ -13,7 +13,7 @@
 			<input class="input" type="text"  disabled="true" v-model="userInfo.phone" placeholder-class="placeholder" />
 		</view>
 		<!-- <view class="row">
-			<text class="tit">账户</text>
+			<text class="tit">设置密码</text>
 			<input class="input" type="text"  disabled="true" v-model="userInfo.phone" placeholder-class="placeholder" />
 		</view> -->
 		<view class="add-btn" @click="confirm">提交</view>

+ 7 - 5
pages/user/user.vue

@@ -76,15 +76,15 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="user-list flex" @click="navTo('/pages/user/shareQrCode')">
+		<view class="user-list flex" @click="navTo('/pages/set/password')">
 			<view class="user-list-image">
-				<image src="../../static/icon/u1.png" mode="heightFix" class="left-img"></image>
+				<image src="../../static/icon/img06.png" mode="heightFix" class="left-img"></image>
 			</view>
 			<view class="user-list-tit">
-				邀请海报
+				修改密码
 			</view>
 			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
-		</view> -->
+		</view>
 		<view class="user-list flex" @click="navTo('/pages/user/team')">
 			<view class="user-list-image">
 				<image src="../../static/icon/u2.png" mode="heightFix" class="left-img"></image>
@@ -222,7 +222,7 @@
 			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 		},
 		methods: {
-			...mapMutations('user', ['setUserInfo']),
+			...mapMutations('user', ['setUserInfo','login']),
 			qhx() {
 				check({
 						verify_code: this.code,
@@ -305,6 +305,7 @@
 						data
 					}) => {
 						console.log(data.nickname)
+						this.login()
 						this.setUserInfo(data);
 					})
 					.catch(e => {
@@ -317,6 +318,7 @@
 			 */
 			navTo(url) {
 				console.log(url);
+				console.log(this.hasLogin,'haslogin')
 				if (!this.hasLogin) {
 					// 保存地址
 					saveUrl();

+ 1 - 1
pages/user/yue.vue

@@ -48,7 +48,7 @@
 					<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
 						<view class="title-box">
 							<view class="title">
-								<text>{{ item.title }}</text>
+								<text>{{ item.mark }}</text>
 							</view>
 							<view class="time">
 								<text>{{ item.add_time }}</text>

BIN
unpackage/dist/build/h5/tms-1.rar → unpackage/dist/build/h5/h5.rar


+ 2 - 2
unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>天美仕</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.69adbd1d.js></script><script src=/index/static/js/index.cb558777.js></script></body></html>
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.48a05ccf.js></script><script src=/index/static/js/index.669c7917.js></script></body></html>

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/index.63b34199.css


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/chunk-vendors.48a05ccf.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/chunk-vendors.69adbd1d.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/index.669c7917.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/index.cb558777.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-cart.55d11e2e.js → unpackage/dist/build/h5/static/js/pages-cart-cart.3a1b292b.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-category.3761cd50.js → unpackage/dist/build/h5/static/js/pages-category-category.9e286eb0.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-artDetail.4d5b9916.js → unpackage/dist/build/h5/static/js/pages-index-artDetail.3a1054ac.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.dbbfad0c.js → unpackage/dist/build/h5/static/js/pages-index-index.332bbced.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index~pages-user-user.f856a65f.js → unpackage/dist/build/h5/static/js/pages-index-index~pages-user-user.be8b9a5c.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-account.13ed5650.js → unpackage/dist/build/h5/static/js/pages-money-account.8e107f75.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-pay.f552b114.js → unpackage/dist/build/h5/static/js/pages-money-pay.b75b9e96.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-paySuccess.7f355e36.js → unpackage/dist/build/h5/static/js/pages-money-paySuccess.8a2bda22.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-recharge.2f1b1bfa.js → unpackage/dist/build/h5/static/js/pages-money-recharge.3349cd82.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-wallet.bbe84e7c.js → unpackage/dist/build/h5/static/js/pages-money-wallet.1ee68f4b.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-award~pages-user-favorites~pages-user-jf~pages-user-~27f9d3cc.fb438ce2.js → unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-award~pages-user-favorites~pages-user-jf~pages-user-~27f9d3cc.de0feb42.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-withdrawal.0fd0692b.js → unpackage/dist/build/h5/static/js/pages-money-withdrawal.dac41d1d.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-reply~pages-set-ad~51b461c3.44805c0a.js → unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-reply~pages-set-ad~51b461c3.090648d9.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-createOrder.4a408acd.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-createOrder.719db638.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-evaluate.51fbffc7.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-evaluate.c31b4504.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-expressInfo.2d3276a8.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-order.54f0086d.js → unpackage/dist/build/h5/static/js/pages-order-order.2a64ac11.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-orderDetail.35ce6105.js → unpackage/dist/build/h5/static/js/pages-order-orderDetail.9ddcc958.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-orderRefund.c37dd666.js → unpackage/dist/build/h5/static/js/pages-order-orderRefund.adae9bf2.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-list.87729d4f.js → unpackage/dist/build/h5/static/js/pages-product-list.6599541b.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-product.8ae803ed.js → unpackage/dist/build/h5/static/js/pages-product-product.de21b46f.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-reply.5156d212.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-reply.58f26965.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-search.e7a2bd04.js → unpackage/dist/build/h5/static/js/pages-product-search.e4f86fe7.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-forget.37b35602.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-forget.ae981aaa.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-login.77644cef.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-login.b818aaf5.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-register.6adee3ee.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-register.c7b59c91.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-wxLogin.9a64a908.js → unpackage/dist/build/h5/static/js/pages-public-wxLogin.ee209d42.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-redirect-redirect.55dad419.js → unpackage/dist/build/h5/static/js/pages-redirect-redirect.1ad2fc6d.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-address.0cb61904.js → unpackage/dist/build/h5/static/js/pages-set-address.fc0a8829.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-addressManage.455dee8d.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-addressManage.845104e4.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-user-user.560421a3.js → unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-user-user.bc3c7340.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-user-xzdl.c1b694a1.js → unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-user-xzdl.ec38008b.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-password.bbc55dea.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-password.c7ef1f02.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-phone.6ef914e3.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-phone.d3b8c5f2.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-set.84a7a189.js → unpackage/dist/build/h5/static/js/pages-set-set.9f224d52.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-userinfo.4348cffc.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-userinfo.c4412bbd.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-award.7a4ac13c.js → unpackage/dist/build/h5/static/js/pages-user-award.52f3a820.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-favorites.411cdd0f.js → unpackage/dist/build/h5/static/js/pages-user-favorites.517c0716.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-jf.a36a284e.js → unpackage/dist/build/h5/static/js/pages-user-jf.107ba6f5.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-shareQrCode.9dea9838.js → unpackage/dist/build/h5/static/js/pages-user-shareQrCode.d918c028.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-team.04cdff08.js → unpackage/dist/build/h5/static/js/pages-user-team.d87afe5b.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-user.55fe8481.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-user.6638e5b6.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-withdrawal.deaaefd5.js → unpackage/dist/build/h5/static/js/pages-user-withdrawal.f8a91dd2.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-xzdl.41f5043d.js → unpackage/dist/build/h5/static/js/pages-user-xzdl.bfd5be6f.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-yjzye.9c766636.js → unpackage/dist/build/h5/static/js/pages-user-yjzye.d2893838.js


+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-yjzz.6314e195.js → unpackage/dist/build/h5/static/js/pages-user-yjzz.cd56d5c7.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-yue.6f780f17.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-yue.c12d0ac4.js


Неке датотеке нису приказане због велике количине промена