From 080091ffeaa526d273fbdb22cb0436cd3395dcb4 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Fri, 29 Apr 2022 00:28:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=A7=E5=93=81=E6=8F=90?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98=E5=92=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/utils/requset.js                       |   4 +-
 pages/account/address/list.vue                |   7 +-
 pages/cart/components/PageCtx.vue             |  11 +-
 .../goods/detail/components/SkuPopup copy.vue | 368 ----------
 pages/goods/detail/components/SkuPopup.vue    |   5 +-
 .../detail/components/SkuPopup_copy2.vue      | 668 ------------------
 pages/index/components/Banner.vue             |   4 +-
 pages/index/index.vue                         |   3 +-
 pages/login.vue                               |   5 +-
 9 files changed, 23 insertions(+), 1052 deletions(-)
 delete mode 100644 pages/goods/detail/components/SkuPopup copy.vue
 delete mode 100644 pages/goods/detail/components/SkuPopup_copy2.vue

diff --git a/common/utils/requset.js b/common/utils/requset.js
index 4e6fb3d..aade08c 100644
--- a/common/utils/requset.js
+++ b/common/utils/requset.js
@@ -2,14 +2,14 @@
  * @Author: ch
  * @Date: 2022-03-17 17:42:32
  * @LastEditors: ch
- * @LastEditTime: 2022-04-28 17:04:33
+ * @LastEditTime: 2022-04-29 00:08:56
  * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
  */
 
 import MsbUniRequest from '@/common/plugins/msbUniRequest';
 import $store from '@/common/store';
 
