From 7a47deafd4fea3d283817198390be88fb1edfc9e Mon Sep 17 00:00:00 2001
From: zhouyuan777/zhouyuan777 <1069065057@qq.com>
Date: Wed, 20 Apr 2022 17:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  18 ++++
 src/pages/ConfirmOrder/ConfirmOrder.vue       |  28 ++++--
 src/pages/OrderDetail/OrderDetail.vue         |  63 ++++++++------
 src/pages/ReceivingAddress/EditAddresspge.vue |  81 ++++++++++++++++++
 .../ReceivingAddress/ReceivingAddress.vue     |  56 ++++++++++++
 src/static/addAddressimg.png                  | Bin 0 -> 946 bytes
 src/static/editAddress.png                    | Bin 0 -> 896 bytes
 7 files changed, 213 insertions(+), 33 deletions(-)
 create mode 100644 src/pages/ReceivingAddress/EditAddresspge.vue
 create mode 100644 src/pages/ReceivingAddress/ReceivingAddress.vue
 create mode 100644 src/static/addAddressimg.png
 create mode 100644 src/static/editAddress.png

diff --git a/src/pages.json b/src/pages.json
index 6234c61..8ceaa74 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -329,6 +329,24 @@
 		    }
 		}
 		
+        ,{
+            "path" : "pages/ReceivingAddress/ReceivingAddress",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收货地址",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/ReceivingAddress/EditAddresspge",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "修改地址",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black", //导航栏标题颜色及状态栏前景颜色，仅支持 black/white
diff --git a/src/pages/ConfirmOrder/ConfirmOrder.vue b/src/pages/ConfirmOrder/ConfirmOrder.vue
index 69986cd..48107e4 100644
--- a/src/pages/ConfirmOrder/ConfirmOrder.vue
+++ b/src/pages/ConfirmOrder/ConfirmOrder.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<view class="person_des bg_col_cirle_margin">
-			<image style="width: 46rpx; height: 46rpx;" src="../../static/DataSearch/Delet.png" mode=""></image>
+		<view class="person_des bg_col_cirle_margin" @click="goAddressPge">
+			<image style="width: 46rpx; height: 46rpx;" src="../../static/local.png" mode=""></image>
 			<view class="person_con">
 				<view class="person_con_t">
 					<view class="info_txt">
@@ -17,14 +17,14 @@
 		
 		<view class="goods_box bg_col_cirle_margin">
 			<view class="goods_itm">
-				<view class="goods_itm_top">
-					<image style="width: 46rpx; height: 46rpx;" src="../../static/DataSearch/Delet.png" mode=""></image>
+				<view class="goods_itm_top" style="display: flex; align-items: center;">
+					<image style="width: 36rpx; height: 36rpx;" src="../../static/RewardWork/avator.png" mode=""></image>
 					<text class="goods_itm_top_title">周科</text>
 				</view>
 				<view class="goods_itm_bott">
-					<image style="width: 148rpx; height: 156rpx;" src="../../static/DataSearch/TxtImg.png" mode="">
+					<image style="width: 148rpx; height: 156rpx; border-radius: 16rpx;" src="../../static/shop/picture.png" mode="">
 					</image>
-					<view class="goods_itm_bott_left">
+					<view class="goods_itm_bott_left" style="margin-left: 24rpx;">
 						<text style="font-weight: 600;">绘画作品</text>
 						<view class="goods_itm_bott_left_count">
 							<text>x1</text> <text>￥80</text>
@@ -52,7 +52,7 @@
 		<view class="pay_methods bg_col_cirle_margin">
 			<text>支付方式</text>
 			<view class="pay_right">
-				<image style="width: 32rpx; height: 32rpx;" src="../../static/DataSearch/Delet.png" mode=""></image>
+				<image style="width: 32rpx; height: 32rpx;margin-right: 8rpx;" src="../../static/RewardWork/fightVirus.png" mode=""></image>
 				<text>微信支付</text>
 			</view>
 		</view>
@@ -75,7 +75,14 @@
 			return {
 
 			};
-		}
+		},
+        methods:{
+            goAddressPge(){
+                uni.navigateTo({
+                    url:"/pages/ReceivingAddress/ReceivingAddress"
+                })
+            }
+        }
 	}
 </script>
 
