修改地址1

app.json

@@ -3,7 +3,8 @@
     "pages/index/index",
     "pages/search/index",
     "pages/me/me",
-    "pages/address/index"
+    "pages/address/index",
+    "pages/confirm/confirm"
   ],
   "window": {
     "backgroundTextStyle": "light",

pages/confirm/confirm.js

@@ -0,0 +1,66 @@
+// pages/confirm/confirm.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/confirm/confirm.json

@@ -0,0 +1,12 @@
+{
+  "usingComponents": {
+    "van-button": "@vant/weapp/button/index",
+    "van-nav-bar": "@vant/weapp/nav-bar/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "van-image": "@vant/weapp/image/index"
+  }
+}

pages/confirm/confirm.wxml

@@ -0,0 +1,65 @@
+<view class="confirm-top1">
+  <view class="address">
+    <!-- <van-cell-group inset> -->
+      <van-cell title="哈尔滨师范大学第一公寓2门312室" label="吴迪(先生)182****2898" />
+    <!-- </van-cell-group> -->
+  </view>
+
+  <view class="products">
+      <view class="products-top">      
+        <van-cell >
+          <text class="text0">二楼麻辣烫、麻辣香锅、麻辣拌饭</text>
+        </van-cell>
+        <van-cell border="{{true}}">
+          <image class='img-1' src='/images/confirm/canting.png' slot="icon"></image>
+          <text class="text1">麻辣烫微辣微麻</text>
+          <text class="text2">￥10.98+40积分</text>
+          <text class="text3">*2</text>
+          <text class="text4">￥28.80</text>
+        </van-cell>
+      </view>
+      <view class="products-content">
+        <van-cell 
+        value="￥0" 
+        label="包装费"
+        value-class="cell-value1"/>
+      </view>
+      <view class="products-bottom">
+        <van-cell value="￥3" label="付款费" value-class="cell-value1" />
+      </view>
+      <view class="products-bottom2">
+        <van-cell value="" label=""  border="{{false}}"/>
+      </view>
+  </view>
+
+  <view class="remark">
+      <view class="remark-left">备注</view>
+      <view class="remark-right">不要香菜</view>
+  </view>
+  
+  <view class="message">
+      <view class="message-left">订单编号:</view>
+      <view class="message-right">203266522255666</view>
+  </view>
+  <view class="message">
+      <view class="message-left">交易时间:</view>
+      <view class="message-right">2022-06-03 13:19:08</view>
+  </view>
+  <view class="message">
+      <view class="message-left">积分抵扣:</view>
+      <view class="message-right">40积分</view>
+  </view>
+  <view class="message">
+      <view class="message-left" value-class="cell-value1">实付金额:</view>
+      <view class="message-right2">￥21.80</view>
+  </view>
+  
+  <view class="kong">
+      <van-cell value="" label=""  border="{{false}}"/>
+      <van-cell value="" label=""  border="{{false}}"/>
+      <van-cell value="" label=""  border="{{false}}"/>
+      <van-cell value="" label=""  border="{{false}}"/>
+      <van-cell value="" label=""  border="{{false}}"/>
+  </view>
+   
+</view>

pages/confirm/confirm.wxss

@@ -0,0 +1,107 @@
+/* pages/confirm/confirm.wxss */
+page{
+  background-color: rgb(243, 241, 241) ;
+}
+
+.products{
+  padding-top: 10rpx;
+}
+.text0{
+  float: left;
+  font-size: 26rpx;
+  color: #000;
+  height: 40rpx;
+}
+.img-1{
+  width: 180rpx;
+  height: 110rpx;
+  padding-right: 20rpx;
+}
+.text1{
+  float: left;
+  font-size: 26rpx;
+  color: #000;
+}
+.text2{
+  float: right;
+  font-size: 26rpx;
+  color: red;
+}
+.text3{
+  float: left;
+  padding-top: 24rpx;
+  margin-right: 100rpx;
+  font-size: 26rpx;
+}
+.text4{
+  float: right;
+  font-size: 24rpx;
+  text-decoration: line-through;
+}
+.products-bottom2{
+height: 70rpx;
+background-color: white;
+margin-bottom: 10rpx;
+}
+.cell-value1{
+  color: red !important;
+  font-size: 24rpx !important;
+}
+.cell-value2{
+  font-size: 24rpx !important;
+}
+.remark{
+ padding-top: 10rpx;
+ padding-bottom: 10rpx;
+ height: 60rpx;
+ background: white;
+ margin-bottom: 10rpx;
+}
+/* 使用伪类添加边框 */
+/* .remark::after {
+    content: '';
+    width: 90%;
+    height: 10px;
+    display: block;
+    margin: 0 auto;
+    border-bottom: 1px solid red;
+} */
+.remark-left{
+  padding-top: 12rpx;
+  padding-left: 30rpx;
+  font-size: 24rpx;
+}
+.remark-right{
+  margin-top: -32rpx;
+  padding-left: 110rpx;
+  font-size: 24rpx;
+  padding-top: -30rpx;
+  color: #a5a5a5;
+}
+.message{
+  padding-top: 10rpx;
+  padding-left: 30rpx;
+  padding-bottom: -10rpx;
+  height: 56rpx;
+  background: white;
+  /* border-bottom: 5px solid red; */
+}
+.message-left{
+  padding-top: 12rpx;
+  font-size: 24rpx;
+}
+.message-right{
+  margin-top: -30rpx;
+  padding-left: 115rpx;
+  font-size: 24rpx;
+  color: #a5a5a5;
+} 
+.message-right2{
+  margin-top: -30rpx;
+  padding-left: 115rpx;
+  font-size: 24rpx;
+  color: red;
+}
+.kong{
+  padding-top: 10rpx;
+}

pages/exchange/exchange.js

@@ -0,0 +1,66 @@
+// pages/exchange/exchange.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/exchange/exchange.json

@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index"
+  },
+  "navigationBarTitleText": "我的积分"
+}

