Merge branch 'Web_Wave' of http://39.105.160.25:10880/sifu-gogs/delivery-customer into Web_Wave

app.json

@@ -5,7 +5,8 @@
     "pages/Businesses/Businesses",
     "pages/serch/serch",
     "pages/logs/logs",
-    "pages/my/my"
+    "pages/my/my",
+    "pages/my-Integral/my-Integral"
   ],
   "window": {
     "backgroundTextStyle": "light",

pages/index/index.wxml

@@ -1,125 +1,120 @@
 <view class="FixButton" bindtap="clickBtn">
-    <view class="search-box" style="margin-bottom:20rpx">
-        <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" />
-            <button class="search-btn" bindtap="Search">搜索</button>
+  <view class="search-box" style="margin-bottom:20rpx">
+    <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" />
+      <button class="search-btn" bindtap="Search">搜索</button>
+    </view>
+    <view style="margin: 4%;">
+      <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-item class="swiper-image" wx:for="{{ swiperImgs }}" wx:key="*this">
+            <image src="{{ item }}" mode="widthFix" bindtap="getLunBoList" mode="aspectFit"></image>
+          </swiper-item>
+        </swiper>
+      </view>
+    </view>
+  </view>
+  <view>
+    <view class="front-content" style="padding: 4% 4% 0;">
+      <view>
+        <image class="img-1" src="./images/2.png" mode="" />
+      </view>
+      <view style="margin-bottom: 20rpx;">
+        <view style="font-weight: 800;margin-bottom:20rpx; color: #000000;font-size:30rpx">
+          二食堂二楼麻辣烫麻辣香锅...
+        </view>
+        <view style="font-size:25rpx;display: flex;">
+          <view style="color: #b4b4b4;">
+            起送
+          </view>
+          <view style="color: #ff9d38;">
+            ￥15
+          </view>
+          <view style="color: #b4b4b4;  margin-left: 20rpx;">
+            货到付款
+          </view>
+          <view style="color: #b4b4b4;  margin-left: 20rpx;">
+            月售
+          </view>
+          <view style="color: #ff9d38;">
+            231
+          </view>
+          <view class="time">
+            30分钟
+          </view>
         </view>
-        <view style="margin: 4%;">
-            <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-item class="swiper-image" wx:for="{{ swiperImgs }}" wx:key="*this">
-                        <image src="{{ item }}" mode="widthFix" bindtap="getLunBoList" mode="aspectFit"></image>
-                    </swiper-item>
-                </swiper>
-            </view>
+        <view class="discount">
+          <van-icon name="balance-o" />
+          积分抵扣有优惠
         </view>
+      </view>
     </view>
-    <view>
-        <view class="front-content" style="padding: 4%;">
-            <view>
-                <image class="img-1" src="./images/2.png" mode="" />
-            </view>
-            <view>
-                <view style="font-weight: 800;margin-bottom:20rpx; color: #000000;font-size:30rpx">
-                    二食堂二楼麻辣烫麻辣香锅...
-                </view>
-                <view style="font-size:25rpx;display: flex;">
-                    <view style="color: #b4b4b4;">
-                        起送
-                    </view>
-                    <view style="color: #ff9d38;">
-                        ￥15
-                    </view>
-                    <view style="color: #b4b4b4;  margin-left: 20rpx;">
-                        货到付款
-                    </view>
-                    <view style="color: #b4b4b4;  margin-left: 20rpx;">
-                        月售
-                    </view>
-                    <view style="color: #ff9d38;">
-                        231
-                    </view>
-                    <view class="time">
-                        30分钟
-                    </view>
-                </view>
-                <view class="discount">
-                    <van-icon name="balance-o" />
-                    积分抵扣有优惠
-                </view>
-            </view>
+    <view style="margin-bottom:20rpx">
+    </view>
+    <view class="front-content" style="padding: 4% 4% 0;">
+      <view>
+        <image class="img-1" src="./images/3.png" mode="" />
+      </view>
+      <view style="margin-bottom: 20rpx;">
+        <view style="font-weight: 800;margin-bottom:20rpx; color: #000000;font-size:30rpx">
+          二食堂二楼麻辣烫麻辣香锅...
         </view>
-        <view style="margin-bottom:20rpx">
+        <view style="font-size:25rpx;display: flex;">
+          <view style="color: #b4b4b4;">
+            起送
+          </view>
+          <view style="color: #ff9d38;">
+            ￥15
+          </view>
+          <view style="color: #b4b4b4;  margin-left: 20rpx;">
+            货到付款
+          </view>
+          <view style="color: #b4b4b4;  margin-left: 20rpx;">
+            月售
+          </view>
+          <view style="color: #ff9d38;">
+            231
+          </view>
+          <view class="time">
+            30分钟
+          </view>
         </view>
-        <view class="front-content" style="padding: 4%;">
-            <view>
-                <image class="img-1" src="./images/3.png" mode="" />
-            </view>
-            <view>
-                <view style="font-weight: 800;margin-bottom:20rpx; color: #000000;font-size:30rpx">
-                    二食堂二楼麻辣烫麻辣香锅...
-                </view>
-                <view style="font-size:25rpx;display: flex;">
-                    <view style="color: #b4b4b4;">
-                        起送
-                    </view>
-                    <view style="color: #ff9d38;">
-                        ￥15
-                    </view>
-                    <view style="color: #b4b4b4;  margin-left: 20rpx;">
-                        货到付款
-                    </view>
-                    <view style="color: #b4b4b4;  margin-left: 20rpx;">
-                        月售
-                    </view>
-                    <view style="color: #ff9d38;">
-                        231
-                    </view>
-                    <view class="time">
-                        30分钟
-                    </view>
-                </view>
-                <view class="discount">
-                    <van-icon name="balance-o" />
-                    积分抵扣有优惠
-                </view>
-            </view>
+        <view class="discount">
+          <van-icon name="balance-o" />
+          积分抵扣有优惠
         </view>
+      </view>
     </view>
+  </view>
 </view>
 
-
-  
 <view>
-    <!-- 弹出框 -->
-    <!-- hidden="{{show}}" -->
-    <view class="all-bottom"   hidden="{{show}}" >
-      
+  <!-- 弹出框 -->
+  <!-- hidden="{{show}}" -->
+  <view class="all-bottom" hidden="{{show}}">
+  </view>
+  <view class="pop-up" hidden="{{show}}">
+    <view class="top">
+      <view style="color: #ffffff;text-align: center;margin-bottom:40rpx;font-family: Arial, Helvetica, sans-serif;">
+        信息完善
+      </view>
+      <view style="color:#c11b14;">
+        为校园人员使用，新用户请完善个人信息
+      </view>
     </view>
-
-
-    <view class="pop-up" hidden="{{show}}"  >
-        <view class="top">
-            <view style="color: #ffffff;text-align: center;margin-bottom:40rpx;font-family: Arial, Helvetica, sans-serif;">
-                信息完善
-            </view>
-            <view style="color:#c11b14;">
-                为校园人员使用，新用户请完善个人信息
-            </view>
-        </view>
-        <van-divider />
-        <view class="under">
-            <view>
-                完善信息
-            </view>
-
-        </view>
-        <!-- <van-icon name="clear" /> -->
-        <van-icon name="close" bindtap="clickBtnDelete"/>
+    <van-divider />
+    <view class="under">
+      <view>
+        完善信息
+      </view>
 
     </view>
+    <!-- <van-icon name="clear" /> -->
+    <van-icon name="close" bindtap="clickBtnDelete" />
+
+  </view>
 </view>
 
 

pages/index/index.wxss

@@ -44,6 +44,7 @@ page {
 
 .front-content {
   display: flex;
+  /* padding: 0; */
   /* justify-content: space-between; */
   /* color: #696969; */
   width: 100%;
@@ -80,6 +81,7 @@ page {
   color: #ff992a;
   text-align: center;
   margin-top: 15rpx;
+  /* margin-bottom: 15rpx; */
   font-size: 27rpx;
   border-radius: 8rpx;
 }
@@ -103,52 +105,63 @@ page {
   box-sizing: border-box;
   padding-top: 100rpx;
 }
-.under{
-text-align: center;
-line-height: 70rpx;
-color: #fdeff0;
+
+.swiper {
+  height:450rpx;
+}
+
+.swiper-image {
+  width: 100%;
+  height: 100%;
+}
+
+.under {
+  text-align: center;
+  line-height: 70rpx;
+  color: #fdeff0;
 }
-.FixButton{       
-    /* position: fixed; */
+
+.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: 1110rpx;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 11;
-  }
-  
-  .block {
-    width: 120px;
-    height: 120px;
-    background-color: #fff;
-  }
-
-
-
-
-  .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);
-   
-  }
+  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;
+}
+
+
+
+
+.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);
+}

