From 2d251faff1e13d8af4f11b52aba4f43494ef1199 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Wed, 13 Sep 2023 09:36:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                     |  1 +
 pages/mine/set/personMsg.vue   |  6 +++---
 pages/tabbar/cart/cartList.vue | 10 +++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pages.json b/pages.json
index c4a68d0..e16ad50 100644
--- a/pages.json
+++ b/pages.json
@@ -36,6 +36,7 @@
 			"path": "pages/tabbar/cart/cartList",
 			"style": {
 				"navigationBarTitleText": "购物车",
+				"navigationStyle": "custom", // 隐藏系统导航栏
 				"navigationBarBackgroundColor": "#fff",
 				"enablePullDownRefresh":true    //实现下拉刷新样式
 
diff --git a/pages/mine/set/personMsg.vue b/pages/mine/set/personMsg.vue
index c1c4408..f7fb2c5 100644
--- a/pages/mine/set/personMsg.vue
+++ b/pages/mine/set/personMsg.vue
@@ -16,11 +16,11 @@
       </u-form-item>
 
       <u-form-item label="生日" label-width="150" right-icon="arrow-right">
-        <u-input v-model="birthday" disabled placeholder="请选择出生日期" @click="showBirthday = true" />
-        <u-picker v-model="showBirthday" mode="time" :confirm-color="lightColor" @confirm="selectTime"></u-picker>
+        <div style="width: 100%;" @click="showBirthday = true">{{ birthday || '请选择出生日期' }}</div>
+       <u-picker v-model="showBirthday" mode="time" :confirm-color="lightColor" @confirm="selectTime"></u-picker>
       </u-form-item>
       <u-form-item label="城市" label-width="150" placeholder="请选择城市" right-icon="arrow-right">
-        <u-input v-model="form.___path" disabled @click="clickRegion" />
+        <div style="width: 100%;" @click="clickRegion">{{ form.___path || '请选择城市' }}</div>
       </u-form-item>
       <view class="submit" @click="submit">保存</view>
 	    <view class="submit" @click="quiteLoginOut">退出登录</view>
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index d1b6f16..6d736cc 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -1,5 +1,10 @@
 <template>
   <div class="wrapper">
+    <u-navbar :is-back="false" title="购物车">
+      <div slot="right">
+        <div class="light-color edit" @click="isEdit = !isEdit">{{ !isEdit ? '编辑' : '完成'}}</div>
+      </div>
+    </u-navbar> 
     <!-- 空白页-->
     <view v-if="!loading && (cartDetail.cartList == '' || cartDetail.cartList == [] || !cartDetail)" class="empty">
       <image src="/static/emptyCart.png" mode="aspectFit"></image>
@@ -8,7 +13,6 @@
         <navigator class="navigator" url="/pages/tabbar/home/index" open-type="switchTab">随便逛逛></navigator>
       </view>
     </view>
-
     <!-- 店铺商品信息 -->
     <div class="content">
       <div class="box box2" :class="{ invalid: isInvalid(item) }" v-for="(item, index) in cartDetail.cartList"
@@ -554,6 +558,10 @@ page {
 .u-image {
   box-shadow: 0 4rpx 12rpx 0 rgba(0, 0, 0, 0.05);
 }
+.edit{
+  padding-right: 32rpx;
+  font-size: 28rpx;
+}
 .promotion-notice {
   margin-top: 10px;
   margin-left: 68rpx;