pages/exchange/exchange.wxml

@@ -0,0 +1,118 @@
+<!--pages/exchange/exchange.wxml-->
+<view class="container">
+<view class="pic">
+<navigator>积分获取规则></navigator>
+<view class="pic-content">
+  <view class="fo-money"><van-icon name="points" color="orange"  size="1.4em"/></view>
+      <view class="exchange">积分</view>
+      <view class="number">708</view>
+</view>
+</view>
+<view class="choice">
+  <van-tabs active="a" title-active-color="orange" title-inactive-color="#D3D3D3	">
+  <van-tab title="入账中" name="a" >
+  <view class="cho-con">
+  <view class="con-box">
+    <view class="con-left">
+  <view>完成订单</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">+40</view>
+  </view>
+
+  <view class="con-box">
+    <view class="con-left">
+  <view>完成订单</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">+40</view>
+  </view>
+
+  <view class="con-box">
+    <view class="con-left">
+  <view>积分兑换</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">-600</view>
+  </view>
+
+  <view class="con-box">
+    <view class="con-left">
+  <view>积分兑换</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">-200</view>
+  </view>
+
+  <view class="con-box">
+    <view class="con-left">
+  <view>积分兑换</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">-400</view>
+  </view>
+
+  <view class="con-box">
+    <view class="con-left">
+  <view>完成订单</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">+60</view>
+  </view>
+  </view>
+ 
+  </van-tab>
+  <van-tab title="收支明细" name="b">
+    <view class="cho-con">
+  <view class="con-box">
+    <view class="con-left">
+  <view>完成订单</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">-200</view>
+  </view>
+
+  <view class="con-box">
+    <view class="con-left">
+  <view>完成订单</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">-600</view>
+  </view>
+
+  <view class="con-box">
+    <view class="con-left">
+  <view>完成订单换</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">-600</view>
+  </view>
+
+  <view class="con-box">
+    <view class="con-left">
+  <view>完成订单</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">-200</view>
+  </view>
+
+  <view class="con-box">
+    <view class="con-left">
+  <view>完成订单</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">-400</view>
+  </view>
+
+  <view class="con-box">
+    <view class="con-left">
+  <view>完成订单</view>
+  <view>2023-05-04 18:18:25</view>
+  </view>
+  <view class="con-right">-600</view>
+  </view>
+  </view>
+  </van-tab>
+</van-tabs>
+</view>
+</view>