pages/my-Integral/my-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() {
+
+  }
+})

pages/my-Integral/my-Integral.json

@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "van-grid": "@vant/weapp/grid/index",
+    "van-grid-item": "@vant/weapp/grid-item/index",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-divider": "@vant/weapp/divider/index"
+  }
+}

pages/my-Integral/my-Integral.wxml

@@ -0,0 +1,139 @@
+<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/my-Integral/my-Integral.wxss

@@ -0,0 +1,100 @@
+/* pages/my-Integral/my-Integral.wxss */
+page {
+  background: #f1f1f1;
+}
+
+.box-top {
+  width: 86%;
+  height: 300rpx;
+  border-radius: 20rpx 20rpx 0 0;
+  /* padding: 40rpx; */
+  margin: 60rpx auto 0;
+  box-sizing: border-box;
+  background: linear-gradient(#ff7e4c, #f62446, #fe792b, #fa5840);
+  display: flex;
+  justify-content: space-between;
+  color: #feede9;
+  font-size: 28rpx;
+}
+
+.box-left {
+  /* width: rpx; */
+  /* display: flex; */
+  /* height: 100rpx; */
+  margin: 88rpx 60rpx 0;
+}
+
+.little-box {
+  display: flex;
+  margin-bottom: 15rpx;
+  font-size: 30rpx;
+}
+
+.img-2 {
+  width: 38rpx;
+  height: 40rpx;
+  /* color: #f1f1f1; */
+}
+
+.icon {
+  margin-right: 10rpx;
+
+}
+
+.number {
+  font-size: 70rpx;
+}
+
+.box-right {
+  margin: 40rpx;
+}
+
+.bottom {
+  background-color: #ffffff;
+  box-sizing: border-box;
+  height: 100vh;
+
+}
+
+.bill {
+  font-size: 50rpx;
+}
+
+.details {
+  font-size: 30rpx;
+}
+
+.account {
+  font-size: 30rpx;
+}
+
+.order-tabs .van-tab--active .van-ellipsis {
+  color: #ff8700;
+}
+
+.van-tabs__line {
+  display: none;
+}
+.box{
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  padding: 0%  13% 0%;
+}
+.complete{
+
+font-weight: 800;
+}
+.box-calendar{
+  display: flex;
+  color: #b4b4b4;
+  font-size: 28rpx;
+}
+.date{
+  margin-right: 10rpx;
+}
+.right-jiafen{
+  color: #ff8b09;
+  font-weight: 800;
+  margin-right: 20rpx;
+}

pages/my/my.js

@@ -7,7 +7,12 @@ Page({
   data: {
 
   },
-
+  onClickintegral(){
+    console.log(1);
+    wx.navigateTo({
+      url:'../my-Integral/my-Integral'
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/my/my.json

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

pages/my/my.wxml

@@ -16,19 +16,17 @@
             152****159
           </view>
           <!-- jifen -->
-          <view class="jifen">
-            <view>
-              <image class="icon" src="./images/jifen@2x.png" mode="" />
+          <view class="jifen" bindtap="onClickintegral">
+            <view class="icon">
+              <image class="img-2" src="./images/20积分.png" mode="" />
             </view>
             <!--  number-->
             <view class="number">
               501
             </view>
           </view>
-
         </view>
         <button class="student" size="mini">学生认证</button>
-
       </view>
       <view>
 
@@ -62,7 +60,7 @@
         我的订单
       </view>
       <!-- 箭头 -->
-      <view class="order-right" >
+      <view class="order-right">
         >
       </view>
     </view>
@@ -71,26 +69,32 @@
     <view class="content">
       <!-- 1 -->
       <view class="content-one">
-        <view class="">
-          <image class="pic-one" src="./images/icon-1@2x.png" mode="" />
+        <view class="img-box">
+          <view class="img-paid">
+            <van-icon name="paid" size="80rpx" />
+          </view>
         </view>
         <view style="margin-left: 10rpx;">
           待支付
         </view>
       </view>
       <!-- 2 -->
-      <view class="content-one" >
-        <view class="">
-          <image class="pic-two" src="./images/icon-2@2x.png" mode="" />
+      <view class="content-one">
+        <view class="img-box" style="background: #52a6ff;">
+          <view class="img-paid">
+            <van-icon name="logistics" size="80rpx" />
+          </view>
         </view>
         <view style="margin-left: 10rpx;">
           待送达
         </view>
       </view>
       <!-- 3 -->
-      <view >
-        <view>
-          <image class="pic-three" src="./images/icon-3@2x.png" mode="" />
+      <view>
+        <view class="img-box" style="background: #66dc8e;">
+          <view class="img-paid">
+            <van-icon name="completed" size="80rpx" />
+          </view>
         </view>
         <view style="margin-left: 10rpx;">
           已完成
@@ -100,8 +104,7 @@
   </view>
 
   <view class="container-top">
-    <view class="bottom-last" style="height: 140rpx;">
-      
+    <view style="height: 29vh;">
     </view>
   </view>
 </view>

pages/my/my.wxss

@@ -1,6 +1,10 @@
 /* pages/my/my.wxss */
 page {
   background: #f4f4f4;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
 }
 
 .container-top {
@@ -31,7 +35,8 @@ page {
 }
 
 .inline {
-  margin-right: 5rpx;
+  margin-right: 15rpx;
+  margin-left: 15rpx;
 }
 
 .name {
@@ -56,12 +61,15 @@ page {
   /* color: #47524e; */
 }
 
+.img-2 {
+  width: 40rpx;
+  height: 40rpx;
+}
+
 .icon {
   /* margin-left: 15rpx; */
-  width: 40rpx;
-  height: 30rpx;
   margin-right: 10rpx;
-  border-radius: 7px;
+  /* color: #ff8700; */
 }
 
 .jifen {
@@ -101,14 +109,14 @@ page {
   justify-content: space-between;
   /* color: #696969; */
   height: 100rpx;
-  
+
 }
 
 .order-left {
   /* color:#474747 ; */
   font-size: 32rpx;
   font-weight: 800;
-
+  color: #585858;
 }
 
 .order-right {
@@ -124,7 +132,8 @@ page {
 }
 
 .content-one {
-  margin-right: 100rpx;
+  margin-right: 130rpx;
+
 }
 
 .pic-one {
@@ -149,4 +158,21 @@ page {
   height: 115rpx;
   /* margin-right: 15rpx; */
   border-radius: 7px;
+}
+
+
+.img-box {
+  background: #ffa05c;
+  border-radius: 30rpx;
+  width: 120rpx;
+  height: 120rpx;
+  color: #ffffff;
+}
+
+.img-paid {
+  /* text-align: center; */
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding-top: 20rpx;
 }

project.private.config.json

@@ -21,6 +21,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/my-Integral/my-Integral",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }