liuxinyang 1 жил өмнө
parent
commit
28cc13e564

+ 2 - 1
app.json

@@ -10,7 +10,8 @@
     "pages/address/address",
     "pages/address/address",
     "pages/change/change",
     "pages/change/change",
     "pages/new/new",
     "pages/new/new",
-    "pages/success/success"
+    "pages/success/success",
+    "pages/Integral/Integral"
   ],
   ],
   "window": {
   "window": {
     "backgroundTextStyle": "light",
     "backgroundTextStyle": "light",

+ 66 - 0
pages/Integral/Integral.js

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

+ 0 - 0
pages/Integral/my-Integral.json → pages/Integral/Integral.json


+ 142 - 0
pages/Integral/Integral.wxml

@@ -0,0 +1,142 @@
+<view>
+  <view class="box-top">
+    <!-- 积分左 -->
+    <view class="box-left">
+      <!-- jifen icon -->
+      <view class="little-box">
+        <view class="icon">
+          <image class="img-2" src="../my/images/20积分 (1).png" mode="" />
+        </view>
+        <view class="jifen">
+          积分
+        </view>
+      </view>
+      <view class="number">
+        708
+      </view>
+    </view>
+    <!-- 右 -->
+    <view class="box-right">
+      积分获取规则 >
+    </view>
+  </view>
+  <view class="bill">
+    <!-- 入账种 和明细 -->
+  </view>
+  <view class="bottom">
+    <view>
+      <van-tabs sticky class="order-tabs">
+        <van-tab title="入账中" class="tittle1">
+          <van-divider />
+          <view class="box">
+            <view>
+              <view class="complete">
+                完成订单
+              </view>
+              <view class="box-calendar">
+                <view class="date">
+                  2019-03-29
+                </view>
+                09:57:30
+              </view>
+            </view>
+            <view class="right-jiafen">
+              +40
+            </view>
+          </view>
+          <van-divider />
+          <view class="box">
+            <view>
+              <view class="complete">
+                完成订单
+              </view>
+              <view class="box-calendar">
+                <view class="date">
+                  2019-03-29
+                </view>
+                09:57:30
+              </view>
+            </view>
+            <view class="right-jiafen">
+              +40
+            </view>
+          </view>
+          <van-divider />
+          <view class="box">
+            <view>
+              <view class="complete">
+                完成订单
+              </view>
+              <view class="box-calendar">
+                <view class="date">
+                  2019-03-29
+                </view>
+                09:57:30
+              </view>
+            </view>
+            <view class="right-jiafen">
+              +40
+            </view>
+          </view>
+          <van-divider />
+          <view class="box">
+            <view>
+              <view class="complete">
+                完成订单
+              </view>
+              <view class="box-calendar">
+                <view class="date">
+                  2019-03-29
+                </view>
+                09:57:30
+              </view>
+            </view>
+            <view class="right-jiafen">
+              +40
+            </view>
+          </view>
+          <van-divider />
+          <view class="box">
+            <view>
+              <view class="complete">
+                完成订单
+              </view>
+              <view class="box-calendar">
+                <view class="date">
+                  2019-03-29
+                </view>
+                09:57:30
+              </view>
+            </view>
+            <view class="right-jiafen">
+              +40
+            </view>
+          </view>
+          <van-divider />
+          <view class="box">
+            <view>
+              <view class="complete">
+                完成订单
+              </view>
+              <view class="box-calendar">
+                <view class="date">
+                  2019-03-29
+                </view>
+                09:57:30
+              </view>
+            </view>
+            <view class="right-jiafen">
+              +40
+            </view>
+          </view>
+          <van-divider />
+
+        </van-tab>
+        <van-divider />
+        <van-tab title="|"></van-tab>
+
+        <van-tab title="收支明细">内容 2</van-tab>
+      </van-tabs>
+    </view>
+  </view>
+</view>

+ 33 - 7
pages/Integral/my-Integral.wxss → pages/Integral/Integral.wxss

@@ -67,34 +67,60 @@ page {
 .account {
 .account {
   font-size: 30rpx;
   font-size: 30rpx;
 }
 }
+.order-tabs{
+border: 1rpx solid #fa5840;
+}
 
 
 .order-tabs .van-tab--active .van-ellipsis {
 .order-tabs .van-tab--active .van-ellipsis {
   color: #ff8700;
   color: #ff8700;
+  /* font-size: 40rpx; */
+
+}
+
+.van-ellipsis {
+  font-size: 32rpx;
+  margin: 0 auto;
+  line-height: 110rpx;
+
 }
 }
 
 
+.van-ellipsis {
+
+}
+.van-ellipsis tittle1{
+display: none;
+}
 .van-tabs__line {
 .van-tabs__line {
   display: none;
   display: none;
 }
 }
-.box{
+
+.box {
   box-sizing: border-box;
   box-sizing: border-box;
   display: flex;
   display: flex;
   justify-content: space-between;
   justify-content: space-between;
-  padding: 0%  13% 0%;
+  padding: 0% 13% 0%;
 }
 }
-.complete{
 
 
-font-weight: 800;
+.complete {
+  font-size: 33rpx;
+  font-family: Fantasy;
 }
 }
-.box-calendar{
+
+.box-calendar {
   display: flex;
   display: flex;
   color: #b4b4b4;
   color: #b4b4b4;
   font-size: 28rpx;
   font-size: 28rpx;
 }
 }
-.date{
+
+.date {
   margin-right: 10rpx;
   margin-right: 10rpx;
 }
 }
-.right-jiafen{
+
+.right-jiafen {
+  font-size: 33rpx;
+  font-family: sans-serif;
   color: #ff8b09;
   color: #ff8b09;
   font-weight: 800;
   font-weight: 800;
+  /* font-weight: 800; */
   margin-right: 20rpx;
   margin-right: 20rpx;
 }
 }

+ 2 - 2
pages/Integral/my-Integral.js

@@ -1,4 +1,4 @@
-// pages/my-Integral/my-Integral.js
+// pages/Integral/my-Integral.js
 Page({
 Page({
 
 
   /**
   /**
@@ -12,7 +12,7 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad(options) {
   onLoad(options) {
-    wx.setNavigationBarTitle({ title: '我的积分' })
+
   },
   },
 
 
   /**
   /**

+ 2 - 139
pages/Integral/my-Integral.wxml

@@ -1,139 +1,2 @@
-<view>
-  <view class="box-top">
-    <!-- 积分左 -->
-    <view class="box-left">
-      <!-- jifen icon -->
-      <view class="little-box">
-        <view class="icon">
-          <image class="img-2" src="../my/images/20积分 (1).png" mode="" />
-        </view>
-        <view class="jifen">
-          积分
-        </view>
-      </view>
-      <view class="number">
-        708
-      </view>
-    </view>
-    <!-- 右 -->
-    <view class="box-right">
-      积分获取规则 >
-    </view>
-  </view>
-  <view class="bill">
-    <!-- 入账种 和明细 -->
-  </view>
-  <view class="bottom">
-    <view class="">
-      <van-tabs sticky class="order-tabs">
-        <van-tab title="入账中">
-          <van-divider />
-          <view class="box">
-            <view>
-              <view class="complete">
-                完成订单
-              </view>
-              <view class="box-calendar">
-                <view class="date">
-                  2019-03-29
-                </view>
-                09:57:30
-              </view>
-            </view>
-            <view class="right-jiafen">
-              +40
-            </view>
-          </view>
-          <van-divider />
-          <view class="box">
-            <view>
-              <view class="complete">
-                完成订单
-              </view>
-              <view class="box-calendar">
-                <view class="date">
-                  2019-03-29
-                </view>
-                09:57:30
-              </view>
-            </view>
-            <view class="right-jiafen">
-              +40
-            </view>
-          </view>
-          <van-divider />
-          <view class="box">
-            <view>
-              <view class="complete">
-                完成订单
-              </view>
-              <view class="box-calendar">
-                <view class="date">
-                  2019-03-29
-                </view>
-                09:57:30
-              </view>
-            </view>
-            <view class="right-jiafen">
-              +40
-            </view>
-          </view>
-          <van-divider />
-          <view class="box">
-            <view>
-              <view class="complete">
-                完成订单
-              </view>
-              <view class="box-calendar">
-                <view class="date">
-                  2019-03-29
-                </view>
-                09:57:30
-              </view>
-            </view>
-            <view class="right-jiafen">
-              +40
-            </view>
-          </view>
-          <van-divider />
-          <view class="box">
-            <view>
-              <view class="complete">
-                完成订单
-              </view>
-              <view class="box-calendar">
-                <view class="date">
-                  2019-03-29
-                </view>
-                09:57:30
-              </view>
-            </view>
-            <view class="right-jiafen">
-              +40
-            </view>
-          </view>
-          <van-divider />
-          <view class="box">
-            <view>
-              <view class="complete">
-                完成订单
-              </view>
-              <view class="box-calendar">
-                <view class="date">
-                  2019-03-29
-                </view>
-                09:57:30
-              </view>
-            </view>
-            <view class="right-jiafen">
-              +40
-            </view>
-          </view>
-          <van-divider />
-
-        </van-tab>
-        <van-tab title="收支明细">内容 2</van-tab>
-      </van-tabs>
-    </view>
-  </view>
-</view>
+<!--pages/Integral/my-Integral.wxml-->
+<text>pages/Integral/my-Integral.wxml</text>

BIN
pages/index/images/10.png


BIN
pages/index/images/11jpg.jpg


BIN
pages/index/images/15.png


BIN
pages/index/images/5.png


BIN
pages/index/images/6.png


BIN
pages/index/images/7.png


BIN
pages/index/images/8.png


BIN
pages/index/images/9.jpg


BIN
pages/index/images/9.png


+ 55 - 44
pages/index/index.js

@@ -3,49 +3,60 @@
 const app = getApp()
 const app = getApp()
 
 
 Page({
 Page({
-    data: {
-        swiperImgs: [
-            'https://img.zcool.cn/community/0124335d234357a801207640051686.jpg@1280w_1l_2o_100sh.jpg',
-            'https://img.zcool.cn/community/01bac95d233e81a80121376323538b.jpg@1280w_1l_2o_100sh.jpg',
-            'https://img.zcool.cn/community/01731a5d234357a801213763876d7f.jpg@1280w_1l_2o_100sh.jpg',
-            './images/1.png'
-        ],
-        show: true,
+  data: {
+    swiperImgs: [
+      './images/5.png',
+      './images/6.png',
+      './images/7.png',
+      './images/1.png'
+    ],
+    show: true,
+  },
+  showPopup() {
+    this.setData({ show: true });
+  },
 
 
-    },
-    clickBtn(e) {
-        console.log(e);
-        if(this.data.show){
-            this.setData({
-                show: !this.data.show,
-                caiMing: '',
-                caiCount: '',
-                expire: '',
-                imagePath: '',
-            })
-        }
-    },
-    clickBtnDelete() { 
-        this.setData({
-            show: !this.data.show,
-            caiMing: '',
-            caiCount: '',
-            expire: '',
-            imagePath: '',
-        })
-    },
-    // 事件处理函数
-    bindViewTap() {
-        wx.navigateTo({
-            url: '../logs/logs'
-        })
-    },
-    onLoad() {
-        if (wx.getUserProfile) {
-            this.setData({
-                canIUseGetUserProfile: true
-            })
-        }
-        wx.setNavigationBarTitle({ title: '外卖小程序' })
-    },
+  onClose() {
+    this.setData({ show: false });
+  },
+  CompleteInformation() {
+    wx.navigateTo({
+      url: '../logs/logs'
+    })
+  },
+  clickBtn(e) {
+    console.log(e);
+    if (this.data.show) {
+      this.setData({
+        show: !this.data.show,
+        caiMing: '',
+        caiCount: '',
+        expire: '',
+        imagePath: '',
+      })
+    }
+  },
+  clickBtnDelete() {
+    this.setData({
+      show: !this.data.show,
+      caiMing: '',
+      caiCount: '',
+      expire: '',
+      imagePath: '',
+    })
+  },
+  // 事件处理函数
+  bindViewTap() {
+    wx.navigateTo({
+      url: '../logs/logs'
+    })
+  },
+  onLoad() {
+    if (wx.getUserProfile) {
+      this.setData({
+        canIUseGetUserProfile: true
+      })
+    }
+    wx.setNavigationBarTitle({ title: '外卖小程序' })
+  },
 })
 })

+ 2 - 1
pages/index/index.json

@@ -15,6 +15,7 @@
     "van-calendar": "@vant/weapp/calendar/index",
     "van-calendar": "@vant/weapp/calendar/index",
     "van-uploader": "@vant/weapp/uploader/index",
     "van-uploader": "@vant/weapp/uploader/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-popup": "@vant/weapp/popup/index",
-    "van-overlay": "@vant/weapp/overlay/index"
+    "van-overlay": "@vant/weapp/overlay/index",
+    "van-field": "@vant/weapp/field/index"
   }
   }
 }
 }

+ 44 - 21
pages/index/index.wxml

@@ -1,31 +1,32 @@
 <view class="FixButton" bindtap="clickBtn">
 <view class="FixButton" bindtap="clickBtn">
+  <!-- bindtap="clickBtn" -->
   <view class="search-box" style="margin-bottom:20rpx">
   <view class="search-box" style="margin-bottom:20rpx">
     <view class="search-top">
     <view class="search-top">
-      <input class="search-ipt" focus="true" placeholder="搜索用户手机号" type="text" value="{{value}}" bindinput="mobileInput" maxlength="11" type="number" placeholder-style="color:#b0b0b0" />
-      <!--  输入的时候显示  -->
-      <van-icon name="cross" size="{{showInput}}" custom-style="margin-top: 20rpx" bind:click="clear" />
+      <van-icon name="search" class="search-icon" />
+      <input class="search-ipt" placeholder="搜索商家名称" type="text" value="{{value}}" placeholder-style="color:#9d9d9d" />
       <button class="search-btn" bindtap="Search">搜索</button>
       <button class="search-btn" bindtap="Search">搜索</button>
     </view>
     </view>
-    <view style="margin: 4%;">
+    <view style="margin: 2%;">
       <view class="" hover-class="none" hover-stop-propagation="false">
       <view class="" hover-class="none" hover-stop-propagation="false">
-        <swiper class="swiper" indicator-dots="true" autoplay="true" interval="3000" duration="700" circular="true" previous-margin="36rpx" next-margin="36rpx" indicator-color="#999999" indicator-active-color="#ff8700">
+        <swiper class="swiper" indicator-dots="true" autoplay="true" interval="3000" duration="700" circular="true" previous-margin="0rpx" next-margin="0rpx" indicator-color="#999999" indicator-active-color="#ff8700">
           <swiper-item class="swiper-image" wx:for="{{ swiperImgs }}" wx:key="*this">
           <swiper-item class="swiper-image" wx:for="{{ swiperImgs }}" wx:key="*this">
-            <image src="{{ item }}" mode="widthFix" bindtap="getLunBoList" mode="aspectFit"></image>
+            <image style="width:95%;" src="{{ item }}" mode="widthFix" bindtap="getLunBoList" mode="aspectFit"></image>
           </swiper-item>
           </swiper-item>
         </swiper>
         </swiper>
       </view>
       </view>
     </view>
     </view>
   </view>
   </view>
+
   <view>
   <view>
     <view class="front-content" style="padding: 4% 4% 0;">
     <view class="front-content" style="padding: 4% 4% 0;">
       <view>
       <view>
         <image class="img-1" src="./images/2.png" mode="" />
         <image class="img-1" src="./images/2.png" mode="" />
       </view>
       </view>
-      <view style="margin-bottom: 20rpx;">
-        <view style="font-weight: 800;margin-bottom:20rpx; color: #000000;font-size:30rpx">
+      <view style="margin-bottom:40rpx;">
+        <view style="font-weight:bold;margin-bottom:15rpx; color: #000000;font-size:34rpx">
           二食堂二楼麻辣烫麻辣香锅...
           二食堂二楼麻辣烫麻辣香锅...
         </view>
         </view>
-        <view style="font-size:25rpx;display: flex;">
+        <view style="font-size:25rpx;display: flex;margin-bottom:30rpx;">
           <view style="color: #b4b4b4;">
           <view style="color: #b4b4b4;">
             起送
             起送
           </view>
           </view>
@@ -57,11 +58,11 @@
       <view>
       <view>
         <image class="img-1" src="./images/3.png" mode="" />
         <image class="img-1" src="./images/3.png" mode="" />
       </view>
       </view>
-      <view style="margin-bottom: 20rpx;">
-        <view style="font-weight: 800;margin-bottom:20rpx; color: #000000;font-size:30rpx">
+      <view style="margin-bottom: 40rpx;">
+        <view style="font-weight:bold;margin-bottom:15rpx; color: #000000;font-size:34rpx">
           二食堂二楼麻辣烫麻辣香锅...
           二食堂二楼麻辣烫麻辣香锅...
         </view>
         </view>
-        <view style="font-size:25rpx;display: flex;">
+        <view style="font-size:25rpx;display: flex;margin-bottom:30rpx;">
           <view style="color: #b4b4b4;">
           <view style="color: #b4b4b4;">
             起送
             起送
           </view>
           </view>
@@ -90,31 +91,53 @@
   </view>
   </view>
 </view>
 </view>
 
 
-<view>
+<!-- <van-popup show="{{ show }}" bind:close="onClose"  closeable="true" close-icon="close" close-icon-position="bottom-right" custom-class="clc" z-index="1" >
+  <image class="img-2" src="./images/15.png" mode="" />
+  <view class="pop-up">
+    <view class="top">
+      <view style="color: #ffffff;text-align: center;margin-bottom:40rpx;font-family: Arial, Helvetica, sans-serif;font-size: 40rpx;">
+        信息完善
+      </view>
+      <view style="color:#c11b14;text-align: left;font-size: 33rpx;">
+        为校园人员使用,新用户请完善个人信息。
+      </view>
+    </view>
+    <van-divider />
+    <view class="under">
+      <view bindtap="CompleteInformation">
+        完善信息
+      </view>
+    </view> -->
+<!-- <van-icon name="clear" /> -->
+<!-- <van-icon name="clear" bindtap="clickBtnDelete" class="del-icon" color="#ffffff" /> -->
+<!-- </view>
+</van-popup> -->
+
+<view style="font-size:32rpx;">
   <!-- 弹出框 -->
   <!-- 弹出框 -->
   <!-- hidden="{{show}}" -->
   <!-- hidden="{{show}}" -->
   <view class="all-bottom" hidden="{{show}}">
   <view class="all-bottom" hidden="{{show}}">
   </view>
   </view>
   <view class="pop-up" hidden="{{show}}">
   <view class="pop-up" hidden="{{show}}">
+    <image class="img-2" src="./images/15.png" mode="widthFix" />
     <view class="top">
     <view class="top">
-      <view style="color: #ffffff;text-align: center;margin-bottom:40rpx;font-family: Arial, Helvetica, sans-serif;">
+      <view style="color: #ffffff;text-align: center;margin-bottom:35rpx;font-family: Arial, Helvetica, sans-serif;font-size: 40rpx;">
         信息完善
         信息完善
       </view>
       </view>
-      <view style="color:#c11b14;">
-        为校园人员使用,新用户请完善个人信息
+      <view style="color:#c11b14;font-family: Arial, Helvetica, sans-serif;text-align: left;font-size: 33rpx;margin-bottom: 80rpx;">
+        为校园人员使用,新用户请完善个人信息
       </view>
       </view>
     </view>
     </view>
-    <van-divider />
+    <van-divider borderColor="#f48185" />
     <view class="under">
     <view class="under">
-      <view>
+      <view bindtap="CompleteInformation">
         完善信息
         完善信息
       </view>
       </view>
-
     </view>
     </view>
     <!-- <van-icon name="clear" /> -->
     <!-- <van-icon name="clear" /> -->
-    <van-icon name="close" bindtap="clickBtnDelete" />
-
+    <van-icon name="clear" bindtap="clickBtnDelete" class="del-icon" color="#ffffff" />
   </view>
   </view>
+
 </view>
 </view>
 
 
 
 

+ 70 - 85
pages/index/index.wxss

@@ -10,43 +10,57 @@ page {
 }
 }
 
 
 .search-top {
 .search-top {
-  width: 700rpx;
-  height: 80rpx;
-  border: 1px solid #e1e1e1;
+  display: flex;
+  align-items: center;
   border-radius: 50rpx;
   border-radius: 50rpx;
+  height: 75rpx;
   margin: 3%;
   margin: 3%;
+  background: #f4f4f4;
 }
 }
 
 
-.search-ipt {
-  width: 474rpx;
-  height: 80rpx;
-  border: none;
+.search-icon {
+  font-size: 45rpx;
   float: left;
   float: left;
-  font-size: 29rpx;
+  margin: 20rpx;
+  box-sizing: border-box;
+  color: #888888;
+}
+
+.search-ipt {
+  height: 75rpx;
+  font-size: 30rpx;
   /* 去掉获取焦点的蓝边 */
   /* 去掉获取焦点的蓝边 */
   outline: none;
   outline: none;
-  /* text-indent: 20rpx; */
-  padding-left: 30rpx;
 }
 }
 
 
 .search-btn {
 .search-btn {
   border-radius: 50rpx;
   border-radius: 50rpx;
-  width: 151rpx;
-  height: 80rpx;
+  width: 150rpx;
+  height: 50rpx;
   display: flex;
   display: flex;
-  justify-content: center;
   align-items: center;
   align-items: center;
-  float: right;
+  justify-content: center;
+  margin-right: 15rpx;
   background: #ff8e0b;
   background: #ff8e0b;
   color: #fff;
   color: #fff;
-  font-size: 29rpx;
+  font-size: 30rpx;
+}
+
+.swiper {
+  /* background-color: blue; */
+  height: 350rpx;
+}
+
+.swiper-image {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  border-radius: 20rpx;
 }
 }
 
 
 .front-content {
 .front-content {
   display: flex;
   display: flex;
-  /* padding: 0; */
-  /* justify-content: space-between; */
-  /* color: #696969; */
   width: 100%;
   width: 100%;
   background-color: #fff;
   background-color: #fff;
 }
 }
@@ -58,20 +72,21 @@ page {
 
 
 .img-1 {
 .img-1 {
   /* margin-left: 15rpx; */
   /* margin-left: 15rpx; */
-  width: 200rpx;
+  width: 230rpx;
   height: 160rpx;
   height: 160rpx;
   margin-right: 20rpx;
   margin-right: 20rpx;
 }
 }
 
 
 .time {
 .time {
   width: 100rpx;
   width: 100rpx;
-  height: 40rpx;
+  height: 35rpx;
   background: #ff8700;
   background: #ff8700;
   font-size: 25rpx;
   font-size: 25rpx;
   margin-left: 20rpx;
   margin-left: 20rpx;
   color: #fff;
   color: #fff;
   text-align: center;
   text-align: center;
-  line-height: 40rpx;
+  /* align-items: center; */
+  line-height: 35rpx;
   border-radius: 8rpx;
   border-radius: 8rpx;
 }
 }
 
 
@@ -86,82 +101,52 @@ page {
   border-radius: 8rpx;
   border-radius: 8rpx;
 }
 }
 
 
+.all-bottom {
+  background-color: rgba(0,0,0,.7);
+  opacity: 0.5;
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
 
 
-.ert {
-  position: relative;
-}
-
-.btn {
-  position: absolute;
-  right: 40rpx;
-  top: 32rpx;
 }
 }
 
 
 
 
-
+.pop-up {
+  width: 550rpx;
+  height: 650rpx;
+  text-align: center;
+  /* background-color: #f47861; */
+  position: relative;
+  opacity: 100;
+  left: 100rpx;
+  bottom: 630rpx; 
+  /* /* z-index: 12; */
+  background: linear-gradient(#f79654, #f5815e, #f37064, #f26a66, #f05f68);
+  border-radius: 10rpx;
+}
 .top {
 .top {
-  height: 350rpx;
-  padding: 12%;
+  /* height:550rpx; */
+  padding: 0 12%;
   box-sizing: border-box;
   box-sizing: border-box;
-  padding-top: 100rpx;
+  padding-top: 285rpx;
 }
 }
 
 
-.swiper {
-  height:450rpx;
-}
-
-.swiper-image {
-  width: 100%;
-  height: 100%;
+.img-2 {
+  position: absolute;
+  top: -160rpx;
+  right: 10rpx;
+  width: 530rpx;
 }
 }
 
 
 .under {
 .under {
-  text-align: center;
-  line-height: 70rpx;
+  line-height: 40rpx;
+  font-size: 33rpx;
   color: #fdeff0;
   color: #fdeff0;
 }
 }
 
 
-.FixButton {
-  /* position: fixed; */
-}
-
-.wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-}
-
-
-.all-bottom {
-  background-color: black;
-  opacity: 0.5;
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 11;
-}
-
-.block {
-  width: 120px;
-  height: 120px;
-  background-color: #fff;
+.del-icon {
+  margin-top: 80rpx;
+  font-size: 80rpx;
 }
 }
-
-
-
-
-.pop-up {
-  width: 520rpx;
-  height: 500rpx;
-  /* background-color: #f47861; */
-  position: absolute;
-  text-align: center;
-  opacity: 100;
-  left: 120rpx;
-  top: 350rpx;
-  z-index: 12;
-  background: linear-gradient(#ff7e4c, #f62446);
-}

+ 7 - 1
pages/my/my.js

@@ -10,7 +10,13 @@ Page({
   onClickintegral(){
   onClickintegral(){
     console.log(1);
     console.log(1);
     wx.navigateTo({
     wx.navigateTo({
-      url:'../my-Integral/my-Integral'
+      url:'../Integral/Integral'
+    })
+  },
+  onOrder(){
+    console.log('我的订单');
+    wx.navigateTo({
+      url:'../Integral/Integral'
     })
     })
   },
   },
   /**
   /**

+ 0 - 1
pages/my/my.json

@@ -2,6 +2,5 @@
   "usingComponents": {
   "usingComponents": {
     "van-button": "@vant/weapp/button/index",
     "van-button": "@vant/weapp/button/index",
     "van-icon": "@vant/weapp/icon/index"
     "van-icon": "@vant/weapp/icon/index"
-
   }
   }
 }
 }

+ 10 - 10
pages/my/my.wxml

@@ -60,7 +60,7 @@
         我的订单
         我的订单
       </view>
       </view>
       <!-- 箭头 -->
       <!-- 箭头 -->
-      <view class="order-right">
+      <view class="order-right" bindtap="onOrder">
         >
         >
       </view>
       </view>
     </view>
     </view>
@@ -68,35 +68,35 @@
     <!-- 内容 -->
     <!-- 内容 -->
     <view class="content">
     <view class="content">
       <!-- 1 -->
       <!-- 1 -->
-      <view class="content-one">
+      <view class="content-one" style="margin-right: 130rpx;">
         <view class="img-box">
         <view class="img-box">
           <view class="img-paid">
           <view class="img-paid">
-            <van-icon name="paid" size="80rpx" />
+            <van-icon name="paid" size="60rpx" />
           </view>
           </view>
         </view>
         </view>
-        <view style="margin-left: 10rpx;">
+        <view style="font-size: 30rpx;">
           待支付
           待支付
         </view>
         </view>
       </view>
       </view>
       <!-- 2 -->
       <!-- 2 -->
-      <view class="content-one">
+      <view class="content-one" style="margin-right: 130rpx;">
         <view class="img-box" style="background: #52a6ff;">
         <view class="img-box" style="background: #52a6ff;">
           <view class="img-paid">
           <view class="img-paid">
-            <van-icon name="logistics" size="80rpx" />
+            <van-icon name="logistics" size="60rpx" />
           </view>
           </view>
         </view>
         </view>
-        <view style="margin-left: 10rpx;">
+        <view style="font-size: 30rpx;">
           待送达
           待送达
         </view>
         </view>
       </view>
       </view>
       <!-- 3 -->
       <!-- 3 -->
-      <view>
+      <view class="content-one" >
         <view class="img-box" style="background: #66dc8e;">
         <view class="img-box" style="background: #66dc8e;">
           <view class="img-paid">
           <view class="img-paid">
-            <van-icon name="completed" size="80rpx" />
+            <van-icon name="completed" size="60rpx" />
           </view>
           </view>
         </view>
         </view>
-        <view style="margin-left: 10rpx;">
+        <view style="font-size: 30rpx;">
           已完成
           已完成
         </view>
         </view>
       </view>
       </view>

+ 12 - 8
pages/my/my.wxss

@@ -132,8 +132,11 @@ page {
 }
 }
 
 
 .content-one {
 .content-one {
-  margin-right: 130rpx;
 
 
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
 }
 
 
 .pic-one {
 .pic-one {
@@ -163,16 +166,17 @@ page {
 
 
 .img-box {
 .img-box {
   background: #ffa05c;
   background: #ffa05c;
-  border-radius: 30rpx;
-  width: 120rpx;
-  height: 120rpx;
+  border-radius: 20rpx;
+  width: 100rpx;
+  height: 100rpx;
   color: #ffffff;
   color: #ffffff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 }
 
 
 .img-paid {
 .img-paid {
   /* text-align: center; */
   /* text-align: center; */
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding-top: 20rpx;
+
+
 }
 }

+ 23 - 2
project.private.config.json

@@ -10,7 +10,7 @@
       "list": [
       "list": [
         {
         {
           "name": "",
           "name": "",
-          "pathName": "pages/index/index",
+          "pathName": "pages/my/my",
           "query": "",
           "query": "",
           "launchMode": "default",
           "launchMode": "default",
           "scene": null
           "scene": null
@@ -24,7 +24,28 @@
         },
         },
         {
         {
           "name": "",
           "name": "",
-          "pathName": "pages/my-Integral/my-Integral",
+          "pathName": "pages/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/serch/serch",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/serch-outcome/serch-outcome",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/Integral/Integral",
           "query": "",
           "query": "",
           "launchMode": "default",
           "launchMode": "default",
           "scene": null
           "scene": null