Merge branch 'dev1.0.0' into develop

3 years ago · bcc8ae98f0
parent 57ae302b4e 89d389c9f2
commit bcc8ae98f0
56 changed files with 102 additions and 81 deletions
--- a/common/plugins/msbUniRequest.js
+++ b/common/plugins/msbUniRequest.js
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-17 16:36:59
 * @LastEditors: ch
- * @LastEditTime: 2022-04-20 11:57:58
+ * @LastEditTime: 2022-04-20 16:07:24
 * @Description: 针对uniapp request请求做了一次封装，使用思维参考axios
 * 
 * 
@ -70,7 +70,6 @@ class MsbUniRequest {
 			return option
 		}
 		return new Promise((resolve, reject)=>{
 			console.log(option);
 			uni.request({
 				...option,
 				success: res => {
--- a/common/utils/requset.js
+++ b/common/utils/requset.js
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-17 17:42:32
 * @LastEditors: ch
- * @LastEditTime: 2022-04-20 15:34:09
+ * @LastEditTime: 2022-04-20 19:49:51
 * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
 */
@ -53,10 +53,15 @@ let repeatFlag = [];
 * @param {*} option 
 */
 const repeatVerify = (option)=>{
-	if(repeatFlag.includes(JSON.stringify(option))){
+	let flag = {
 		url : option.url,
 		method : option.method,
 		data : option.data
 	}
 	if(repeatFlag.includes(JSON.stringify(flag))){
 		return Promise.reject({message:'请勿频繁操作'});
 	}
-	repeatFlag.push(JSON.stringify(option));
+	repeatFlag.push(JSON.stringify(flag));
 	return false;
 };
 /**
@ -64,9 +69,16 @@ const repeatVerify = (option)=>{
 * @param {*} option 
 */
 const clearRepeat = (option) =>{
 	console.log(repeatFlag)
 	repeatFlag = repeatFlag.filter( i => {
-		return i !== JSON.stringify(option)
+		return i !== JSON.stringify({
 			url : option.url,
 			method : option.method,
 			data : option.data
 		})
 	});
 	console.log(repeatFlag)
 }
 // 不需要token的接口封装
@ -74,7 +86,6 @@ const MsbRequest = new MsbUniRequest();
 MsbRequest.baseUrl = BASE_URL[ENV];
 MsbRequest.use('request', (option) => {
 	console.log('option',option);
 	if(option.header.repeat){
 		// 如果当前请求不允许重复调用，则检查重复请求，当前接口有正在请求则不发起请求
 		const isRepeatVerify = repeatVerify(option);
--- a/h5/index.html
+++ b/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=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.5a23b417.js></script></body></html>
+            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=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.fe63b50a.js></script></body></html>
--- a/h5/static/img/bz.72a9717e.png
+++ b/h5/static/img/bz.72a9717e.png
--- a/h5/static/img/logo.c66e030d.png
+++ b/h5/static/img/logo.c66e030d.png
--- a/h5/static/index/arrow.png
+++ b/h5/static/index/arrow.png
--- a/h5/static/index/banner.jpg
+++ b/h5/static/index/banner.jpg
--- a/h5/static/index/banner.png
+++ b/h5/static/index/banner.png
--- a/h5/static/index/bz.png
+++ b/h5/static/index/bz.png
--- a/h5/static/index/logo.png
+++ b/h5/static/index/logo.png
--- a/h5/static/index/logo1.png
+++ b/h5/static/index/logo1.png
--- a/h5/static/index/msg.png
+++ b/h5/static/index/msg.png
--- a/h5/static/index/search.png
+++ b/h5/static/index/search.png
--- a/h5/static/js/index.fe63b50a.js
+++ b/h5/static/js/index.fe63b50a.js
--- a/h5/static/js/pages-account-address-create.035e7c86.js
+++ b/h5/static/js/pages-account-address-create.035e7c86.js
--- a/h5/static/js/pages-account-address-create.e908ab6b.js
+++ b/h5/static/js/pages-account-address-create.e908ab6b.js
--- a/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.1e148522.js
+++ b/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.1e148522.js
--- a/h5/static/js/pages-account-address-edit.2ff96ff1.js
+++ b/h5/static/js/pages-account-address-edit.2ff96ff1.js
--- a/h5/static/js/pages-account-address-edit.86f536c3.js
+++ b/h5/static/js/pages-account-address-edit.86f536c3.js
--- a/h5/static/js/pages-account-address-list.1428407f.js
+++ b/h5/static/js/pages-account-address-list.1428407f.js
--- a/h5/static/js/pages-account-address-list.c1e5001d.js
+++ b/h5/static/js/pages-account-address-list.c1e5001d.js
--- a/h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.e4d62ae5.js
+++ b/h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.e4d62ae5.js
--- a/h5/static/js/pages-account-index.ab384817.js
+++ b/h5/static/js/pages-account-index.ab384817.js
--- a/h5/static/js/pages-account-setting-setName.b870cae4.js
+++ b/h5/static/js/pages-account-setting-setName.b870cae4.js
--- a/h5/static/js/pages-cart-cart~pages-cart-tabBarCart.4ff861f3.js
+++ b/h5/static/js/pages-cart-cart~pages-cart-tabBarCart.4ff861f3.js
--- a/h5/static/js/pages-cart-cart~pages-cart-tabBarCart.f835c0a7.js
+++ b/h5/static/js/pages-cart-cart~pages-cart-tabBarCart.f835c0a7.js
--- a/h5/static/js/pages-goods-detail-index.4d717eb7.js
+++ b/h5/static/js/pages-goods-detail-index.4d717eb7.js
--- a/h5/static/js/pages-index-index.b04d2088.js
+++ b/h5/static/js/pages-index-index.b04d2088.js
--- a/h5/static/js/pages-index-index.bc17e7f9.js
+++ b/h5/static/js/pages-index-index.bc17e7f9.js
--- a/h5/static/js/pages-login.85542ff2.js
+++ b/h5/static/js/pages-login.85542ff2.js
--- a/h5/static/js/pages-login.eddbaaea.js
+++ b/h5/static/js/pages-login.eddbaaea.js
--- a/h5/static/js/pages-order-detail-index.2a7fe6d3.js
+++ b/h5/static/js/pages-order-detail-index.2a7fe6d3.js
--- a/h5/static/js/pages-order-logisitcsInfo.3c60902f.js
+++ b/h5/static/js/pages-order-logisitcsInfo.3c60902f.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterApply.7d54cfd9.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterApply.7d54cfd9.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterEdit.0ba19d83.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterEdit.0ba19d83.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterEdit.f4c94975.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterEdit.f4c94975.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterSelect.a28aa950.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterSelect.a28aa950.js
--- a/h5/static/js/pages-order-submit.f2621e1d.js
+++ b/h5/static/js/pages-order-submit.f2621e1d.js
--- a/h5/static/js/pages-order-submit.fe8d5369.js
+++ b/h5/static/js/pages-order-submit.fe8d5369.js
--- a/pages.json
+++ b/pages.json
@ -6,6 +6,7 @@
 			"aliasPath" : "/",
 			"style": {
 				"navigationStyle" : "custom",
 				"navigationBarTitleText": "马士兵严选",
 				"backgroundColor" : "#69ADE5"
 			}
 		},
--- a/pages/account/address/create.vue
+++ b/pages/account/address/create.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-22 14:12:18
 * @LastEditors: ch
- * @LastEditTime: 2022-04-20 14:45:43
+ * @LastEditTime: 2022-04-20 19:23:18
 * @Description: file content
 -->
 <template>
@ -10,7 +10,7 @@
 		<view class="form">
 			<UiCell class="form--item" title="收货人" :rightIcon="false">
 				<template slot="value">
-					<input class="form--itemInput" v-model="address.name" placeholder="请输入收货人姓名"/>
+					<input class="form--itemInput" v-model="address.name" :maxlength="10" placeholder="请输入收货人姓名"/>
 				</template>
 			</UiCell>
 			<UiCell class="form--item" title="手机号码" :rightIcon="false">
--- a/pages/account/address/edit.vue
+++ b/pages/account/address/edit.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-22 14:12:18
 * @LastEditors: ch
- * @LastEditTime: 2022-04-20 14:45:36
+ * @LastEditTime: 2022-04-20 19:23:30
 * @Description: file content
 -->
 <template>
@ -10,7 +10,7 @@
 		<view class="form">
 			<UiCell class="form--item" title="收货人" :rightIcon="false">
 				<template slot="value">
-					<input class="form--itemInput" v-model="address.name" placeholder="请输入收货人姓名"/>
+					<input class="form--itemInput" v-model="address.name" :maxlength="10" placeholder="请输入收货人姓名"/>
 				</template>
 			</UiCell>
 			<UiCell class="form--item" title="手机号码" :rightIcon="false">
--- a/pages/cart/components/PageCtx.vue
+++ b/pages/cart/components/PageCtx.vue
@ -23,7 +23,7 @@
 		<!-- 购物车商品列表 -->
 		<view v-else class="cart-list">
 			<view class="cart-item" v-for="(item, index) in list" :key="index" 
-				@click="$Router.push(`goodsDetail?id=${item.id}`)">
+				@click="$Router.push(`/goodsDetail?id=${item.id}`)">
 				<label class="cart-item--radio" @click.stop="handleCheckItem(item.id)">
 					<radio class="radio" color="#FF875B" 
 						:checked="checkedIds.length ? checkedIds.includes(item.id) : false" />
--- a/pages/index/components/Banner.vue
+++ b/pages/index/components/Banner.vue
@ -2,14 +2,12 @@
 * @Author: ch
 * @Date: 2022-03-23 10:31:12
 * @LastEditors: ch
- * @LastEditTime: 2022-04-12 10:09:44
+ * @LastEditTime: 2022-04-20 18:29:40
 * @Description: file content
 -->
 <template>
 	<view class="banner">
-			<u-swiper keyName="img" :list="data" height="240rpx" indicator indicatorMode="dot">
+			<u-swiper bgColor="none" radius="18rpx" keyName="img" :list="data" height="240rpx" indicator indicatorMode="dot"></u-swiper>
 			</u-swiper>
 			<view class="desc">
 				<view class="desc--item">
 					<image class="desc--icon" src='@/static/index/bz.png'></image>
@ -50,53 +48,42 @@ export default {
 .banner{
 	height: 388rpx;
 	position: relative;
-	padding: 40rpx 30rpx 0;
+	padding: 50rpx 30rpx 0;
 	// margin-bottom: 50rpx;
 	overflow: hidden;
 	&::before{
 		display: block;
 		content: '';
 		position: absolute;
 		left: -5vw;
-		top:0;
+		top:-2rpx;
 		height: 231rpx;
 		width: 110vw;
 		background: $color-blue5;
 		border-bottom-left-radius: 100%;
 		border-bottom-right-radius: 100%;
 	}
 	.swiper{
 		background-color: none !important;
 	}
 }
 .desc{
 	display: flex;
 	justify-content: space-between;
-	margin-top: 24rpx;
+	margin-top: 14rpx;
 	padding-right: 10rpx;
 	&--item{
 		display: flex;
 		align-items: center;
 	}
 	&--icon{
-		width: 22rpx;
+		width: 42rpx;
-		height: 24rpx;
+		height: 44rpx;
 		position: relative;
 		margin-right: 11rpx;
 		overflow: initial;
 			// box-shadow: 0 0 5rpx #f00; 
 		&::before{
 			display: block;
 			content: '';
 			position: absolute;
 			width: 10rpx;
 			height: 10rpx;
 			border-radius: 50%;
 			top: 10rpx;
 			left: 7rpx;
 			box-shadow: 0 0 20rpx #FA7204; 
 			background: #FA7204;
 			z-index: -1;
 		}
 	}
 	&--txt{
 		font-size: 22rpx;
 		color: $color-grey5;
 		margin-top: 4rpx;
 	}
 }
 </style>
--- a/pages/index/components/Pick.vue
+++ b/pages/index/components/Pick.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-23 10:29:07
 * @LastEditors: ch
- * @LastEditTime: 2022-04-12 18:54:58
+ * @LastEditTime: 2022-04-20 19:05:54
 * @Description: file content
 -->
 <template>
@ -85,6 +85,7 @@ export default {
 	}
 	.title{
 		margin-top: 20rpx;
 		font-weight: bold;
 	}
 	.desc{
 		color: $color-grey4;
@ -116,6 +117,7 @@ export default {
 	height: 215rpx;
 	background: $color-grey0;
 	border-radius: 8rpx;
 	margin-left: 20rpx;
 	&--info-box{
 		display: flex;
 		justify-content: space-between;
--- a/pages/index/components/Seckill.vue
+++ b/pages/index/components/Seckill.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-23 10:07:48
 * @LastEditors: ch
- * @LastEditTime: 2022-04-13 09:45:18
+ * @LastEditTime: 2022-04-20 18:21:52
 * @Description: file content
 -->
 <template>
@ -18,7 +18,7 @@
 			</view>
 			<view class="seckill-title--more">
 				<text>查看更多</text>
-				<image class="seckill-title--more-icon" src="@/static/common/arrow.png"></image>
+				<image class="seckill-title--more-icon" src="@/static/index/arrow.png"></image>
 			</view>
 		</view>
 		<view class="seckill--group">
@ -114,6 +114,7 @@ export default {
 		align-items: center;
 		&--text{
 			font-size: 36rpx;
 			font-weight: bold;
 		}
 		&--left{
 			display: flex;
@ -173,10 +174,11 @@ export default {
 			margin-right: 8rpx;
 		}
 		&--more{
-			display: inline-block;
+			display: flex;
 			align-items: center;
 			text{
 				font-size: $font-size-sm;
-				color: $color-grey5;
+				color: $color-grey4;
 			}
 		}
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2019-08-22 19:41:20
 * @LastEditors: ch
- * @LastEditTime: 2022-04-14 17:37:40
+ * @LastEditTime: 2022-04-20 19:02:05
 * @Description: file content
 -->
 <template>
@ -13,6 +13,7 @@
 				<text class="search--input">请输入您想搜索的商品名称</text>
 			</view>
 			<view class="msg">
 				<u-badge class="msg--badge" max="99" :value="0"></u-badge>
 				<image class="msg--icon" src="@/static/index/msg.png"></image>
 			</view>
 		</view>
@ -53,9 +54,8 @@ export default {
 		return {
 			scrollTop : 0,
 			bannerList: [
-                    'https://cdn.uviewui.com/uview/swiper/swiper1.png',
+                    'https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/uc/account-avatar/banner.png',
-                    'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+                    'https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/uc/account-avatar/banner.png'
                    'https://cdn.uviewui.com/uview/swiper/swiper3.png',
                ],
 			categoryList : [
 			],
@ -133,23 +133,33 @@ page{
 .logo{
 	width: 265rpx;
 	height: 50rpx;
-	background: url("@/static/index/logo.png");
+	background: url("@/static/index/logo.png") no-repeat;
-	background-size: 265rpx;
+	background-size: 244rpx;
 	&__min{
 		width: 50rpx;
 	}
 }
 .msg{
 	padding-right: 10rpx;
 	position: relative;
 	&--badge{
 		position: absolute;
 		right: 0;
 		top: -14rpx;
 		z-index: 999;
 		border:1px solid $color-grey0
 	}
 	&--icon{
-		width: 32rpx;
+		width: 33rpx;
-		height: 38rpx;
+		height: 42rpx;
 	}
 }
 .search{
-	padding: 0 30rpx;
+	padding: 5rpx 30rpx 0;
 	background: $color-blue5;
 	&__min{
 		width: 548rpx;
 		padding: 0;
 	}
 	&--input{
 		display: flex;
@ -160,13 +170,13 @@ page{
 		color: $color-grey0;
 		border-radius: 8rpx;
 		padding: 0 30rpx;
-		font-size: $font-size-sm;
+		font-size: $font-size-base;
 		&::after{
 			display: block;
 			content: "";
 			width: 34rpx;
-			height: 36rpx;
+			height: 38rpx;
-			background: url("@/static/index/search.png");
+			background: url("@/static/index/search.png") no-repeat;
 			background-size: 100%;
 		}
 	}
@ -179,15 +189,17 @@ page{
 .category{
 	display: flex;
-	padding: 0 20rpx;
+	padding: 0 35rpx;
 	flex-wrap: wrap;
 	justify-content: space-between;
 	&--item{
-		padding: 0 10rpx;
+		width: 130rpx;
 		margin-bottom: 40rpx;
 	}
 	&--image-box{
 		width: 120rpx;
 		height: 120rpx;
 		margin: 0 auto;
 	}
 	&--image{
 		width: 120rpx;
@ -202,6 +214,7 @@ page{
 }
 .title{
 	font-size: 36rpx;
 	font-weight: bold;
 	margin: 60rpx 30rpx 30rpx;
 }
--- a/pages/login.vue
+++ b/pages/login.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-22 15:36:46
 * @LastEditors: ch
- * @LastEditTime: 2022-04-15 18:45:28
+ * @LastEditTime: 2022-04-20 19:36:46
 * @Description: file content
 -->
 <template>
@ -13,7 +13,7 @@
 		<view class="logo">马士兵严选</view>
 		<u--form class="login">
 			<u-form-item>
-				<input placeholder="请输入手机号" v-model="phone" class="login--input" border="bottom" />
+				<input placeholder="请输入手机号" type="number" v-model="phone" class="login--input" border="bottom" />
 			</u-form-item>
 			<u-form-item class="login--code">
 				<input placeholder="验证码" type="number" maxlength="6" class="login--input" v-model="code"  border="bottom" />
@ -26,7 +26,7 @@
 		<UiButton class="login--btn" type="gradual" @click="login">登录</UiButton>
 		<label class="login--agreement">
 			<radio class="radio" :checked="checked" @click="checked = !checked" color="#FF875B"/>
-			同意<text class="link">《用户协议》</text>和<text class="link">《隐私协议》</text>,首次登陆将自动注册
+			同意<text class="link">《用户协议》</text><text class="link">《隐私协议》</text>首次登录自动注册
 		</label>
 	</view>
 </template>
@ -42,7 +42,8 @@ export default {
 			sendStatus : false,
 			checked: false,
 			phone : '',
-			code : ''
+			code : '',
 			loginStatus : false
 		}
 	},
 	mounted(){
@ -74,6 +75,10 @@ export default {
 		},
 		async login(){
 			if(this.loginStatus){
 				return false;
 			}
 			this.loginStatus = true;
 			if(!IsPhone(this.phone)){
 				uni.$u.toast('请输入正确手机号');
 				return false;
@ -108,7 +113,8 @@ export default {
 			const len = pages.length;
 			const prevPage = pages[len - 2];
 			const tabBar = ['pages/index/index','pages/goods/category'];
-			console.log(prevPage);
+
 			this.loginStatus = false;
 			if(len > 1){
 				// 不知道为什么有时候页面返回会有问题，初步判断tabBar页面的问题，tabBar来的直接重定向过去，不返回
 				if(tabBar.includes(prevPage.route)){
--- a/static/index/arrow.png
+++ b/static/index/arrow.png
--- a/static/index/banner.jpg
+++ b/static/index/banner.jpg
--- a/static/index/banner.png
+++ b/static/index/banner.png
--- a/static/index/bz.png
+++ b/static/index/bz.png
--- a/static/index/logo.png
+++ b/static/index/logo.png
--- a/static/index/logo1.png
+++ b/static/index/logo1.png
--- a/static/index/msg.png
+++ b/static/index/msg.png
--- a/static/index/search.png
+++ b/static/index/search.png
`@ -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)'))`	`<!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=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.5a23b417.js></script></body></html>`	`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=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.fe63b50a.js></script></body></html>`