pages/exchange/exchange.wxss

@@ -0,0 +1,89 @@
+/* pages/exchange/exchange.wxss */
+.container{
+  width: 100vh;
+  height: 100vh;
+  background:		#F5F5F5;
+  position: relative;
+}
+
+.pic{
+  width: 90vw;
+  height: 30vh;
+  background: url(https://bpic.588ku.com/back_list_pic/22/02/11/d2a841fc6bb7d3571d59cbb792cd0844.jpg!/fw/630/quality/90/unsharp/true/compress/true);
+  background-size: 100%;
+  background-repeat: no-repeat;
+  position: absolute;
+  top: 4vh;
+  left: 5vw;
+  border-radius: 20px 20px 0 0;
+}
+
+.pic navigator{
+  display: inline-block;
+  position: absolute;
+  top: 3vh;
+  right: 5vw;
+  font-size: 0.8rem;
+}
+
+.pic-content{
+  position: absolute;
+  left: 7vw;
+  top: 10vh;
+  font-size: 0.8rem;
+}
+
+.fo-money{
+  display: inline-block;
+}
+.exchange{
+  display: inline-block;
+  margin-left: 3vw;
+}
+.number{
+  text-align: center;
+  margin-top:1.5vh ;
+  font-size: 1.8rem;
+}
+.choice{
+  width: 100vw;
+  height: 70vh;
+ background: #fff;
+  position: absolute;
+  top: 30vh;
+  left: 0;
+}
+
+.cho-con{
+  width: 90vw;
+  height: 60vh;
+  /* background: pink; */
+  margin: auto;
+}
+.con-box{
+  width: 90vw;
+  height: 10vh;
+  /* background: red; */
+  border-bottom: 1px solid #F5F5F5	;
+  border-top: 1px solid #F5F5F5	;
+}
+.con-left{
+  margin-top: 2vh;
+  display: inline-block;
+}
+.con-left view:nth-child(1) {
+  font-size: 1rem;
+  font-weight: 800;
+}
+
+.con-left view:nth-child(2) {
+  font-size: 0.7rem;
+  color:#D3D3D3 ;
+}
+.con-right{
+  margin-top: 3vh;
+  margin-right: 5vw;
+  display: inline-block;
+  float: right;
+  color: orange;
+}

pages/index/index.wxml

@@ -1,3 +1,9 @@
+<view class="index">
+  <!-- 搜索栏 -->
+  <van-search value="{{ value }}" placeholder="请输入商家名称" use-action-slot bind:change="onChange" bind:search="onSearch">
+    <view slot="action" bind:tap="onClick">搜索</view>
+  </van-search>
+</view>
 <!-- 搜索框 -->
 <view class="search_container">
   <view class="inputContent">
@@ -6,6 +12,7 @@
     <button bindtap="onSearch" bintap="onSearch">搜索</button>
   </view>
 
+
   <!-- 主页轮播图 -->
   <swiper class="swiper" indicator-dots indicator-color="#CBCBCB" indicator-active-color="#F9872C" autoplay interval="2000" circular>
     <swiper-item>
@@ -17,6 +24,9 @@
     </swiper-item>
   </swiper>
 
+
   <!-- 商品标签页 -->
- 
+
+  <!-- 商品标签页 -->
+
 </view>

pages/index/index.wxss

@@ -1,3 +1,8 @@
+
+/* 轮播图样式 */
+.swiper {
+  height: 270rpx ;
+}
 /* 搜索框样式 */
 .inputContent {
   width: 95%;

pages/me/me.js

@@ -13,6 +13,8 @@ Page({
    */
   onLoad(options) {
 
+
+   
   },
 
   /**

pages/me/me.json

@@ -1,3 +1,7 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "van-image": "@vant/weapp/image/index",
+    "van-icon": "@vant/weapp/icon/index"
+  },
+  "navigationBarTitleText": "我的"
 }

pages/me/me.wxml

@@ -1,2 +1,57 @@
 <!--pages/me/me.wxml-->
+<view class="container">
+  <!-- 个人信息 -->
+  <view class="message">
+    <view class="msg-top">
+      <view class="msg-photo">
+        <van-image round width="14vw" height="9vh" src="https://img.yzcdn.cn/vant/cat.jpeg" />
+      </view>
+      <view class="msg-content">
+      <view class="name">昵称昵称昵称</view><view class="symbol">学生认证</view>
+      <view class="number">132****2159</view>
+      <navigator url="../exchange/exchange">
+        <view class="fo-money"><van-icon name="points" color="orange"  size="1.4em"/></view>
+      <view class="exchange">501</view>
+      </navigator>
+       
+
+     
+      </view>
+    </view>
+    <!-- 社保卡 -->
+    <view class="msg-bottom">
+    <view class="shebao">
+    <view class="shebao-con">
+    <text>民生银行社保卡</text>
+    <text>6250**** ****0299</text>
+    <view>我是一个三代社保卡使用者</view>
+    </view>
+    
+    </view>
+    </view>
+  </view>
+
+  <view class="order">
+  <view class="order-top">
+  <text>我的订单</text><van-icon name="arrow" class="order-font" />
+  </view>
+  <view class="order-bottom">
+   <view class="order-img">
+   <view class="img-box"><van-icon name="paid" size="3.5rem" class="omg" color="#fff"/></view>
+    <view>待支付</view>
+   </view>
+   <view class="order-img2">
+   <view class="img-box2"><van-icon name="logistics" size="3.5rem" class="omg" color="#fff"/></view>
+    <view>待支付</view>
+   </view>
+   <view class="order-img3">
+   <view class="img-box3"><van-icon name="completed" size="3.5rem" class="omg" color="#fff"/></view>
+    <view>待支付</view>
+   </view>
+  </view>
+  </view>
+
+  <view class="other"></view>
+</view>
+
 <text>pages/me/me.wxml</text>

pages/me/me.wxss

@@ -1 +1,201 @@
-/* pages/me/me.wxss */
+
+/* pages/me/me.wxss */
+.container{
+  width: 100vh;
+  height: 100vh;
+  background:		#F5F5F5;
+  position: relative;
+}
+
+.message{
+  position: absolute;
+  width: 100vw;
+  height: 40vh;
+  background:#fff;
+  top: 1vh;
+  left: 0;
+}
+
+.msg-top{
+  width: 100vw;
+  height: 16vh;
+  /* background: red; */
+  margin-top: 2vh;
+  position: relative;
+}
+
+.msg-photo{
+  width: 20vw;
+  height: 14vh;
+  position: absolute;
+  left: 4vw;
+  
+}
+
+.msg-content{
+  width: 74vw;
+  height: 16vh;
+  position: absolute;
+  left: 20vw;
+  font-size: 0.8rem;
+  position: relative;
+}
+
+.name{
+  margin-bottom: 0.5vh;
+  display: inline-block;
+}
+
+.symbol{
+  position: absolute;
+  width: 15vw;
+  height: 4vh;
+  margin-left: 5vw;
+  display: inline-block;
+  background:#66CDAA;
+  opacity: 0.9;
+  font-size: 0.7rem;
+  text-align: center;
+  border-radius: 5px;
+  line-height: 4vh;
+  top: -0.5vh;
+}
+.number{
+  margin-top: 1vh;
+}
+.exchange{
+  margin-top: 1.5vh;
+}
+.fo-money{
+  display: inline-block;
+}
+.exchange{
+  display: inline-block;
+  margin-left: 2vw;
+  color: orange;
+  font-weight: 800;
+}
+.msg-bottom{
+  width: 100vw;
+  height: 22vh;
+  /* background: yellow; */
+  /* margin-top: 1vh; */
+}
+
+.shebao{
+  width: 90vw;
+  height: 20vh;
+  margin: auto;
+  border-radius: 0.8rem 0.8rem 50% 50%;
+  background: rgb(245, 94, 24);
+  color: #fff;
+  position: relative;
+}
+.shebao-con{
+  width: 80vw;
+  height: 15vh;
+  position: absolute;
+  top: 2.5vh;
+  left: 5vw;
+}
+.shebao-con text:nth-child(2){
+  float: right;
+}
+.shebao-con view{
+  font-size: 0.8rem;
+}
+
+.order{
+  width: 100vw;
+  height: 27vh;
+  background: #fff;
+  position: absolute;
+  top: 43vh;
+  left: 0;
+}
+
+.order-top{
+  margin-top: 1vh;
+}
+.order-top text:nth-child(1){
+  margin-top: 1vh;
+  margin-left: 2vw;
+}
+.order-font{
+  float: right;
+  margin-right:5vw ;
+}
+.order-bottom{
+  width: 100vw;
+  height: 21vh;
+  margin-top:1vh;
+  /* background: pink; */
+  position: relative;
+}
+.order-img{
+  height: 15vh;
+  width: 20vw;
+  /* background: yellow; */
+  position: absolute;
+  top: 3vh;
+  margin-left:10vw ;
+  font-size: 0.8rem;
+  text-align: center;
+}
+
+.img-box{
+  background: 	#FF7F50;
+  border-radius: 25px;
+  width: 20vw;
+  height: 12vh;
+}
+.omg{
+  margin-top: 1vh;
+}
+.order-img2{
+  height: 15vh;
+  width: 20vw;
+  /* background: yellow; */
+  position: absolute;
+  top: 3vh;
+  left: 30vw;
+  margin-left:10vw ;
+  font-size: 0.8rem;
+  text-align: center;
+}
+
+.order-img3{
+  height: 15vh;
+  width: 20vw;
+  /* background: yellow; */
+  position: absolute;
+  top: 3vh;
+  left: 60vw;
+  margin-left:10vw ;
+  font-size: 0.8rem;
+  text-align: center;
+}
+
+.img-box2{
+  background: #87CEFA;
+  border-radius: 25px;
+  width: 20vw;
+  height: 12vh;
+}
+
+.img-box3{
+  background: 	#00FA9A;
+  border-radius: 25px;
+  width: 20vw;
+  height: 12vh;
+}
+
+.other{
+  width: 100vw;
+  height: 27vh;
+  background: #fff;
+  position: absolute;
+  top: 72vh;
+  left: 0;
+}
+

pages/search/index.json

@@ -6,6 +6,5 @@
     "van-row": "@vant/weapp/row",
     "van-col": "@vant/weapp/col",
     "van-submit-bar": "@vant/weapp/submit-bar"
-
   }
 }

pages/search/index.wxml

@@ -46,7 +46,4 @@
     <van-submit-bar  price="{{ totalPrice*100 }}" button-text="去结算" bind:submit="onSubmit" />
   </view>
   </view>
-
-
-  
 </view>

project.config.json

@@ -50,5 +50,7 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wx5cb55b328049406b"
+  "appid": "wx00b296c6fce7bfcb",
+  "projectname": "delivery-customer",
+  "libVersion": "2.19.6"
 }

project.private.config.json

@@ -1,30 +1,11 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "delivery-customer",
-  "setting": {
-    "compileHotReLoad": true
-  },
-  "libVersion": "2.19.6",
   "condition": {
     "miniprogram": {
       "list": [
-        {
-          "name": "商家页面——搜索",
-          "pathName": "pages/merchant_page/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/search/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "",
-          "pathName": "pages/index/index",
+          "pathName": "pages/confirm/confirm",
           "query": "",
           "launchMode": "default",
           "scene": null