-const ENV = 'prod';
+const ENV = 'test';
 const BASE_URL = {
 	'test' : 'https://k8s-horse-gateway.mashibing.cn',
 	'dev' : '',
diff --git a/pages/account/address/list.vue b/pages/account/address/list.vue
index 046cfad..5d04fe2 100644
--- a/pages/account/address/list.vue
+++ b/pages/account/address/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 13:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-22 21:23:54
+ * @LastEditTime: 2022-04-29 00:26:44
  * @Description: file content
 -->
 <template>
@@ -70,7 +70,7 @@ export default {
 	},
 	methods: {
 		async getAddressList(){
-				this.isLoading = true;
+			this.isLoading = true;
 			const {error, result} = await ApiGetAddress();
 			this.isLoading = false;
 			if(error){
@@ -78,6 +78,9 @@ export default {
 				return false;
 			}
 			this.addresList = result;
+			if(!result.length){
+				this.$Router.replace(`/addressCreate?first=${!result.length}`)
+			}
 			this.$store.commit('SET_ADDRESS', result);
 			if(this.query.source === 'submitOrder'){
 				// 每次刷新列表都做一次提交订单页的选中地址更新
diff --git a/pages/cart/components/PageCtx.vue b/pages/cart/components/PageCtx.vue
index 1b539bd..a7dd6bb 100644
--- a/pages/cart/components/PageCtx.vue
+++ b/pages/cart/components/PageCtx.vue
@@ -50,7 +50,7 @@
 		
 		<template v-if="!isLoading">
 			<view class="title">为您推荐</view>
-			<!-- <BsChoiceGoods></BsChoiceGoods> -->
+			<BsChoiceGoods></BsChoiceGoods>
 		</template>
 
 		<!-- 底部操作栏 -->
@@ -60,13 +60,13 @@
 					:checked="checkedIds.length > 0 && checkedIds.length === list.length" />
 				<text>全选</text>
 			</label>
-			<view class="total-info">
+			<view class="total-info" v-if="mode == 'normal'">
 				<text>合计：</text>
 				<UiMoney class="goods-price" :money="totalPrice" prefix/>
 			</view>
 			<view class="cart-action">
-				<UiButton v-if="mode == 'edit'" size="max" :disable="!checkedIds.length" @click="handleDelete">删除</UiButton>
-				<UiButton v-else type="gradual" size="max" :disable="!checkedIds.length" @click="handleOrder">去结算({{list.length}})</UiButton>
+				<UiButton v-if="mode == 'edit'" size="max" :disable="!checkedIds.length" @click="handleDelete">删除({{checkedIds.length}})</UiButton>
+				<UiButton v-else type="gradual" size="max" :disable="!checkedIds.length" @click="handleOrder">去结算({{checkedIds.length}})</UiButton>
 			</view>
 		</view>
 	</view>
@@ -450,7 +450,8 @@ export default {
 
 // 底部操作栏
 .footer {
-    display: flex;
+	display: flex;
+	justify-content: space-between;
     align-items: center;
     height: 140rpx;
     background: $color-grey0;
diff --git a/pages/goods/detail/components/SkuPopup copy.vue b/pages/goods/detail/components/SkuPopup copy.vue
deleted file mode 100644
index 4680323..0000000
--- a/pages/goods/detail/components/SkuPopup copy.vue	
+++ /dev/null
@@ -1,368 +0,0 @@
-<!--
- * @Author: ch
- * @Date: 2022-03-24 11:30:55
- * @LastEditors: ch
- * @LastEditTime: 2022-04-24 20:56:47
- * @Description: file content
--->
-<template>
-	<u-popup :show="visible" round="24rpx" closeable @close="close">
-		<view class="sku-popup">
-			<view class="product-info">
-				<image class="product-info--img" src="https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/test/1.png"/>
-				<view>
-					<view class="product-info--price">￥{{curSku.sellPrice}}</view>
-					<view class="product-info--sku">{{curSku.name}}</view>
-					<view>库存：{{curSku.stock}}</view>
-				</view>
-			</view>
-			<view class="attr-group" v-for="(item, index) in attributeGroupList" :key="item.id">
-				<text class="attr-name">{{item.name}}</text>
-				<view class="attr-items">
-					<text class="attr-item" :class="{'attr-item__active' : i.active, 'attr-item__disabled' : i.disabled}"
-						v-for="i in item.attributes" :key="i.symbol"
-						@click="handleAttrItem(i, index)"
-					>{{i.name}}</text>
-				</view>
-			</view>
-			<view class="sku-num">
-				<view class="sku-num--single-box">
-					<template>
-						<text>数量</text>
-						<!-- <text class="sku-num--single">{{maxBuyNum}}</text> -->
-					</template>
-				</view>
-				<u-number-box :min="1" :max="maxBuyNum" button-size="40rpx" bgColor="#F5F6FA" 
-					v-model="curBuyNum" >
-					<text slot="minus" class="cart-item--stepper-icon">-</text>
-					<text slot="plus" class="cart-item--stepper-icon">+</text>
-				</u-number-box>
-			</view>
-			<view class="footer">
-				<view class="btn-bg" v-if="mode == 1">
-					<UiButton class="btn" @click="addCart" size="max" :disable="curSku.stock == 0">加入购物车</UiButton>
-					<UiButton class="btn btn__buy" @click="buyNow" size="max" :disable="curSku.stock == 0">立即购买</UiButton>
-				</view>
-				<UiButton v-else class="btn__confirm" type="gradual" size="max" @click="confirm">确认</UiButton>
-			</view>
-		</view>
-		
-	</u-popup>
-</template>
-
-<script>
-import UiButton from '@/components/UiButton.vue';
-import {ApiPutAddCart} from '@/common/api/cart';
-
-export default {
-	components: { UiButton },
-	props: {
-		// true 组件显示 false 组件隐藏
-		visible : {
-			type : Boolean,
-			default : false
-		},
-		// 模式 1:都显示 2:只显示购物车 3:只显示立即购买
-		mode: {
-			type: Number,
-			default: 1,
-		},
-		// 商品详情信息
-		goodsInfo: {
-			type: Object,
-			default: {},
-		},
-		// 商品sku信息
-		skuInfo : {
-			type : Array,
-			default : []
-		},
-		// 活动状态
-		activityStatus : {
-			type : String,
-			default : 'noActivity'
-		}
-	},
-	data() {
-		return {
-			// 属性组数据，因为会修改数据，不能直接操作props中传入的数据
-			attributeGroupList : [],
-			// 数量
-			curBuyNum : 1,
-		};
-	},
-	watch : {
-		goodsInfo(newData){
-			if(newData.attributeGroupList){
-				this.attributeGroupList = newData.attributeGroupList;
-				// 请求数据返回后设置默认选中规格
-				if(this.skuInfo.length){
-					this.setDefaultAttr();
-				}
-			} 
-		},
-		skuInfo(newData){
-			// 请求数据返回后设置默认选中规格
-			if(newData.length){
-				this.setDefaultAttr();
-			}
-		}
-	},
-	computed : {
-		/**
-		 * 当前选中SKU，根据选中规格计算
-		 */
-		curSku(){
-			// const skuSymbolList = this.attributeGroupList.map(item => {
-			// 	const activeAttr = item.attributes.find(i => i.active);
-			// 	return activeAttr ? activeAttr.symbol : ''
-			// }).filter(i => i).sort();
-			return this.skuInfo.find(i => i.attributeSymbolList === this.selectedSymbol.join(',')) || {};
-		},
-		selectedSymbol(){
-			return this.attributeGroupList.map(item => {
-				const activeAttr = item.attributes.find(i => i.active);
-				return activeAttr ? activeAttr.symbol : ''
-			}).filter(i => i).sort();
-		},
-		/**
-		 * 最大可购买数量
-		 * 1、有限购则对比限购跟库存，取最小值
-		 * 2、没限购取库存
-		 */
-		maxBuyNum(){
-			const singleBuyLimit = this.goodsInfo.singleBuyLimit;
-			const stock = this.curSku.stock;
-			return singleBuyLimit ? Math.min(singleBuyLimit, stock || 1) : stock;
-		}
-	},
-	methods: {
-		/**
-		 * 设置默认选中规格
-		 */
-		setDefaultAttr(){
-			const curSku = this.skuInfo.find(i => i.stock > 0);
-			if(!curSku){
-				return false
-			}
-			// this.attributeGroupList.forEach((item, index) => {
-			// 	for(let i of item.attributes){
-			// 		if(curSku.attributeSymbolList.includes(i.symbol)){
-			// 			this.$set(i,'active', true);
-			// 			this.setDisabledItem(i, index, true);
-			// 			break;
-			// 		}
-			// 	}
-			// });
-			
-			
-			// this.$emit('input',this.curSku);
-		},
-		/**
-		 * 点击属性项，设置选中和禁用项
-		 */
-		handleAttrItem(item, groupIndex){
-			// 禁用选项
-			if(item.disabled){
-				return false;
-			}
-			// 每次重选规格，购买数量都置为1
-			this.curBuyNum = 1;
-
-			// 把当前选项组的装先置为未选状态
-			this.attributeGroupList[groupIndex].attributes.forEach(item =>{
-				this.$set(item,'active', false);
-			});
-			// 设置当前点击选项选中
-			this.$set(item,'active', true);
-			this.setDisabledItem(item, groupIndex);
-			
-		},
-		setDisabledItem(item, groupIndex){
-			// 找到有效SKU的symbol   有效定义：包含当前已选选项组合（不能包含最后一项）,且库存大于0的所有SKU；
-			const symbolCombination = this.selectedSymbol.filter((item, idx) => idx < this.attributeGroupList.length -1 );
-	console.log(symbolCombination);
-			const symbols = this.skuInfo.filter(i => i.attributeSymbolList.includes(symbolCombination.join(',')) && i.stock > 0)
-				.map(i => i.attributeSymbolList).join(',');
-				console.log(item.symbol, this.skuInfo.map(i => i.attributeSymbolList) , symbols);
-			console.log(this.selectedSymbol);
-			this.attributeGroupList.forEach((group, index) => {
-				if(groupIndex === index){
-					return false;
-				}
-				// 遍历其他选项组的所有属性项，对比是否在有效SKU的symbos中，在则启用，不再则禁用
-				group.attributes.forEach(item =>{
-					console.log(symbols,item.symbol)
-					if(!symbols.includes(item.symbol)){
-						this.$set(item,'disabled', true);
-					}else{
-						this.$set(item,'disabled', false);
-						
-					}
-				})
-			})
-		},
-		/**
-		 * 加入购物车
-		 */
-		async addCart(){
-			if(!this.curSku.skuId){
-				uni.$u.toast('请选择规格~');
-				return false;
-			}
-			const {error, result} = await ApiPutAddCart({
-				productSkuId : this.curSku.skuId,
-				productId : this.goodsInfo.id,
-				number : this.curBuyNum
-			});
-			if(error){
-				uni.$u.toast(error.message);
-				return false;
-			}
-			uni.$u.toast('加入购物车成功~');
-			this.close();
-			// this.$Router.push('/cart');
-		},
-		/**
-		 * 立即购买
-		 */
-		buyNow(){
-			if(!this.curSku.skuId){
-				uni.$u.toast('请选择规格~');
-				return false;
-			}
-			let query = {
-				mode : 'buyNow',
-				skuId : this.curSku.skuId,
-				num : this.curBuyNum,
-				activityType : 1
-			}
-			const {productActivityVO} = this.goodsInfo;
-			if(this.activityStatus === 'startActivity'){
-				query.activityType = 2;
-				query.activityId = productActivityVO.activityId;
-				query.activityTimeId = productActivityVO.activityTimeId;
-			}
-			this.$Router.push({
-				path : '/orderSubmit',
-				query
-			})
-		},
-		confirm(){
-			if(this.mode == 2){
-				this.addCart();
-			}
-			if(this.mode == 3){
-				this.buyNow();
-			}
-		},
-		close(){
-			this.$emit('update:visible', false);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.sku-popup{
-	padding: 30rpx;
-}
-.product-info{
-	display: flex;
-	font-size: $font-size-base;
-	color: $color-grey4;
-	line-height: 42rpx;
-	&--img{
-		width: 200rpx;
-		height: 200rpx;
-		margin-right: 40rpx;
-	}
-	&--price{
-		font-size: 40rpx;
-		color: $color-yellow4;
-		line-height: 48rpx;
-		margin-bottom: 20rpx;
-	}
-}
-.attr-group{
-	margin-top: 40rpx;
-	font-size: 30rpx;
-}
-.attr-items{
-	display: flex;
-	flex-wrap: wrap;
-	padding: 10rpx 0;
-}
-.attr-item{
-	background: $color-grey1;
-	line-height: 70rpx;
-	border-radius: 100rpx;
-	border: 1px solid $color-grey1;
-	color: $color-grey5;
-	display: block;
-	min-width: 158rpx;
-	max-width: 630rpx;
-	text-align: center;
-	margin: 20rpx 28rpx 0 0;
-	padding: 0 20rpx;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	&__active{
-		background: #FFF3EE;
-		border-color: $color-yellow4;
-		color: $color-yellow3;
-	}
-	&__disabled{
-		color: $color-grey3;
-	}
-}
-.sku-num{
-	display: flex;
-	justify-content: space-between;
-	margin: 40rpx 0;
-	line-height: 40rpx;
-	&--single-box{
-		display: flex;
-		align-items: center;
-	}
-	&--single{
-		color: $color-grey4;
-		margin-left: 10rpx;
-		font-size: $font-size-base;
-		display: block;
-		height: 30rpx;
-	}
-}
-.footer{
-	display: flex;
-	justify-content: space-between;
-	.btn-bg{
-		background: #FFE6D9;
-		border-radius: 50rpx;
-		height: 80rpx;
-	}
-	.btn{
-		border: 0;
-		padding: 0;
-		border-radius: 0;
-		width: 340rpx;
-		font-size: $font-size-base;
-		color: $color-yellow3;
-		&::after{
-			border: 0;
-		}
-		&__buy{
-			width: 350rpx;
-			background: url('@/static/goods/buy_max.png');
-			background-size: 350rpx;
-			color: $color-grey0;
-		}
-	}
-
-	.btn__confirm{
-		margin: 0;
-		width: 670rpx;
-	}
-}
-</style>
diff --git a/pages/goods/detail/components/SkuPopup.vue b/pages/goods/detail/components/SkuPopup.vue
index e57470e..613523d 100644
--- a/pages/goods/detail/components/SkuPopup.vue
+++ b/pages/goods/detail/components/SkuPopup.vue
@@ -2,14 +2,15 @@
  * @Author: ch
  * @Date: 2022-03-24 11:30:55
  * @LastEditors: ch
- * @LastEditTime: 2022-04-25 14:16:35
+ * @LastEditTime: 2022-04-29 00:13:38
  * @Description: file content
 -->
 <template>
 	<u-popup :show="visible" round="24rpx" closeable @close="close">
 		<view class="sku-popup">
 			<view class="product-info">
-				<image class="product-info--img" src="https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/test/1.png"/>
+				<!-- <image class="product-info--img" src="https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/test/1.png"/> -->
+				<image class="product-info--img" :src="goodsInfo.pictureList[0]"/>
 				<view>
 					<view v-if="curSku.sellPrice" class="product-info--price">￥{{curSku.sellPrice}}</view>
 					<view v-else class="product-info--price">
diff --git a/pages/goods/detail/components/SkuPopup_copy2.vue b/pages/goods/detail/components/SkuPopup_copy2.vue
deleted file mode 100644
index 3130631..0000000
--- a/pages/goods/detail/components/SkuPopup_copy2.vue
+++ /dev/null
@@ -1,668 +0,0 @@
-<!--
- * @Author: ch
- * @Date: 2022-03-24 11:30:55
- * @LastEditors: ch
- * @LastEditTime: 2022-04-24 21:13:30
- * @Description: file content
--->
-<template>
-	<u-popup :show="visible" round="24rpx" closeable @close="close">
-		<div class="content fix-header fix-bottom">
-      <!--      弹出层 选择商品规格-->
-      <div class="mask">
-        <div class="mask-content">
-          <div class="mask-title">
-            <div class="mask-close iconfont-shop icon-close"></div>
-            选择规格参数
-          </div>
-          <div class="spec-items">
-            <div class="spec-menu-item js-spec-menu" v-for="(item, index) in goodsTypeList" :key="item.id">
-              <div class="spec-note">{{item.name}}</div>
-              <div class="spec-choices">
-                <span v-for="(el, i) in item.propertyList"
-                      :key="el.id"
-                      :class="{'active' : el.selected, 'disabled': el.disabled}"
-                      @click="handleClickSpecs1(item.id, el.id, el, index, i)"
-                >{{el.name}}</span>
-              </div>
-            </div>
-            <div class="spec-menu-item">
-              <div class="spec-note">数量</div>
-              <div class="spec-num">
-                <span class="minus">-</span>
-                <input type="number" v-model="buyNumber" maxlength="3"/>
-                <span class="add">+</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-		
-	</u-popup>
-</template>
-
-<script>
-import UiButton from '@/components/UiButton.vue';
-import {ApiPutAddCart} from '@/common/api/cart';
-let orgdata = {
-    "skus": [
-      {
-        "id": "f5eee18b8d5b4fc2b46a56e92abdb525",
-        "stockAmmount": 7,
-        "isPaymentAccpoints": 1,
-        "isPaymentCurrency": 0,
-        "isPaymentMixed": 0,
-        "priceAccpoints": 1,
-        "priceCurrency": 0,
-        "mixedPriceAccpoints": 0,
-        "mixedPriceCurrency": 0,
-        "rebate": 100,
-        "skusTypes": [
-          {
-            "id": "74fe546803e44a7c95bebfe56a29952d",
-            "typeId": "21967fba6b574b479974e50720ad25fe",
-            "typeName": "测试类别",
-            "type": 2,
-            "propertyId": "f40c3884e5e9422c973d31631a65ae64",
-            "propertyName": "小",
-            "property": 1
-          },
-          {
-            "id": "78f98ee53ae549ceb2c18629152ff849",
-            "typeId": "fe7f49a798794670be622e6b9d2f386a",
-            "typeName": "tester",
-            "type": 3,
-            "propertyId": "02808ac287e8410f936a90167d82ee2b",
-            "propertyName": "two",
-            "property": 2
-          },
-          {
-            "id": "91cefe600f40498bb5013deebb9c27be",
-            "typeId": "547f76222d4d4f92a49de2e0bf6bd7ef",
-            "typeName": "颜色",
-            "type": 1,
-            "propertyId": "c80cbe4c6cbf49f5b2822331768cd422",
-            "propertyName": "绿色",
-            "property": 2
-          }
-        ]
-      },
-      {
-        "id": "383feb7947f14ce5b832bc8700e65c9e",
-        "stockAmmount": 2,
-        "isPaymentAccpoints": 1,
-        "isPaymentCurrency": 0,
-        "isPaymentMixed": 0,
-        "priceAccpoints": 1,
-        "priceCurrency": 0,
-        "mixedPriceAccpoints": 0,
-        "mixedPriceCurrency": 0,
-        "rebate": 100,
-        "skusTypes": [
-          {
-            "id": "1beed60c2eb244f89ad82806d343d468",
-            "typeId": "fe7f49a798794670be622e6b9d2f386a",
-            "typeName": "tester",
-            "type": 3,
-            "propertyId": "02808ac287e8410f936a90167d82ee2b",
-            "propertyName": "two",
-            "property": 2
-          },
-          {
-            "id": "357fd7db1f5244e5b64f48a34bb581fa",
-            "typeId": "21967fba6b574b479974e50720ad25fe",
-            "typeName": "测试类别",
-            "type": 2,
-            "propertyId": "edac997ed2c54e41b1f3076fbd6e19f9",
-            "propertyName": "中",
-            "property": 2
-          },
-          {
-            "id": "5c29a251e55a4b678fc4f8287cc560b5",
-            "typeId": "547f76222d4d4f92a49de2e0bf6bd7ef",
-            "typeName": "颜色",
-            "type": 1,
-            "propertyId": "c80cbe4c6cbf49f5b2822331768cd422",
-            "propertyName": "绿色",
-            "property": 2
-          }
-        ]
-      },
-      {
-        "id": "905b10e1740e4be992d14cfc23a887a2",
-        "stockAmmount": 4,
-        "isPaymentAccpoints": 1,
-        "isPaymentCurrency": 0,
-        "isPaymentMixed": 0,
-        "priceAccpoints": 1,
-        "priceCurrency": 0,
-        "mixedPriceAccpoints": 0,
-        "mixedPriceCurrency": 0,
-        "rebate": 100,
-        "skusTypes": [
-          {
-            "id": "0a5f93d9ef1c486ba369dcb1fbd3aed9",
-            "typeId": "fe7f49a798794670be622e6b9d2f386a",
-            "typeName": "tester",
-            "type": 3,
-            "propertyId": "c76dc797eaae4d8eb360de8811a9ec7a",
-            "propertyName": "one",
-            "property": 1
-          },
-          {
-            "id": "d920730c34644218b3d0bbc5fca5edf4",
-            "typeId": "21967fba6b574b479974e50720ad25fe",
-            "typeName": "测试类别",
-            "type": 2,
-            "propertyId": "f40c3884e5e9422c973d31631a65ae64",
-            "propertyName": "小",
-            "property": 1
-          },
-          {
-            "id": "2afbe8a77d034de0a1655f9ad1a25b95",
-            "typeId": "547f76222d4d4f92a49de2e0bf6bd7ef",
-            "typeName": "颜色",
-            "type": 1,
-            "propertyId": "c80cbe4c6cbf49f5b2822331768cd422",
-            "propertyName": "绿色",
-            "property": 2
-          }
-        ]
-      },
-      {
-        "id": "a440b0084e564d3e9d7c8b445bb7645e",
-        "stockAmmount": 10,
-        "isPaymentAccpoints": 1,
-        "isPaymentCurrency": 0,
-        "isPaymentMixed": 0,
-        "priceAccpoints": 1,
-        "priceCurrency": 0,
-        "mixedPriceAccpoints": 0,
-        "mixedPriceCurrency": 0,
-        "rebate": 100,
-        "skusTypes": [
-          {
-            "id": "12a4715b6730438888e88f302871245a",
-            "typeId": "21967fba6b574b479974e50720ad25fe",
-            "typeName": "测试类别",
-            "type": 2,
-            "propertyId": "f40c3884e5e9422c973d31631a65ae64",
-            "propertyName": "小",
-            "property": 1
-          },
-          {
-            "id": "9063e1f1586f4a74b2f614039e8743c4",
-            "typeId": "547f76222d4d4f92a49de2e0bf6bd7ef",
-            "typeName": "颜色",
-            "type": 1,
-            "propertyId": "c80cbe4c6cbf49f5b2822331768cd422",
-            "propertyName": "绿色",
-            "property": 2
-          },
-          {
-            "id": "ae38b9cf56d5408a809d6fbd1b902ee5",
-            "typeId": "fe7f49a798794670be622e6b9d2f386a",
-            "typeName": "tester",
-            "type": 3,
-            "propertyId": "d5660085ff8743d999f6ed3a497ec8b7",
-            "propertyName": "three",
-            "property": 3
-          }
-        ]
-      },
-      {
-        "id": "9961364cc3494823aaf7699733393335",
-        "stockAmmount": 15,
-        "isPaymentAccpoints": 1,
-        "isPaymentCurrency": 0,
-        "isPaymentMixed": 0,
-        "priceAccpoints": 1,
-        "priceCurrency": 0,
-        "mixedPriceAccpoints": 0,
-        "mixedPriceCurrency": 0,
-        "rebate": 100,
-        "skusTypes": [
-          {
-            "id": "3335920f79914cfb8a39ae22b0802bc0",
-            "typeId": "fe7f49a798794670be622e6b9d2f386a",
-            "typeName": "tester",
-            "type": 3,
-            "propertyId": "c76dc797eaae4d8eb360de8811a9ec7a",
-            "propertyName": "one",
-            "property": 1
-          },
-          {
-            "id": "34950de7059d4fffac485abb59a79381",
-            "typeId": "21967fba6b574b479974e50720ad25fe",
-            "typeName": "测试类别",
-            "type": 2,
-            "propertyId": "edac997ed2c54e41b1f3076fbd6e19f9",
-            "propertyName": "中",
-            "property": 2
-          },
-          {
-            "id": "a82ff8d74d3d4a1ea454e4870cc68b64",
-            "typeId": "547f76222d4d4f92a49de2e0bf6bd7ef",
-            "typeName": "颜色",
-            "type": 1,
-            "propertyId": "c80cbe4c6cbf49f5b2822331768cd422",
-            "propertyName": "绿色",
-            "property": 2
-          }
-        ]
-      },
-      {
-        "id": "bd3aeb3c7c854a80b88e7f82a5a78a1e",
-        "stockAmmount": 8,
-        "isPaymentAccpoints": 1,
-        "isPaymentCurrency": 0,
-        "isPaymentMixed": 0,
-        "priceAccpoints": 1,
-        "priceCurrency": 0,
-        "mixedPriceAccpoints": 0,
-        "mixedPriceCurrency": 0,
-        "rebate": 100,
-        "skusTypes": [
-          {
-            "id": "4fc8e61aa192463085578de92974b18b",
-            "typeId": "21967fba6b574b479974e50720ad25fe",
-            "typeName": "测试类别",
-            "type": 2,
-            "propertyId": "edac997ed2c54e41b1f3076fbd6e19f9",
-            "propertyName": "中",
-            "property": 2
-          },
-          {
-            "id": "884f32b64a4b478bb01f93b40dfeb6fc",
-            "typeId": "547f76222d4d4f92a49de2e0bf6bd7ef",
-            "typeName": "颜色",
-            "type": 1,
-            "propertyId": "c80cbe4c6cbf49f5b2822331768cd422",
-            "propertyName": "绿色",
-            "property": 2
-          },
-          {
-            "id": "f66109eccd934529a18026376fccfa7b",
-            "typeId": "fe7f49a798794670be622e6b9d2f386a",
-            "typeName": "tester",
-            "type": 3,
-            "propertyId": "d5660085ff8743d999f6ed3a497ec8b7",
-            "propertyName": "three",
-            "property": 3
-          }
-        ]
-      },
-      {
-        "id": "5e094973bbaf41ce81b7b626174b0bbf",
-        "stockAmmount": 8,
-        "isPaymentAccpoints": 1,
-        "isPaymentCurrency": 0,
-        "isPaymentMixed": 0,
-        "priceAccpoints": 1,
-        "priceCurrency": 0,
-        "mixedPriceAccpoints": 0,
-        "mixedPriceCurrency": 0,
-        "rebate": 100,
-        "skusTypes": [
-          {
-            "id": "23d688678aaa42eebd3c04cceaa61bac",
-            "typeId": "547f76222d4d4f92a49de2e0bf6bd7ef",
-            "typeName": "颜色",
-            "type": 1,
-            "propertyId": "8ed34030c93c4dc29e43edb95e6cfca2",
-            "propertyName": "橙色",
-            "property": 1
-          },
-          {
-            "id": "55649f0753464921b68b0017ce0010d7",
-            "typeId": "21967fba6b574b479974e50720ad25fe",
-            "typeName": "测试类别",
-            "type": 2,
-            "propertyId": "408fb530344a4a41b33932431638dcbb",
-            "propertyName": "大",
-            "property": 3
-          },
-          {
-            "id": "d7248b12b7e847ca9be024ed3bb6d101",
-            "typeId": "fe7f49a798794670be622e6b9d2f386a",
-            "typeName": "tester",
-            "type": 3,
-            "propertyId": "d5660085ff8743d999f6ed3a497ec8b7",
-            "propertyName": "three",
-            "property": 3
-          }
-        ]
-      },
-      {
-        "id": "60ce0a1f99e940dc82d041d36681111b",
-        "stockAmmount": 9,
-        "isPaymentAccpoints": 1,
-        "isPaymentCurrency": 0,
-        "isPaymentMixed": 0,
-        "priceAccpoints": 1,
-        "priceCurrency": 0,
-        "mixedPriceAccpoints": 0,
-        "mixedPriceCurrency": 0,
-        "rebate": 100,
-        "skusTypes": [
-          {
-            "id": "91faddf91e944cabadbda5c342430139",
-            "typeId": "547f76222d4d4f92a49de2e0bf6bd7ef",
-            "typeName": "颜色",
-            "type": 1,
-            "propertyId": "c80cbe4c6cbf49f5b2822331768cd422",
-            "propertyName": "绿色",
-            "property": 2
-          },
-          {
-            "id": "207698d97e4247bb9747843d16e25750",
-            "typeId": "21967fba6b574b479974e50720ad25fe",
-            "typeName": "测试类别",
-            "type": 2,
-            "propertyId": "408fb530344a4a41b33932431638dcbb",
-            "propertyName": "大",
-            "property": 3
-          },
-          {
-            "id": "3c69d3c73aa24cccbacaf805d71117fd",
-            "typeId": "fe7f49a798794670be622e6b9d2f386a",
-            "typeName": "tester",
-            "type": 3,
-            "propertyId": "d5660085ff8743d999f6ed3a497ec8b7",
-            "propertyName": "three",
-            "property": 3
-          }
-        ]
-      },
-      {
-        "id": "f3c805d1959d413a86679955ae047ec5",
-        "stockAmmount": 10,
-        "isPaymentAccpoints": 1,
-        "isPaymentCurrency": 0,
-        "isPaymentMixed": 0,
-        "priceAccpoints": 1,
-        "priceCurrency": 0,
-        "mixedPriceAccpoints": 0,
-        "mixedPriceCurrency": 0,
-        "rebate": 100,
-        "skusTypes": [
-          {
-            "id": "00113d4b6046411cb8ff935b2743904b",
-            "typeId": "fe7f49a798794670be622e6b9d2f386a",
-            "typeName": "tester",
-            "type": 3,
-            "propertyId": "02808ac287e8410f936a90167d82ee2b",
-            "propertyName": "two",
-            "property": 2
-          },
-          {
-            "id": "c13d8a4c7a18477fbe7027044d0393a0",
-            "typeId": "547f76222d4d4f92a49de2e0bf6bd7ef",
-            "typeName": "颜色",
-            "type": 1,
-            "propertyId": "c80cbe4c6cbf49f5b2822331768cd422",
-            "propertyName": "绿色",
-            "property": 2
-          },
-          {
-            "id": "653d0e243bab45eaa5c83dc8206ee33e",
-            "typeId": "21967fba6b574b479974e50720ad25fe",
-            "typeName": "测试类别",
-            "type": 2,
-            "propertyId": "408fb530344a4a41b33932431638dcbb",
-            "propertyName": "大",
-            "property": 3
-          }
-        ]
-      }
-    ]
-  };
-  let goodType = [
-    {
-      "id": "547f76222d4d4f92a49de2e0bf6bd7ef",
-      "type": 1,
-      "name": "颜色",
-      "propertyList": [
-        {
-          "id": "8ed34030c93c4dc29e43edb95e6cfca2",
-          "property": 1,
-          "name": "橙色"
-        },
-        {
-          "id": "c80cbe4c6cbf49f5b2822331768cd422",
-          "property": 2,
-          "name": "绿色"
-        }
-      ]
-    },
-    {
-      "id": "21967fba6b574b479974e50720ad25fe",
-      "type": 2,
-      "name": "测试类别",
-      "propertyList": [
-        {
-          "id": "f40c3884e5e9422c973d31631a65ae64",
-          "property": 1,
-          "name": "小"
-        },
-        {
-          "id": "edac997ed2c54e41b1f3076fbd6e19f9",
-          "property": 2,
-          "name": "中"
-        },
-        {
-          "id": "408fb530344a4a41b33932431638dcbb",
-          "property": 3,
-          "name": "大"
-        }
-      ]
-    },
-    {
-      "id": "fe7f49a798794670be622e6b9d2f386a",
-      "type": 3,
-      "name": "tester",
-      "propertyList": [
-        {
-          "id": "c76dc797eaae4d8eb360de8811a9ec7a",
-          "property": 1,
-          "name": "one"
-        },
-        {
-          "id": "02808ac287e8410f936a90167d82ee2b",
-          "property": 2,
-          "name": "two"
-        },
-        {
-          "id": "d5660085ff8743d999f6ed3a497ec8b7",
-          "property": 3,
-          "name": "three"
-        }
-      ]
-    }
-  ]
-export default {
-  props:['visible'],
-	data() {
-      return {
-        maskVisible: true,
-        skuList: [],
-        lastCheckedSku: {}, // 选中的sku信息
-        buyNumber: 1, // 购买数量
-        sku: null,
-        currentSkuList: [],
-        valueIdSortAndIndex: [],
-        goodsTypeList: [],
-        selectItemList: []
-      }
-    },
-    mounted() {
-      this.init();
-      // 获取所有的规格
-      this.getShopGoodsType()
-      this.initGoodType()
-    },
-    methods: {
-      init() {
-        let valueIdSortAndIndex = [];
-        let currentSkuList = orgdata.skus.map((item,index) => {
-          let valueIdSort = [];
-          item.skusTypes.map(skusTypesItem=>{
-            valueIdSort.push(skusTypesItem.propertyId)
-          });
-          /*
-           将sku规格值的ID，即 propertyId，组成一个数组并且字典排序，以及将该sku所对应的index存入数组，供点击后查询sku*/
-          valueIdSortAndIndex.push({valueIdSort: valueIdSort.sort()})
-          return item.skusTypes
-        });
- 
-        this.$set(this.$data, 'currentSkuList', currentSkuList);
-        this.$set(this.$data, 'valueIdSortAndIndex', valueIdSortAndIndex);
-       
-      },
-       
-      isContained(aa, bb) {
-        //判断aa数组是否 全 包含bb数组
-        if(!(aa instanceof Array)
-            ||!(bb instanceof Array)
-            ||(aa.length<bb.length)
-        ){
-          return false;
-        }
-        let aaStr = aa.toString();
-        for(var i=0;i<bb.length;i++){
-          if(aaStr.indexOf(bb[i])<0){
-            return false;
-          }
-        }
-        return true;
-      },
-      // 获取所有的规格
-      getShopGoodsType() {
-        // goodType 为接口返回数据
-        goodType.forEach(items=>{
-          items.propertyList.forEach(item=>{
-            item.selected = false;
-            item.disabled = true;
-          })
-        })
-        this.goodsTypeList = goodType;
-      },
-      // 初始化 判断 是否有库存
-      initGoodType(){
-        let currentSkuList = this.currentSkuList.flat(Infinity);
-        this.goodsTypeList.forEach(items=>{
-          items.propertyList.forEach(item=>{
-            for(var i=0; i<currentSkuList.length; i++){
-              if (item.id == currentSkuList[i].propertyId) {
-                item.disabled = false;
-                break;
-              }
-            }
-          })
-        })
-      },
-      // 选择每个规格，判断对应的库存
-      handleClickSpecs1(grounpId, id, el, index, i){
-        let selectItemList = this.selectItemList; // 已选规格
-      console.log(selectItemList);
-        if (el.disabled) {
-          return;
-        }
-        console.log(this.goodsTypeList);
-        // 处理selected的逻辑
-        if (!el.selected) {
-          this.goodsTypeList[index].propertyList.forEach(item=>{
-            item.selected = false;
-          })
-          this.goodsTypeList[index].propertyList[i].selected = true;
-          // 选中项中有同组元素，替换
-          selectItemList.forEach((item, x_selected_index) => {
-            if (item.index === index) {
-              selectItemList.splice(x_selected_index, 1)
-            }
-          });
-          selectItemList.push({grounpId, id, index, i});
-        } else  {
-          // 取消选中并删除选中项中数据
-          this.goodsTypeList[index].propertyList[i].selected = false;
-          selectItemList.forEach((item, x_selected_index) => {
-            if (item.id === id && item.grounpId === grounpId) {
-              selectItemList.splice(x_selected_index, 1);
-            }
-          });
-        }
-        this.$set(this.$data, 'selectItemList', selectItemList)
- 
-        // 取出组ID
-        let x_selected_grounpIds = [];
-        selectItemList.forEach(item=>{
-          x_selected_grounpIds.push(item.grounpId);
-        });
- 
-        // 处理disabled的逻辑
-        if (selectItemList.length == 0) {
-          // 选中属性为空，重新初始化数据
-          this.initGoodType();
-        } else {
-          //拿所有规格属性（即goodsTypeList）的每一项分别与已选中的数据（即selectItemList）的每一项，组成一个比较项，与现有库存比较，找到存在的可点项
- 
-          this.goodsTypeList.forEach((goodsType,goodsTypeIndex)=>{
-            goodsType.propertyList.forEach((prop, propIndex)=>{
-              if (!prop.selected) {
-                prop.disabled = true;
-              }
-              // 本次循环数据
-              let push_data = {grounpId: goodsType.id, id: prop.id, index: goodsTypeIndex, i: propIndex}
-              if (x_selected_grounpIds.indexOf(goodsType.id) > -1 ){
-                // 当前循环的规格的组ID在已选规格中，删除同组规格，用当前规格替换后去与库存比较
-                let sel = selectItemList.slice(); // 用一个新变量接受数据，防止修改源数据
-                let index_splice = x_selected_grounpIds.indexOf(goodsType.id);
-                sel.splice(index_splice, 1, push_data);
-                this.optionsHandle(sel, push_data)
-              } else {
-              //  当前循环规格组ID不在已选规格中，添加当前规格到复制出来的已选数组中，循环比较
-                let sel = selectItemList.slice();
-                sel.push(push_data);
-                this.optionsHandle(sel, push_data)
-              }
-            })
-          })
-        }
-      },
-      optionsHandle(selArr, push_data){
-        let propertyIds = []
-        // 将当前比较项的属性ID提取
-        selArr.map(item=>{
-          propertyIds.push(item.id)
-        });
-        // 在现有库存中查找是否有可选项，可选的置为可点击
-        this.valueIdSortAndIndex.map(item=>{
-          if (this.isContained(item.valueIdSort, propertyIds)){
-            this.goodsTypeList[push_data.index].propertyList[push_data.i].disabled = false;
-          }
-        });
-      }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-.spec-choices{
-  margin: 5px 0;
-  span{
-    background: #ccc;
-    padding: 5px 10px;
-    margin: 0 5px;
-    &.active{
-      background: $color-yellow4;
-      color: #fff;
-    }
-    &.disabled{
-      background: #eee;
-      color: #999;
-    }
-  }
-  
-}
-</style>
diff --git a/pages/index/components/Banner.vue b/pages/index/components/Banner.vue
index 71060b2..1fb282b 100644
--- a/pages/index/components/Banner.vue
+++ b/pages/index/components/Banner.vue
@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-03-23 10:31:12
  * @LastEditors: ch
- * @LastEditTime: 2022-04-22 18:02:47
+ * @LastEditTime: 2022-04-29 00:23:50
  * @Description: file content
 -->
 <template>
 	<view class="banner">
-			<u-swiper bgColor="none" radius="18rpx" keyName="img" :list="data" height="240rpx" indicator indicatorMode="dot"></u-swiper>
+			<u-swiper bgColor="none" radius="18rpx" keyName="img" :list="data" height="240rpx" circular indicator indicatorMode="dot"></u-swiper>
 			<view class="desc">
 				<view class="desc--item">
 					<image class="desc--icon" src='@/static/index/bz.png'></image>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 014e90c..34b1458 100644
--- 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-27 16:56:16
+ * @LastEditTime: 2022-04-29 00:24:36
  * @Description: file content
 -->
 <template>
@@ -55,6 +55,7 @@ export default {
 			scrollTop : 0,
 			bannerList: [
                     'https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/uc/account-avatar/banner.png',
+                    'https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/uc/account-avatar/banner.png',
                     'https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/uc/account-avatar/banner.png'
                 ],
 			categoryList : [
diff --git a/pages/login.vue b/pages/login.vue
index 10a7573..5bb8057 100644
--- 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-27 18:46:42
+ * @LastEditTime: 2022-04-29 00:11:21
  * @Description: file content
 -->
 <template>
@@ -78,7 +78,6 @@ export default {
 			if(this.loginStatus){
 				return false;
 			}
-			this.loginStatus = true;
 			if(!IsPhone(this.phone)){
 				uni.$u.toast('请输入正确手机号');
 				return false;
@@ -91,12 +90,14 @@ export default {
 				uni.$u.toast('请勾选同意《用户协议》和《隐私协议》');
 				return false;
 			}
+			this.loginStatus = true;
 			const {error, result} = await ApiPostLogin({
 				phone : this.phone,
 				verificationCode : this.code,
 				clientId : 1,
 				systemId : 1
 			});
+			this.loginStatus = false;
 			if(error){
 				uni.$u.toast(error.message);
 				return false;