From bfc54c0006c4d12c5404c75bc027ce85eb82d950 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Mon, 28 Feb 2022 15:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cart-subgroup/cart.vue  | 21 ++++++++++++---------
 pages/tabbar/cate/cate.vue         | 18 ++++++++++++++++--
 pagesA/getReadyDan/getReadyDan.vue | 13 +++++--------
 pagesA/myOrder/myOrder.vue         |  2 +-
 pagesB/orderDetail/orderDetail.vue |  2 +-
 5 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/components/cart-subgroup/cart.vue b/components/cart-subgroup/cart.vue
index 6a4688b..98c54c1 100644
--- a/components/cart-subgroup/cart.vue
+++ b/components/cart-subgroup/cart.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="pad-x140">
 		<scroll-view scroll-y @scrolltolower="touchBottomEv" :style="{height: scrolViewheigh + 'px'}">
+			<view class="fon42 col0 mar-sx30">购物车</view>
 			<view v-for="(item,index) in dataList" :key="index"
 			class="item-box display-between-center">
 				<view @tap="chooseItem(index)" class="display-center-center flex-shrink">
@@ -282,21 +283,22 @@
 						this.total = res.data.total;
 						if(res.data.list.length){
 							res.data.list.forEach(item=>{
-								let newspec = [];
-								if(item.sku.spec_text.length){
-									item.sku.spec_text.forEach(itemspec=>{
-										for (let key in itemspec) {
-											newspec.push(`${key}：${itemspec[key]}`);
-										}
-									})
-								}
+								console.log(item,286);
+								// let newspec = [];
+								// if(item.sku.spec_text.length){
+								// 	item.sku.spec_text.forEach(itemspec=>{
+								// 		for (let key in itemspec) {
+								// 			newspec.push(`${key}：${itemspec[key]}`);
+								// 		}
+								// 	})
+								// }
 								let obj = {
 									id:item.id,
 									coding:item.sku.coding,
 									isActive:false,
 									imgSrc:item.spu.spu_cover,
 									title:item.spu_name,
-									specs:newspec,
+									specs:item.sku.spec_text,
 									// price:this.$toolAll.tools.changeNum(item.price*1),
 									price:item.price,
 									reckonPrice:item.price,
@@ -304,6 +306,7 @@
 								}
 								this.dataList.push(obj);
 							})
+							this.dataList.concat(this.dataList);
 						} else {
 							this.dataList = [];
 						}
diff --git a/pages/tabbar/cate/cate.vue b/pages/tabbar/cate/cate.vue
index a252664..c36cfac 100644
--- a/pages/tabbar/cate/cate.vue
+++ b/pages/tabbar/cate/cate.vue
@@ -229,11 +229,19 @@
 				let screenIndex =  this.screenList.findIndex(item=>item.mainTitle==title);
 				if(screenIndex==0){
 					// 设置分类id
-					this.categoryId = this.screenList[screenIndex].childrenList[childrenIndex].id;
+					if(childrenIndex==0){
+						this.categoryId = '';
+					} else {
+						this.categoryId = this.screenList[screenIndex].childrenList[childrenIndex].id;
+					}
 				}
 				if(screenIndex==1){
 					// 设置限时优惠
-					this.activityStr = this.screenList[screenIndex].childrenList[childrenIndex].id;
+					if(childrenIndex==0){
+						this.activityStr = '';
+					} else {
+						this.activityStr = this.screenList[screenIndex].childrenList[childrenIndex].id;
+					}
 				}
 				// 将当前选择的类别下的数组置空
 				this.temporaryCate[mainIndex] = [];
@@ -253,6 +261,12 @@
 			// 删除选中的分类列表
 			delCate(index){
 				this.chooseCateList.splice(index,1);
+				if(index==0){//清空分类id
+					this.categoryId = '';
+				}
+				if(index==1){//清空活动限时字段
+					this.activityStr = '';
+				}
 				// 清除选中
 				this.screenList.forEach((item1,index1)=>{
 					item1.childrenList.forEach((item2,index2)=>{
diff --git a/pagesA/getReadyDan/getReadyDan.vue b/pagesA/getReadyDan/getReadyDan.vue
index 6cb67da..fa8c460 100644
--- a/pagesA/getReadyDan/getReadyDan.vue
+++ b/pagesA/getReadyDan/getReadyDan.vue
@@ -146,14 +146,6 @@
 				return  this.$toolAll.tools.operationEv(price1, expressPrice, '+', 2);
 			}
 		},
-		onShareAppMessage(res) {
-			var shareObj = {
-				title: ``, // 默认是小程序的名称(可以写slogan等)
-				path: `/pagesB/shopDetail/shopDetail?id=${this.orderList[0].id}&category_id=${this.orderList[0].category_id}&share_id=${this.checkGrounpId}&invite_code=${uni.getStorageSync('invite_code')}&shareCate=${this.orderList[0].cateNum}&checkGrounpId=${this.orderList[0].checkGrounpId}`, // 默认是当前页面，必须是以‘/’开头的完整路径
-				imageUrl: ''//自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
-			};
-			return shareObj;
-		},
 		onShow() {
 			this.checkChoose();//调用检测地址
 		},
@@ -276,6 +268,11 @@
 					this.$requst.post('/api/order/paid',{order_coding:info.coding}).then(res=>{
 						if(res.code==0){
 							this.$toolAll.tools.showToast('支付成功');
+							setTimeout(()=>{
+								uni.navigateTo({
+									url:'/pagesA/myOrder/myOrder?index=2'
+								})
+							},2000)
 						} else this.$toolAll.tools.showToast(res.msg);
 					})
 				}
diff --git a/pagesA/myOrder/myOrder.vue b/pagesA/myOrder/myOrder.vue
index b14d5eb..df3a503 100644
--- a/pagesA/myOrder/myOrder.vue
+++ b/pagesA/myOrder/myOrder.vue
@@ -20,7 +20,7 @@
 								<image @tap="goDetail(item1.id)" :src="item2.sku_cover" class="flexs mar-y20 radius30" style="width: 224rpx;height: 224rpx;" mode="aspectFill"></image>
 								<view @tap="goDetail(item1.id)" class="width100 disjb fc" style="height: 224rpx;">
 									<view class="fon28 col3 bold clips2 line-h50">{{item2.spu_name}}</view>
-									<view class="disac">
+									<view class="disac fw">
 										<view class="order-sy mar-y40" v-for="(item3,index3) in item2.spec_info" :key="index3">{{item3}}</view>
 									</view>
 									<view class="colpeili disjbac"><span class="order-price">￥{{item2.price}}</span><span class="fon24">x{{item2.num}}</span></view>
diff --git a/pagesB/orderDetail/orderDetail.vue b/pagesB/orderDetail/orderDetail.vue
index 7a8dc73..8ee0e84 100644
--- a/pagesB/orderDetail/orderDetail.vue
+++ b/pagesB/orderDetail/orderDetail.vue
@@ -33,7 +33,7 @@
 							<image :src="item.sku_cover" class="flexs" mode="aspectFill" style="width: 224rpx; height: 224rpx;"></image>
 							<view class="width100 disjb fc" style="height: 224rpx;">
 								<view class="fon28 col3 bold clips2">{{item.spu_name}}</view>
-								<view class="orderDetail-sku disac" v-if="item.spec_info.length">
+								<view class="orderDetail-sku disac fw" v-if="item.spec_info.length">
 									<view class="mar-y40" v-for="(item2,index2) in item.spec_info" :key="index2">{{item2}}</view>
 								</view>
 								<view class="mar-s10">