From a277f4471fb33c483c42eddc83899f96b20d8e3b Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Fri, 22 Jul 2022 15:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E3=80=81=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                   |   8 ++
 pages/account/changeImg.vue  | 165 +++++++++++++++++++++++++++++++++++
 pages/account/favorites.vue  |  11 ++-
 pages/account/index.vue      |  16 ++--
 pages/account/myOrders.vue   | 106 ++++++++++++----------
 pages/account/myProfile.vue  |  10 ++-
 pages/account/wishlist.vue   |  43 ++++++---
 pages/index/index.vue        |   2 +-
 pages/index/search.vue       |   2 +-
 pages/order/details.vue      |   2 +-
 pages/shippingCart/index.vue |   9 +-
 static/icon/left.png         | Bin 0 -> 355 bytes
 12 files changed, 297 insertions(+), 77 deletions(-)
 create mode 100644 pages/account/changeImg.vue
 create mode 100644 static/icon/left.png

diff --git a/pages.json b/pages.json
index f0cc495..c9763d8 100644
--- a/pages.json
+++ b/pages.json
@@ -47,6 +47,14 @@
 				"navigationBarBackgroundColor":"#FFFFFF"
 			}
 		},
+		{
+			"path" : "pages/account/changeImg",
+			"style" :{
+		    "navigationStyle":"custom",
+				"enablePullDownRefresh": false
+		  }
+		      
+		},
 		{
 			"path": "pages/account/wishlist",
 			"style": {
diff --git a/pages/account/changeImg.vue b/pages/account/changeImg.vue
new file mode 100644
index 0000000..2f90713
--- /dev/null
+++ b/pages/account/changeImg.vue
@@ -0,0 +1,165 @@
+<template>
+ <view>
+   <view class="foot fixed">
+	   <uni-section title="左侧文字+右侧文字" subTitle="使用 left-text/right-text 设置左右文字" type="line"
+	   			style="margin-bottom: 3px;">
+	   			<view class="box-bg">
+	   				<uni-nav-bar border="false" title="标题" >
+						<block slot="left">
+							<!-- <view ><uni-icons type="back" size="30"></uni-icons></view> -->
+							<view class="icon-all"><image class="imgsize"src='../../static/icon/left.png'/></view>
+						</block>
+						<block slot="right">
+							
+							<view class="text-bg" @click="Sub()">submit</view>
+							
+						</block>
+						</uni-nav-bar>
+	   			</view>
+	   	</uni-section>
+   </view>
+
+  <view class="detail">
+   <view class="contain" v-for="(item,index) in imglist" :key="index">
+    <!-- <view class="icon imgsize" :style="{backgroundImage :'url(' + item +')'}"></view> -->
+	
+	<view class="icon" @click="tabActive(index,item)">
+		
+		<image class="imgsize":src="item"></image>
+		<radio class="main-icon-radio" v-show="current>0"  :checked="index == current?true:false" />
+	</view>
+    
+   </view>
+  </view>
+ </view>
+</template>
+
+<script>
+	import {defaultRequest} from '../../api/index.js'
+ export default {
+  data() {
+   return {
+	   current:-1,
+	   active_img:'',
+    query:{
+		_action:'getinfo'
+		
+	},
+	query2:{
+		_action:'updateinfo',
+		nickname:'',
+		sex:'',
+		birthday:'',
+		user_head:'',
+		email:''
+	},
+	imglist:[]
+   }
+  },
+  onLoad() {
+  	this.getimglist()
+  },
+  methods: {
+   getimglist(){
+	   defaultRequest(this.query).then(res =>
+	   {
+		   // console.log(res.data.headicons,'图片')
+		   this.imglist = res.data.headicons
+		    console.log(res.data)
+			this.query2.nickname = res.data.nickname
+			// for(let i of this.imglist)
+			// console.log(i)
+	   })
+		},   
+	   
+   tabActive(index,item){
+	   this.current = index
+       console.log(index)
+	   this.active_img = item
+   },
+   // 提交图片
+   Sub(){
+	   console.log( this.active_img,'选择的图片')
+	   this.query2.user_head = this.active_img;
+	  defaultRequest(this.query2).then( res => {
+		  console.log(res,'yyyy')
+		  if(res.error==0){
+			uni.showToast({
+				title:'succuss',
+				duration: 2000,
+				icon:'none'
+				
+			})
+			uni.navigateBack({
+				delta:1
+			})
+		}
+	  })
+	   
+   },
+  }
+ }
+</script>
+
+<style>
+	.foot{
+		height:120rpx;
+		width: 100vw;
+	    padding:50rpx 0 0 0;
+		background-color: #fff;
+		position: fixed;
+	}
+	.fixed{
+		position: fixed;
+		z-index: 99;
+	}
+	.icon-all{
+		height: 30rpx;
+		width:30rpx ;
+	}
+.detail{
+ display: flex;
+ flex-wrap: wrap;
+ margin:10rpx 50rpx  10rpx 50rpx;
+ padding: 100rpx 0;
+ background-color: #fff;
+ 
+
+}
+.text-bg{
+	background-color: black;
+	color: aliceblue;
+	padding: 6rpx 10rpx;
+	border-radius: 15rpx;
+}
+.contain{
+ width: 180rpx;
+ height: 160rpx;
+ display: flex;
+ flex-direction: column;
+ margin: 50rpx 10rpx 10rpx 10rpx;
+  padding: 10rpx;
+ position: relative;
+ justify-content: center;
+ align-items: center;
+}
+.icon{
+ height: 160rpx;
+ width:160rpx;
+ margin: 12rpx;
+ display: flex;
+ justify-content: flex-end;
+ position: absolute;
+ align-items: center;
+}
+.imgsize{
+	width: 100%;
+	height: 100%;
+}
+.main-icon-radio {
+	position: absolute;
+	z-index: 9;
+	margin-top: 110rpx;
+	margin-left: 20rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/account/favorites.vue b/pages/account/favorites.vue
index 4bb7e15..3f30c3e 100644
--- a/pages/account/favorites.vue
+++ b/pages/account/favorites.vue
@@ -3,15 +3,15 @@
 		<view class="status_bar"></view>
 		<uni-nav-bar  left-icon="left"  :rightText="isDelete?'Done':'Delete'" title="Favorites" color="#000000" @clickLeft="back" @clickRight="$refs.alertDialog.open()"/>
 		<view class="wishlist">
-			<view class="wishlist_item" v-for="(item,index) in goodsList" :key="index" >
+			<view class="wishlist_item" v-for="(item,index) in goodsList" :key="index" @click="goDetails(item.goods_id)">
 				<view class="wishlist_item_img">
 					<image :src="item.goods_img" mode="" class="wishlist_item_img_goods"></image>
 					<image src="../../static/img/select.png" mode=""  class="select" v-show="isDelete"></image>
 				</view>
 				<view class="wishlist_item_bottom">
 					<text>US${{item.promote_price?item.promote_price:item.shop_price}}</text>
-					<image src="/static/img/like.png" mode="" v-show="item.is_attention==0" class="wishlist_item_bottom_icon" @click="addLike(item.id)"></image>
-					<image src="../../static/img/like1.png" mode="" v-show="item.is_attention==1" class="wishlist_item_bottom_icon" @click="removeLike(item.id)"></image>
+					<image src="/static/img/like.png" mode="" v-show="item.is_attention==0" class="wishlist_item_bottom_icon" @click.stop="addLike(item.id)"></image>
+					<image src="../../static/img/like1.png" mode="" v-show="item.is_attention==1" class="wishlist_item_bottom_icon" @click.stop="removeLike(item.id)"></image>
 				</view>
 			</view>
 		</view>
@@ -41,6 +41,11 @@
 			}
 		},
 		methods:{
+			goDetails(id){
+				uni.navigateTo({
+					url:"../productDetails/index?goods_id="+id
+				})
+			},
 			// 清空浏览记录
 			clearFavorites(){
 				let data={_action:'cleargoodsbrowsehistory'}
diff --git a/pages/account/index.vue b/pages/account/index.vue
index 7ac0469..5be3950 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -37,24 +37,24 @@
 		</view>
 		
 		<view class="order">
-			<view class="order_title">My Orders</view>
+			<navigator url="/pages/account/myOrders?scroll_active=0" class="order_title">My Orders</navigator>
 			<view class="order_info">
-				<navigator url="/pages/account/myOrders" class="order_info_item">
+				<navigator url="/pages/account/myOrders?scroll_active=1" class="order_info_item">
 					<image src="../../static/img/unpaid.png" mode="" class="info_img"></image>
 					<text>Unpaid</text>
 				</navigator>
-				<view class="order_info_item">
+				<navigator url="/pages/account/myOrders?scroll_active=2" class="order_info_item">
 					<image src="../../static/img/Processing.png" mode="" class="info_img"></image>
 					<text>Processing</text>
-				</view>
-				<view class="order_info_item">
+				</navigator>
+				<navigator url="/pages/account/myOrders?scroll_active=3" class="order_info_item">
 					<image src="../../static/img/Shipped.png" class="info_img" mode=""></image>
 					<text>Shipped</text>
-				</view>
-				<view class="order_info_item">
+				</navigator>
+				<navigator url="/pages/account/myOrders?scroll_active=4" class="order_info_item">
 					<image src="../../static/img/Returns.png" class="info_img" mode=""></image>
 					<text>Returns</text>
-				</view>
+				</navigator>
 			</view>
 		</view>
 		
diff --git a/pages/account/myOrders.vue b/pages/account/myOrders.vue
index 6ed001c..2ad744b 100644
--- a/pages/account/myOrders.vue
+++ b/pages/account/myOrders.vue
@@ -150,12 +150,14 @@
 					</view>
 					
 				</view>
+				
+				
 			</template>
 			
 			<!-- 待发货订单 -->
 			<template v-if="isList==true && scroll_active==2">
 				<view  v-for="(item,idnex) in orderList" :key="item.order_id">
-					<view class="order" v-if="item.pay_status_code==2 && item.shipping_status_code==0" @click="goDetails(0,item.order_id)">
+					<view class="order" v-if="item.pay_status_code==2 && item.shipping_status_code==0" @click="goDetails(item,item.order_id)">
 						<view class="order_title">
 							<text>To be shipped</text>
 							<view class="order_title_right">
@@ -200,11 +202,13 @@
 						</view>
 					</view>
 				</view>
+				
+				
 			</template>
 			<!-- 运输中订单 -->
 			<template v-if="isList==true && scroll_active==3">
 				<view  v-for="(item,idnex) in orderList" :key="item.order_id">
-					<view class="order" v-if="item.pay_status_code==2 && item.shipping_status_code==1 || item.shipping_status_code==4" @click="goDetails(4,item.order_id)">
+					<view class="order" v-if="item.pay_status_code==2 && item.shipping_status_code==1 || item.shipping_status_code==4" @click="goDetails(item,item.order_id)">
 						<view class="order_title">
 							<text>Shipped</text>
 							<view class="order_title_right">
@@ -253,11 +257,13 @@
 						</view>
 					</view>
 				</view>
+				
+				
 			</template>
 			<!-- 已完成订单 -->
-			<template v-if="isList==true && scroll_active==4">
+			<template v-if="isList==true && scroll_active==5">
 				<view class="" v-for="(item,idnex) in orderList" :key="item.order_id">
-					<view class="order " v-if="item.pay_status_code==2 && item.shipping_status_code==2" @click="goDetails(2,item.order_id)">
+					<view class="order " v-if="item.pay_status_code==2 && item.shipping_status_code==2" @click="goDetails(item,item.order_id)">
 						<view class="order_title">
 							<text>Completed</text>
 							<view class="order_title_right">
@@ -307,11 +313,13 @@
 						</view>
 					</view>
 				</view>
+				
+				
 			</template>
 			<!-- 退换货订单 -->
-			<template v-if="isList==true && scroll_active==5">
+			<template v-if="isList==true && scroll_active==4">
 				<view class="" v-for="(item,idnex) in orderList" :key="item.order_id">
-					<view class="order" v-if="item.order_status_code==4" @click="goDetails(2,item.order_id)">
+					<view class="order" v-if="item.order_status_code==4" @click="goDetails(item,item.order_id)">
 						<view class="order_title">
 							<text>Return and exchange</text>
 							<view class="order_title_right">
@@ -359,58 +367,62 @@
 						</view>
 					</view>
 				</view>
+				
+				
 			</template>
 			<!-- 已取消订单 -->
 			<template v-if="isList==true && scroll_active==6">
-				<view class="" v-for="(item,idnex) in orderList" :key="item.order_id">
-					<view class="order" v-if="item.order_status_code==2" @click="goDetails(1,item.order_id)">
-						<view class="order_title">
-							<text>cancelled</text>
-							<view class="order_title_right">
-								<text>order#{{item.order_sn}}</text>
-								<image src="../../static/img/right.png" mode=""></image>
+					<view class="" v-for="(item,idnex) in orderList" :key="item.order_id">
+						<view class="order" v-if="item.order_status_code==2" @click="goDetails(item,item.order_id)">
+							<view class="order_title">
+								<text>cancelled</text>
+								<view class="order_title_right">
+									<text>order#{{item.order_sn}}</text>
+									<image src="../../static/img/right.png" mode=""></image>
+								</view>
 							</view>
-						</view>
-						<view class="order_content">
-							<template v-if="item.order_goods.length==1">
-								<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1" @click.stop="goGoodsDetails(item1.goods_id)">
-									<view class="good_info_left ">
-										<view class="good_info_image" >
-											<image :src="item1.goods_img" mode=""></image>
-										</view>
-										<view class="left_info">
-											<view class="info_name">{{item1.goods_name}}</view>
-											<view class="left_info_bottom">
-												<view class="info_lable">
-													<text>{{item1.goods_attr |goodsAttr}}</text>
-													<image src="/static/img/bottom.png" mode=""></image>
+							<view class="order_content">
+								<template v-if="item.order_goods.length==1">
+									<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1" @click.stop="goGoodsDetails(item1.goods_id)">
+										<view class="good_info_left ">
+											<view class="good_info_image" >
+												<image :src="item1.goods_img" mode=""></image>
+											</view>
+											<view class="left_info">
+												<view class="info_name">{{item1.goods_name}}</view>
+												<view class="left_info_bottom">
+													<view class="info_lable">
+														<text>{{item1.goods_attr |goodsAttr}}</text>
+														<image src="/static/img/bottom.png" mode=""></image>
+													</view>
+													<text>×{{item1.goods_number}}</text>
 												</view>
-												<text>×{{item1.goods_number}}</text>
 											</view>
 										</view>
 									</view>
-								</view>
-							</template>
-							<template v-else>
-								<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
-									<view class="good_info_left">
-										<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
-											<image :src="item1.goods_img" mode=""></image>
+								</template>
+								<template v-else>
+									<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
+										<view class="good_info_left">
+											<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
+												<image :src="item1.goods_img" mode=""></image>
+											</view>
+										</view>
+										<view class="good_info_right">
+											<text>{{item.order_goods.length}} ltems</text>
+											<image src="../../static/img/right.png" mode=""></image>
 										</view>
 									</view>
-									<view class="good_info_right">
-										<text>{{item.order_goods.length}} ltems</text>
-										<image src="../../static/img/right.png" mode=""></image>
-									</view>
+								</template>
+								<view class="good_price">total:US${{item.total_fee_o}}</view>
+								<view class="order_button">
+									<button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button>
 								</view>
-							</template>
-							<view class="good_price">total:US${{item.total_fee_o}}</view>
-							<view class="order_button">
-								<button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button>
 							</view>
 						</view>
 					</view>
-				</view>
+				
+				
 			</template>
 			<template v-if="isList==false">
 				<view class="order1">
@@ -578,6 +590,7 @@
 					// 退货
 					index=5
 				}
+				
 				let url='../order/details?details_index='+index+'&id='+id
 				if(index==5){
 					url='../order/refundDetails'
@@ -659,7 +672,7 @@
 				defaultRequest2(this.query).then(res=>{
 					console.info(res)
 					if(res.error==0){
-						this.orderList=res.data
+						if(res.data) this.orderList=res.data
 						if(this.orderList.length==0){
 							this.isList=false
 						}else{
@@ -685,6 +698,9 @@
 		onShow() {
 			this.getList()
 		},
+		onLoad(e) {
+			this.scroll_active=e.scroll_active
+		},
 		filters:{
 			goodsAttr(e){
 				return e.replace(/\s\n/g,';');
diff --git a/pages/account/myProfile.vue b/pages/account/myProfile.vue
index ebfe401..e18892c 100644
--- a/pages/account/myProfile.vue
+++ b/pages/account/myProfile.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		
-		<view class="profile_item profile_item1">
+		<view class="profile_item profile_item1" @click="gotochange">
 			<text>Photo</text>
 			<view class="profile_item_right">
 				<image src="../../static/img/logo.png" mode="" class="head_img" v-show="!user_info.isLogin"></image>
@@ -62,6 +62,12 @@
 			}
 		},
 		methods:{
+			//换头像
+			gotochange(){
+				uni.navigateTo({
+				 url:'./changeImg'
+				})
+			},
 			// 获取默认地址
 			getDefaultAddress(){
 				let data={_action:'getdefaultconsignee'}
@@ -99,7 +105,7 @@
 				})
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.user_info=uni.getStorageSync('user_info')
 			this.getUserInfo()
 			this.getDefaultAddress()
diff --git a/pages/account/wishlist.vue b/pages/account/wishlist.vue
index 75fb511..8d7b44c 100644
--- a/pages/account/wishlist.vue
+++ b/pages/account/wishlist.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="wishlist_body">
 		<view class="status_bar"></view>
-		<uni-nav-bar  left-icon="left"  :rightText="isDelete?'Done':'Delete'" title="Wishlist" color="#000000" @clickLeft="back" @clickRight="$refs.alertDialog.open()"/>
+		<uni-nav-bar  left-icon="left"  :rightText="isDelete?'Done':'Delete'" title="Wishlist" color="#000000" @clickLeft="back" @clickRight="isDelete=true"/>
 		<view class="wishlist">
-			<view class="wishlist_item" v-for="(item,index) in goodsList" :key="index" @click="changeImage(item.id)">
+			<view class="wishlist_item" v-for="(item,index) in goodsList" :key="index" @click="isDelete?selectGoods(item.goods_id): goDetails(item.goods_id)">
 				<view class="wishlist_item_img">
 					<image :src="item.goods_img" mode="" class="wishlist_item_img_goods"></image>
-					<image src="../../static/img/select.png" mode=""  class="select" v-show="isDelete && item.is_select==0"></image>
-					<image src="../../static/img/select.png" mode=""  class="select" v-show="isDelete && item.is_select==1"></image>
+					<image src="../../static/img/select1.png" mode=""  class="select" v-if="isDelete && item.goods_id==goods_id || isAll"></image>
+					<image src="../../static/img/select.png" mode=""  class="select" v-else-if="isDelete && item.goods_id!=goods_id"></image>
 				</view>
 				<view class="wishlist_item_bottom">
 					<text>US${{item.promote_price?item.promote_price:item.shop_price}}</text>
@@ -16,17 +16,18 @@
 			</view>
 		</view>
 		<view class="wishlist_foot" v-show="isDelete">
-			<view class="wishlist_foot_left">
-				<image src="../../static/img/select2.png" mode=""></image>
+			<view class="wishlist_foot_left" @click="isAll=true">
+				<image src="../../static/img/select2.png" mode="" v-if="!isAll"></image>
+				<image src="../../static/img/select1.png" mode="" v-else></image>
 				<text>All</text>
 			</view>
 			<view class="wishlist_foot_right">
-				<button @click="removeLike">DELETE</button>
+				<button :disabled="goods_id==''" @click="$refs.alertDialog.open()" :class="goods_id==''?'':'wishlist_foot_right_button'">DELETE</button>
 			</view>
 		</view>
 		<uni-popup ref="alertDialog" type="dialog">
-			<uni-popup-dialog type="error" cancelText="Close" confirmText="Delete" title="Tips" content="Whether to delete all favorites?" 
-			@confirm="removeLike(0)" ></uni-popup-dialog>
+			<uni-popup-dialog type="error" cancelText="Close" confirmText="Cancel" title="Tips" content="Cancel the collection of this product?" 
+			@confirm="removeLike()" ></uni-popup-dialog>
 		</uni-popup>
 	</view>
 </template>
@@ -37,10 +38,26 @@
 		data() {
 			return {
 				isDelete:false,
-				goodsList:[]
+				goodsList:[],
+				goods_id:'',
+				isAll:false
 			}
 		},
 		methods:{
+			selectGoods(id){
+				if(id==this.goods_id){
+					this.goods_id=''
+				}else{
+					this.goods_id=id
+				}
+				
+			},
+			
+			goDetails(id){
+				uni.navigateTo({
+					url:"../productDetails/index?goods_id="+id
+				})
+			},
 			getList(){
 				let data={_action:'getfaviouritegoods',page_index:1,page_size:30}
 				defaultRequest2(data).then(res=>{
@@ -60,13 +77,13 @@
 							title:res.message,
 							icon:'none'
 						})
-						this.changeImage(id,0)
 					}
 				})
 			},
 			// 取消收藏
-			removeLike(id){
-				let data={_action:'unsetfaviouritegoods',goods_id:id}
+			removeLike(){
+				let data={_action:'unsetfaviouritegoods',goods_id:this.goods_id}
+				if(this.isAll)data.goods_id=0
 				defaultRequest2(data).then(res=>{
 					console.info(res)
 					if(res.error==0){
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6714e3a..32ee5d1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -266,7 +266,7 @@
 		},
 		onLoad() {
 			this.getIndex()
-			console.info(this.curEndTime)
+			// console.info(this.curEndTime)
 		},
 		computed:{
 			//当天结束时间
diff --git a/pages/index/search.vue b/pages/index/search.vue
index ba45a98..a147e22 100644
--- a/pages/index/search.vue
+++ b/pages/index/search.vue
@@ -33,7 +33,7 @@
 					</view>
 					<view class="spike1_item_bottom">
 						<text>US${{item.is_promote==0? item.shop_price :item.promote_price}}</text>
-						<view class="spike1_item_text">US${{ item.shop_price }}</view>
+						<view class="spike1_item_text" v-if="item.is_promote==1">US${{ item.shop_price }}</view>
 					</view>
 				</view>
 			</scroll-view>
diff --git a/pages/order/details.vue b/pages/order/details.vue
index 20506b7..249fd07 100644
--- a/pages/order/details.vue
+++ b/pages/order/details.vue
@@ -123,7 +123,7 @@
 			</view>
 			<view class="summary_item">
 				<view>Order total</view>
-				<view>US${{goodsDate.order_amount}}</view>
+				<view>US${{goodsDate.total_fee}}</view>
 			</view>
 			<view class="summary_tips" v-if="details_index==0">
 				<image src="../../static/img/gantan1.png" mode=""></image>
diff --git a/pages/shippingCart/index.vue b/pages/shippingCart/index.vue
index 4c2393d..9a22a6b 100644
--- a/pages/shippingCart/index.vue
+++ b/pages/shippingCart/index.vue
@@ -10,7 +10,10 @@
 		<view class="empty" v-if="goods_list.length==0">
 			<image src="/static/img/cart3.png" mode=""></image>
 			<text>Your cart is empty</text>
-			<button>Shop Now</button>
+			<navigator url="/pages/category/index" open-type="switchTab">
+				<button>Shop Now</button>
+			</navigator>
+			
 		</view>
 		<template v-else>
 			<view class="cart_info">
@@ -23,8 +26,8 @@
 					<view class="good_info" v-for="(item,index) in goods_list" :key="item.rec_id">
 						<image src="../../static/img/select1.png" mode="" class="cart_select" v-show="item.is_check==1" @click="cartCheck(1,0,item.rec_id,index)"></image>
 						<image src="../../static/img/select2.png" mode="" class="cart_select" v-show="item.is_check==0" @click="cartCheck(1,1,item.rec_id,index)"></image>
-						<view class="good_info_left ">
-							<view class="good_info_image">
+						<view class="good_info_left " >
+							<view class="good_info_image" @click="goDetails(item.goods_id)">
 								<image :src="item.goods_thumb" mode=""></image>
 							</view>
 							<view class="left_info">
diff --git a/static/icon/left.png b/static/icon/left.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad56335403584ce78c39729cb1b361455d5f22b0
GIT binary patch
literal 355
zcmV-p0i6DcP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$9Z5t%R5(wi(>*K3Q5?qc&z&%fyZ}iCgHb6ZBgx{SsJqx?ks^x>vMGZi8OWmK
zv822NNt9P04_OSPETmKaf8E{P5C4-h|E}*j=en+6PW<V^0S+;p%5#yNNo*qMrm!Ci
z3c?jE;sYbNDttti7u91IV|YYA9*Tcb4b+5FbmIntcr9f|B~TkK(26sR<Exyf<v=|+
zMkCfShu=!Ulmbm)2Q`?*MwVoYL7liw;td@MQD-{EpxQ(nI`Wp7d!2<;&Z7ma;v3<s
zC)Hq;QX9q|LXYOL7Hf9ld{+{EGqx~;pV%Iy^DRlA+Hr|de8x6Aoo~PqdU1~dJjL!>
zI$wuv<nf%q?qavU@bV=r;~Yc(0R?RbUhtlR{s4cTFB7lCpkx35002ovPDHLkV1nK1
Blr{hW

literal 0
HcmV?d00001