app.json

@@ -2,7 +2,12 @@
   "pages": [
     "pages/index/index",
     "pages/search/index",
+<<<<<<< HEAD
+    "pages/me/me",
+    "pages/exchange/exchange"
+=======
     "pages/me/me"
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -13,6 +18,22 @@
   "tabBar": {
     "color": "#CBCBCB",
     "selectedColor": "#F9872C",
+<<<<<<< HEAD
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "text": "首页",
+        "iconPath": "/images/icon/index.png",
+        "selectedIconPath": "/images/icon/index-select.png"
+      },
+      {
+        "pagePath": "pages/me/me",
+        "text": "我的",
+        "iconPath": "/images/icon/me.png",
+        "selectedIconPath": "/images/icon/me-select .png"
+      }
+    ]
+=======
     "list": [{
       "pagePath": "pages/index/index",
       "text": "首页",
@@ -24,6 +45,7 @@
       "iconPath": "/images/icon/me.png",
       "selectedIconPath": "/images/icon/me-select .png"
     }]
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   },
   "usingComponents": {
     "van-button": "@vant/weapp/button"

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.json

@@ -3,7 +3,11 @@
     "van-button": "@vant/weapp/button",
     "van-search": "@vant/weapp/search/index",
     "van-row": "@vant/weapp/row/index",
+<<<<<<< HEAD
+    "van-col": "@vant/weapp/col/index"
+=======
     "van-col": "@vant/weapp/col/index",
     "van-icon": "@vant/weapp/icon/index"
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   }
 }

pages/index/index.wxml

@@ -1,3 +1,10 @@
+<<<<<<< HEAD
+<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 class="search_container">
   <view class="inputContent">
@@ -5,6 +12,7 @@
     <input type="text" bindinput="onInput" bindconfirm="onInput" placeholder="搜索商品名称" />
     <button bindtap="onSearch" bintap="onSearch">搜索</button>
   </view>
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
 
   <!-- 主页轮播图 -->
   <swiper class="swiper" indicator-dots indicator-color="#CBCBCB" indicator-active-color="#F9872C" autoplay interval="2000" circular>
@@ -17,6 +25,10 @@
     </swiper-item>
   </swiper>
 
+<<<<<<< HEAD
+<!-- 商品标签页 -->
+=======
   <!-- 商品标签页 -->
  
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
 </view>

pages/index/index.wxss

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
+/* 轮播图样式 */
+.swiper {
+  height: 270rpx ;
+=======
 /* 搜索框样式 */
 .inputContent {
   width: 95%;
@@ -33,6 +38,7 @@
 /* 轮播图样式 */
 .swiper {
   height: 270rpx;
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   margin: 20rpx;
   border-radius: 10px;
 }
@@ -42,3 +48,7 @@
   width: 100%;
   height: 100%;
 }
+<<<<<<< HEAD
+
+=======
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78

pages/me/me.js

@@ -1,6 +1,10 @@
 // pages/me/me.js
 Page({
+<<<<<<< HEAD
+  
+=======
 
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   /**
    * 页面的初始数据
    */
@@ -13,8 +17,13 @@ Page({
    */
   onLoad(options) {
 
+<<<<<<< HEAD
+   
+  },
+=======
   },
 
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/me/me.json

@@ -1,3 +1,14 @@
 {
+<<<<<<< HEAD
+  "usingComponents": {
+    "van-image": "@vant/weapp/image/index",
+    "van-icon": "@vant/weapp/icon/index"
+  },
+  "navigationBarTitleText": "我的"
+  }
+ 
+  
+=======
   "usingComponents": {}
-}
+}
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78

pages/me/me.wxml

@@ -1,2 +1,59 @@
 <!--pages/me/me.wxml-->
+<<<<<<< HEAD
+<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>
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78

pages/me/me.wxss

@@ -1 +1,203 @@
-/* pages/me/me.wxss */
+<<<<<<< HEAD
+/* 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/me/me.wxss */
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78

pages/search/index.js

@@ -123,6 +123,10 @@ Page({
  
   onSearch() {
     let list = this.data.foods;
+<<<<<<< HEAD
+    // 给你一个数组  里面包含a这个字的元素  将这些元素抛入新数组 
+=======
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
     let inputData = this.data.info
     let showList = [];
     for (let i = 0; i < list.length; i++) {

pages/search/index.json

@@ -6,5 +6,9 @@
     "van-row": "@vant/weapp/row",
     "van-col": "@vant/weapp/col",
     "van-submit-bar": "@vant/weapp/submit-bar"
+<<<<<<< HEAD
+
+=======
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   }
 }

project.config.json

@@ -47,7 +47,11 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.4",
+<<<<<<< HEAD
+  "appid": "wx14d5f43259cae512",
+=======
   "appid": "wxc06fe0355f1e6452",
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   "projectname": "miniprogram-92",
   "condition": {},
   "editorSetting": {

project.private.config.json

@@ -4,7 +4,11 @@
   "setting": {
     "compileHotReLoad": true
   },
+<<<<<<< HEAD
+  "libVersion": "2.10.4",
+=======
   "libVersion": "2.19.6",
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   "condition": {
     "miniprogram": {
       "list": [