@@ -113,16 +120,19 @@
 			.goods_itm_top{
 				.goods_itm_top_title{
 					font-weight: 600;
+                    margin-left: 16rpx;
+                    font-size: 32rpx;
 				}
 			}
 				
 			.goods_itm_bott{
-			margin-top: 16rpx;
+			margin-top: 32rpx;
 				display: flex;
 				.goods_itm_bott_left{
 					flex: 1;
 					margin-left: 16rpx;
 					.goods_itm_bott_left_count{
+                        margin-top: 16rpx;
 						color: $gray;
 						display: flex;
 						justify-content: space-between;
diff --git a/src/pages/OrderDetail/OrderDetail.vue b/src/pages/OrderDetail/OrderDetail.vue
index b5be06e..2c6c9ec 100644
--- a/src/pages/OrderDetail/OrderDetail.vue
+++ b/src/pages/OrderDetail/OrderDetail.vue
@@ -81,7 +81,7 @@
                             <text>李已</text>
                         </view>
                         <view class="pinContent_rate">
-                            <u-rate count=5 v-model="rate1" :readonly="true" ></u-rate>
+                            <u-rate count=5 v-model="rate1" :readonly="true"></u-rate>
 
                         </view>
                     </view>
@@ -115,20 +115,17 @@
             <view class="order_itm" style=" border-top: solid 1rpx #E0E0E0; border-bottom: 1rpx solid #E0E0E0 ; ">
                 <text class="order_itm_t">商品总价</text> <text>25积分</text>
             </view>
-            <view class="order_itm">
+            <view class="order_itm" style="position: relative;">
                 <text class="order_itm_t">提货方式</text>
-
-                <u-radio-group v-model="FetchGoodMethod" placement="row">
-                    <u-radio name="1" activeColor="red" label="线上发货 "></u-radio>
-                    <u-radio name="2" activeColor="red" label="线下自取"></u-radio>
+                <u-radio-group v-model="FetchGoodMethod" placement="row" style="justify-content: flex-end;">
+                    <u-radio name="1" activeColor="#99241B" labelColor="#251B1D" label="线上发货 "></u-radio>
+                    <u-radio style="margin-left: 24rpx;" name="2" activeColor="#99241B" labelColor="#AFADB0"
+                        label="线下自取"></u-radio>
                 </u-radio-group>
+                <view class="zuzhi_click"
+                    style="position: absolute; background-color:transparent; width: 100%; height: 100%;">
 
-                <!-- <text>
-                     <label class="radio">
-                        <radio value="true" /><text></text>
-                         线上发货
-                    </label>
-                </text> -->
+                </view>
             </view>
             <u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
                 type="default" @click="DoBuy">购买</u-button>
@@ -138,20 +135,25 @@
 
 
         <view class="operation">
+            <view class="start_icon" @click="ClickBuy">
+                <view class="col_icon " style="position: relative;">
+                    <image style="width: 100%; height: 100%;" src='../../static/shop/car.png'></image>
+                    <u-badge style="transform: scale(0.6) translateX(40rpx);" absolute :max="99" :offset="[0,0]"
+                        type="error" :value="carValue"></u-badge>
+                </view>
+            </view>
             <view class="start_icon" @click="ClickStart">
                 <view class="col_icon ">
                     <image style="width: 100%; height: 100%;" :src="StartSrc[0]"></image>
                 </view>
-
-                <view class="col_txt" style="font-size: 20rpx; ">
-                    收藏
-                </view>
             </view>
+
             <view class="btn_contain" style="display: flex;">
-                <button type="default" class="addCar" @click="colection()">加入购物车</button>
+                <button type="default" class="addCar" @click="addCarClick">加入购物车</button>
                 <button type="default" class="buy" @click="ImdeiaBuy">立即购买</button>
             </view>
         </view>
+        <u-toast ref="uToast"></u-toast>
         <view class="zhanwei">
 
         </view>
@@ -164,6 +166,7 @@
     export default {
         data() {
             return {
+                carValue: 1000,
                 rate1: 1,
                 showBuy: false,
                 id: '',
@@ -214,8 +217,20 @@
             goAllPingjia() {
                 // 跳转到全部评价
                 uni.navigateTo({
-                     url:"/pages/PingJiaList/PingJiaList"
-                 })
+                    url: "/pages/PingJiaList/PingJiaList"
+                })
+            },
+            addCarClick() {
+                
+                this.$refs.uToast.show({
+                    type: 'default',
+                    message: "加入购物车成功",
+                })
+            },
+            ClickBuy(){
+                uni.navigateTo({
+                    url:'/pages/ShoppingCart/ShoppingCart'
+                })
             }
         },
         onLoad(option) {
@@ -364,13 +379,13 @@
             align-items: center;
 
             .col_icon {
-                width: 40rpx;
-                height: 40rpx;
+                width: 52rpx;
+                height: 52rpx;
             }
         }
 
         .addCar {
-            width: 284rpx;
+            width: 250rpx;
             height: 80rpx;
             line-height: 80rpx;
             // flex: 0 0 240rpx;
@@ -384,7 +399,7 @@
         }
 
         .buy {
-            width: 284rpx;
+            width: 250rpx;
             height: 80rpx;
             line-height: 80rpx;
             // flex: 1;
@@ -404,7 +419,7 @@
     }
 
     .zhanwei {
-        
+
         height: 1000rpx;
 
     }
diff --git a/src/pages/ReceivingAddress/EditAddresspge.vue b/src/pages/ReceivingAddress/EditAddresspge.vue
new file mode 100644
index 0000000..fcf5ba7
--- /dev/null
+++ b/src/pages/ReceivingAddress/EditAddresspge.vue
@@ -0,0 +1,81 @@
+<template>
+    <view style="width: calc( 100% - 64rpx); margin: 0 auto;">
+        <u--form :model="model1" ref="form1" labelWidth='auto' :labelStyle='{fontWeight:800}'>
+            <u-form-item prop="userInfo.name" ref="item1" label="收货姓名" class="data_itm" borderBottom>
+                <u--input style="padding: 32rpx;" placeholder="请输入收货人姓名" clearable v-model="model1.userInfo.name"
+                    border="none"></u--input>
+            </u-form-item>
+
+            <u-form-item prop="userInfo.name" ref="item1" label="手机号码" class="data_itm" borderBottom>
+                <u--input style="padding: 32rpx;" placeholder="请输入手机号码" clearable v-model="model1.userInfo.name"
+                    border="none"></u--input>
+            </u-form-item>
+
+
+            <u-form-item prop="userInfo.name" ref="item1" label="所在地区" class="data_itm" borderBottom
+                @click="showAddr=true">
+                <u--input style="padding: 32rpx;" placeholder="选择所在地区" readonly clearable v-model="model1.userInfo.name"
+                    border="none">
+                    <u-icon slot="suffix" name="arrow-right"></u-icon>
+                </u--input>
+            </u-form-item>
+
+            <u-form-item prop="userInfo.name" ref="item1" label="详细地址" class="data_itm">
+                <u--input style="padding: 32rpx;" placeholder="街道、楼门排号等" clearable v-model="model1.userInfo.name"
+                    border="none"></u--input>
+            </u-form-item>
+
+            <view class="save" style="padding: 4px 24rpx;">
+                <u-button text="保存" :customStyle="{'border-radius':'8rpx'}" size="large" throttleTime=1000
+                    color="#99241B" @click="goAddEditPGE"></u-button>
+            </view>
+        </u--form>
+
+
+
+        <u-picker :show="showAddr" :columns="columns"></u-picker>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                showAddr: false,
+                columns: [
+                    ['中国', '美国', '日本'],
+                    ['日'],
+                    ["jd"]
+                ],
+                model1: {
+                    userInfo: {
+                        name: '',
+                        sex: '',
+                        birthday: "",
+                        idCOde: '',
+                        zuValue: '',
+                        zhengzhiValue: '',
+                        phoneNum: '',
+                        meeting: '',
+                        meetingTime: '',
+                        ServerName: '',
+                        Address: ''
+
+                    },
+                }
+            };
+        },
+        onLoad(opt) {
+            console.log(opt.num);
+            uni.setNavigationBarTitle({
+                title: opt.name
+            })
+        }
+    }
+</script>
+
+<style lang="scss">
+    page {
+        background-color: #FFFFFF;
+    }
+</style>
diff --git a/src/pages/ReceivingAddress/ReceivingAddress.vue b/src/pages/ReceivingAddress/ReceivingAddress.vue
new file mode 100644
index 0000000..b4d8e9e
--- /dev/null
+++ b/src/pages/ReceivingAddress/ReceivingAddress.vue
@@ -0,0 +1,56 @@
+<template>
+    <view style="width: calc( 100% - 64rpx); margin: 0 auto;">
+
+        <view class="address_main" style="margin: 24rpx 0rpx 32rpx; background-color: #FFFFFF; border-radius: 8rpx;">
+            <view class="address_itm" v-for="(item,index) in 3" :key="index"
+                style="padding: 32rpx 24rpx 28rpx; border-bottom: 1rpx solid #EFEFF1;">
+                <view class="address_itm_top"
+                    style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 16rpx; font-weight: 600; font-size: 32rpx;">
+
+                    <view class="address_itm_top_text">
+                        <image style="width: 38rpx; height: 38rpx; vertical-align: bottom; margin-right: 16rpx;"
+                            src="../../static/selectID/gouXuan.png" mode=""></image>
+                        <text style="margin-right: 24rpx; ">王毅</text> <text> 16658525844</text>
+                    </view>
+                    <image style="width: 40rpx; height: 40rpx;" src="../../static/editAddress.png" mode=""
+                        @click="goEditAddress(index)"></image>
+                </view>
+                <text style="color: #AFADB0;">宁波市高新区智慧园A区</text>
+            </view>
+        </view>
+
+
+
+        <u-button text="添加收货地址" :customStyle="{'border-radius':'8rpx'}" size="large" icon="plus-circle"
+            iconColor="#FFFFFF" throttleTime=1000 color="#99241B" @click="goAddEditPGE"></u-button>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+
+            };
+        },
+        methods:{
+            goEditAddress(num){
+                
+                uni.navigateTo({
+                    url:  `/pages/ReceivingAddress/EditAddresspge?name=修改收货地址&num=${num}`
+                })
+            },
+            goAddEditPGE(){
+                uni.navigateTo({
+                    url: '/pages/ReceivingAddress/EditAddresspge?name=新建地址 '
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    page {
+        background-color: #F4F5F7;
+    }
+</style>
diff --git a/src/static/addAddressimg.png b/src/static/addAddressimg.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f49a7f6dc0c193d66f6f12485807650a0ae62a1
GIT binary patch
literal 946
zcmV;j15NyiP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&Y)M2xR9HvFmpzCbRTRhn|2vb+n~%3qArK28_=O>ef}q)L6f4bwVx<<Mg<qA#
z#uS2uU=b^^GHRh%m`)TDtV9cwRS*=3k)R>4g~1di`{r|Z<{mjSJL_|^``*0uW2Sfy
zX70K7ckVg&f6pO0J|Yrj+3KQ*JSdR60NhM+PR&JR1;7P@Kal*w_jjKp8F!hQ(*|9=
zn&0ZWauno~A`(s;uir@~5c#+)d2G*~!7r0+wgnIoFUgA6A@VYSUF(x96F4P;Gsd{*
zOUM3EzpttrjOA@4<^dcQ;HGtuRRP`#eeX4r#a19&0>p8=Pw0F?;80`4?+Lsb1m5Q)
z?Ie#x#H4BQkN|H0a(5jfV2M&a7Ddse&9>J76h(1oS=o~!>IGLI@=_QMKAN`h=7|*~
zN%E&az75D6iDlO@i=OBGI6n4o0O~o7^Q|r}zy(<I$Z+VL?GpFx#*9YAK^XfP>!ii9
z*y`T#o!9`-n8#`UrEWXPUv0HEKO7D(|C7aA+tFyW7sg#u2n|OR3?686Vgn#f^J5Ts
zMYmln7rJ<!W!e3@i0}JfO#{`PppnxW4v=p~!Qg0}UHYR(&2i<YI@<-$M3MjDv<dZl
zoMgZ0e-!#Rb{ZdNPlNb?<Z8KwgL*`3fF#M@6X03R_Av17>6&nHl3r;5g6p~f)QOoE
z-|6Wf@O~Kj&ruaF&5BDZG6WaHaB!;2WX%rD2GBU09~OuzWfJ(_KBj5$xD|T>z;YN2
z_ILGurvQyk<QG+}49ycvlKi+po+ofT4E-0odcRYE^^m_KzzYQ5Wt?P70PdS5`C7=G
zgrEjrPeuUWD8TOk_8Q7U5Cmubj~z(UwRtP$X#kg*q<O9)WL<M$&hvgA2hej~S)2gG
z-x{pBj)D3*-u5AR#dXZXp68v@K`TXZhbiqj6{G$E`Ut^Fnl2dO*L4VbPr}}hVedlJ
zyA=0+8MW83y9;MUWcMtJII9x23V6+RT+8DQ3X)j>CKe>MmW`EUO+8p1npTn}X?9U<
z!@%D^NeQ(iGmg6?GNB}EE{VU2(xxutqmxRrq9_iiT`RF$L8#}(kxxbBmWf4aYusyD
zzH!a=*_gBtZEHs0NPRk*XRI}o^QGg|t(jX@*IUcm|Fza^JeIvRr<)V%ziQ9_1o(@Y
USxjE?oB#j-07*qoM6N<$f=B(m{{R30

literal 0
HcmV?d00001

diff --git a/src/static/editAddress.png b/src/static/editAddress.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0126f5fbbc64731a9dd6f612b1c11fd9c88c311
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px&I!Q!9R9Hvt*gI^~Ko|$`?|gRBiUJElVy%RPkQf*cMIa#rRY?3wSST$cl@RK}
z#KwTcj+j^q1;k3?ixaaTgm_8}42($Z6tR>R)Wp6Ixr&kFB!0wp#88jP`R?cc-TBT(
z5Rt-ve34yX%HA28pk-NmpbN)r$1cXLpHjL}(JG&#%A2M+Tja&9d2RlCR9W}`0bt8$
zo$EUGGXOXkrviT&LSRL&=?_NTXVlFlL}wKcep8_+tF?<CqT1*Ky2)+->3kgrxAU|i
zz#i@)0C<z~7bV3?6tWN4tT#_N$lth)2?DuIki3g}Lht{uF7Cr2Yyp9(9yAge1fF$}
zzjPa=L^!Y3)Yox=qslcK%|(avM;?e!Q6}7(<%p|skhubbIEjj~tjq7+hhdCe<+dLw
zRMeU}FeY;YHX6-E@FnNRd1?ERgpdsZh#W-b0t`zoI28JlMA(>~nL1J`mDas-nFE8#
z2_jK6O&dAcEN0DZ+npBxFhdBjsU#d#6y;kkK-OSaIL9?_@C%}(Xj&x{*KxXSMBE1e
z4i$uJYE^yO_ipvC#m#zi>{;B8!%aaf$YD6ftT~Lp4Xh;N0)x1MSdc3r$+<Z0blQM0
zGP%sUI8R*a1WjfxI1XP!L=gZsDG?O4roJ8Z(oT|G>I4}x7cghs*a=PwHx`i9%>{&f
zyLIf>jA@vc9nK&B8*@@YQPpxLW6r1>*Iig}KN))^X&J2xHg`-92Le^ARb^*uHtb3=
zA=<2cykmDix%Cu8>4bl09vjG>vwIwH1pqoA&{9@77ZvvYjSVy!#(m^)1AzRfUeXR_
zk(^h@#DI*kIo`!Kkmwb{|9}$#wv5)vu5DXMaTDp{AdV1N)@%BcxStCdCkPyX{OoTW
z_q!9&-7*mh%eo#PmtBH&<1QlH3Q1)wTxLMV*a39#CJ@*=fJ8u%ik7U&?#?*zl}Q&T
zZZ*LTyTAlt4J{fw!QL0v&f=f+=pzjh37+O0@3?go#lo4gR{rSKm+9eA8f5R@_2P8l
zaJgLG8VYoOOmqB}61Xl=aY@$YSN?i3JHSkX6REfj5`6I|H!{IA4drp~?jd^GRR03V
W0KHbGhQ)ON0000<MNUMnLSTaL<&t>-

literal 0
HcmV?d00001