d

app.js

@@ -54,6 +54,7 @@ App({
                   that.globalData.openid = res.data.data.openid;
                   that.globalData.isNewUser = false;//不是新用户
                   that.globalData.userRole = res.data.data.userRole;
+                  that.globalData.userInfo.phone = res.data.data.user_phone
                   that.globalData.userInfo.avatarUrl = res.data.data.icon;
                   that.globalData.user_id = res.data.data.user_id;
 

pages/bindingPhone/bindingPhone.wxss

@@ -62,7 +62,7 @@
   width: 218rpx;
   height: 90rpx;
   font-size:24rpx;
-  background-color: #b4a078;
+  background-color: #e60012;
   color: #fff;
   text-align: center;
   border: none;
@@ -101,7 +101,7 @@
   line-height:100rpx;
   text-align:center;
   color:#fff;
-  background-color:#b4a078;
+  background-color:#e60012;
   margin:40rpx auto 0;
   cursor:pointer;
 }

pages/confirmOrder/confirmOrder.js

@@ -304,7 +304,7 @@ Page({
     var len = that.data.carts.length;
 
     wx.showLoading({//支付提示
-      title: '微信支付',
+      title: '生成订单', //微信支付
       icon: 'loading',
       mask: true,
       success: function () {
@@ -437,7 +437,11 @@ Page({
       }
 
       //调起支付
-      that.payOrder(timestamp, timestamp1, coupon_id, un_id, formId);
+      // that.payOrder(timestamp, timestamp1, coupon_id, un_id, formId);
+      wx.showModal({
+        title: '提示',
+        content: '订单已生成，后面待上传支付凭证',
+      })
 
     }else{
 

pages/confirmOrder/confirmOrder.wxss

@@ -131,7 +131,7 @@ page{
 .goods_price{
   font-size: 24rpx;
   line-height: 30rpx;
-  color: #b4a078;
+  color: #e60012;
   text-align: left;
   padding: 0 0 14rpx 0;
 }
@@ -160,11 +160,11 @@ page{
   width: 300rpx;
 }
 checkbox .wx-checkbox-input {
-  border:1px solid #b4a078;
+  border:1px solid #e60012;
   background-color:#fff;
 }
 checkbox.checkact .wx-checkbox-input{
-  background-color:#b4a078;
+  background-color:#e60012;
 }
 
 .infor_title{
@@ -202,7 +202,7 @@ checkbox.checkact .wx-checkbox-input{
   line-height: 98rpx;
   color: #fff;
   text-align: center;
-  background-color: #b4a078;
+  background-color: #e60012;
 }
 .footer_right_gray{
   background-color: #e2e2e2;
@@ -212,7 +212,7 @@ checkbox.checkact .wx-checkbox-input{
   float:left;
   font-size: 24rpx;
   line-height: 98rpx;
-  color: #b4a078;
+  color: #e60012;
 }
 .footer_left_title{
   color: #2c2c2c;
@@ -226,7 +226,7 @@ checkbox.checkact .wx-checkbox-input{
   font-family:Arial;
   font-size: 50rpx;
   line-height: 98rpx;
-  color: #b4a078;
+  color: #e60012;
 }
 .footer_left_coupon{
   height: 24rpx;

pages/index/index.js

@@ -1,6 +1,7 @@
 //index.js
 //获取应用实例
 var app = getApp();
+let host = app.globalData.servsers; // 请求的url
 var coupon = [
   {
     coupon_monry : '1000',
@@ -34,6 +35,28 @@ Page({
     search:{
       placeholder:"输入搜索关键字"
     },
+    navArray:[
+      {
+        src:'/images/news/nav_1.png',
+        bg:'#fafcff',
+        href:'/'
+      },
+      {
+        src: '/images/news/nav_2.png',
+        bg: '#fef9f8',
+        href: '/'
+      },
+      {
+        src: '/images/news/nav_3.png',
+        bg: '#f7f6fb',
+        href: '/customized/pages/index/index'
+      },
+      {
+        src: '/images/news/nav_4.png',
+        bg: '#f1f7fc',
+        href: '/pages/patternMenu/patternMenu'
+      }
+    ],
     navList:["推荐","中秋","改良生活","优化办公","智能科技"],
     firstActive: "header_nav_active",
     currentItem : '',
@@ -86,7 +109,13 @@ Page({
     un_id : '',
     showMsg : true,  //显示切换模式提示
     showChangeModel : false,  //显示切换模式确认弹窗
-    bannerFlag : 0  //banner数量
+    bannerFlag : 0,  //banner数量
+    recommendArray:[], // /推荐数组
+    goodsNewsArray:[], //按照时间排序来
+    channelId:null ,//用户登录后的id
+    page:1, //默认第一页
+    limit:10, //展示的数量
+    requestState:true, //请求状态，默认是有数据的
   },
 
   //tab切换
@@ -302,7 +331,11 @@ Page({
           winHeight: calc
         });
       }
-    });
+    }); 
+    //商品推荐
+    that.getGoodsRecommendList(that);
+    // 按照时间排序
+    that.getGoodsNews(that)
   },
 
   onReady:function(e){
@@ -411,11 +444,19 @@ Page({
       url : "/pages/find/index"
     })
   },
+  onReachBottom(){
+    var that = this;
+    if (that.data.requestState) {
+      that.setData({
+        page: that.data.page + 1
+      })
+      that.getGoodsNews(that)
+    }
+    console.log('到底了')
+  },
   //下拉刷新
   onPullDownRefresh: function (e) {
-    var that = this;
-    that.onLoad();
-    wx.stopPullDownRefresh();
+    
   },
   onShareAppMessage: function (res) {//页面分享
     var that = this;
@@ -477,7 +518,59 @@ Page({
     that.setData({
       showChangeModel: false
     })
-  }
+  },
+ // 商品推荐
+  getGoodsRecommendList(that){
+    let data ={
+      limit: 6,
+      offset: 1,
+    }
+    if (that.data.channelId){
+      data.channelId = that.data.channelId
+    }
+    wx.request({
+      url: host + '/commodityapi/queryCommodityGroom',
+      method:"get",
+      data: data,
+      success(res){
+        res.data.rows.forEach(el => {
+          el.logo = el.commodity_logo.split(",")
+        })
+        that.setData({
+          recommendArray:res.data.rows
+        })
+      }
+    })
+  },
+  // 按时间排序来的
+  getGoodsNews(that){
+    let data = {
+      limit: that.data.limit,
+      offset: that.data.page
+    }
+    if (that.data.channelId){
+      data.channelId = that.data.channelId
+    }
+    wx.request({
+      url: host + '/commodityapi/findAllforNewproduct',
+      method: "get",
+      data: data,
+      success(res) {
+        let goods = that.data.goodsNewsArray
+        goods.push(...res.data.rows);
+        that.setData({
+          goodsNewsArray: goods,
+          requestState: res.data.rows.length === that.data.limit 
+        })
+      }
+    })
+  },
+  toGoodsDetail(e) { // 进入商品详情页
+    let that = this, id = e.currentTarget.dataset.id;
+    wx.navigateTo({
+      url: '/pages/buy/buy?com_id=' + id,
+    })
+  },
 
 })
 

pages/index/index.wxml

@@ -2,8 +2,8 @@
 <view class="container">
 
   <!-- 头部搜索 -->
-  <view class="header">
-    <image src="/images/home_search_icon.png" mode='widthFix'  class="header_logo"></image>
+  <view class="header-index">
+    <image src="/images/news/l_icon.png" mode='widthFix'  class="header_logo"></image>
     <view class="header_search_wrap">
       <navigator url="/pages/search/search"  class="header_search">
         <icon type="search"  size="12" color="#929aa0" class="header_search_icon"></icon>
@@ -77,7 +77,7 @@
 
 
         <!-- new second nav -->
-        <view class='new_nav_wrap  clearfix f-box'>
+        <!-- <view class='new_nav_wrap  clearfix f-box'>
           <navigator class='new_nav_each f-item'  url='/pages/recommendList/recommendList'>
             <image src='/images/index_top_menu_sec_0.jpg'  class='new_nav_icon'></image>
             <view  class="new_nav_name">新鲜上架</view> 
@@ -106,85 +106,72 @@
             <image src='/images/index_top_menu_sec_4.jpg'  class='new_nav_icon'></image>
             <view  class="new_nav_name">关于我们</view> 
           </navigator> 
+        </view> -->
+        <!-- nav -->
+        <view class='nav-box'>
+          <view class='f-box f-flex-wrap '>
+            <navigator class='nav-item f-box f-align-items-center f-justify-content-center' wx:for="{{navArray}}" style='background:{{item.bg}}' url='{{item.href}}'>
+              <image src='{{item.src}}' mode='aspectFit'></image>
+            </navigator>
+          </view>
         </view>
 
 
-        <!-- 新-新品推荐 -->
-        <!-- <view class='new_xinpin_wrap'> -->
-          <!-- title -->
-          <!-- <navigator  url='/pages/recommendList/recommendList'  class='new_title_wrap'>
-            <view class='title_kind_wrap'>
-              <view class='title_kind_name'  >新  品  推  荐</view>
-              <view class='title_kind_intro'>精良之选，用心造物</view>
-            </view>
-            <image src='/images/black_more.png'  class='title_kind_more'></image>
-            <image src='/images/index_title_bg_1.png'  class='index_title_bg'></image>
-          </navigator> -->
+      
           
           <!-- 所有商品 -->
-          <view class="new_dingzhi_content">
+          <!-- <view class="new_dingzhi_content">
             <view class='dingzhi_top'>
-            <!-- <navigator url='/pages/recommendList/recommendList'>
-              <image wx:if="{{urlHttp}}"  src='{{urlHttp}}images/xinpin_new_1.jpg?v=201806221713' mode='widthFix'  class='rexiao_banner'></image>
-            </navigator> -->
             <navigator url='/pages/kindSecondList/kindSecondList?classify_name=好物推荐&classify_des=好物推荐&id=3023' >
                 <image src='http://fds.wondersph.com/haowutuijian.jpg'   class="new_dingzhi_img" mode='widthFix'></image>
             </navigator>
           </view>
-         </view>
+         </view> -->
 
 
-          <view class="new_dingzhi_content">
+          <!-- <view class="new_dingzhi_content">
             <view class='dingzhi_top'>
             <navigator  url='/pages/kindSecondList/kindSecondList?classify_name=良米淘库&classify_des=良米淘库&id=3012'>
                 <image src='http://fds.wondersph.com/liangmitaoku.jpg'    class="new_dingzhi_img" mode='widthFix'></image>
             </navigator>
           </view>
+        </view> -->
+
+
+        <!--列表1 -->
+        <view class='goods-listType1 mar-t20'>
+          <view class='f-box' wx:for="{{recommendArray}}" data-id='{{item.id}}' bindtap='toGoodsDetail'>
+            <view class='goods-img mar-r20 '>
+               <image src='{{host}}/images/{{item.logo[0]}}' mode='aspectFit'></image>
+            </view> 
+            <view class='goods-infor f-item'>
+              <view class='goods-introduce'>
+                <view class='goods-label f-s30'>{{item.commodity_name}}</view>
+                <!-- <view class='goods-summry'>产品描述产品描述产品描述</view> -->
+              </view>
+              <view class='c-theme'>￥{{item.commodity_sale}}</view>
+            </view>
+          </view>
+        </view>
+
+        <!-- 列表2 -->
+        <view class='goods-listType2 mar-t20'>
+          <view class='f-box f-flex-wrap f-justify-content-between'>
+            <view class='goods-list' wx:for="{{goodsNewsArray}}" data-id='{{item.id}}' bindtap='toGoodsDetail'>
+              <image src='{{item.commodity_logo}}' class='goods-img' mode='aspectFit'></image>
+              <!-- <view class='goods-summary'></view> -->
+              <view class='goods-title'>{{item.commodity_name}}</view>
+              <view class='c-theme'>￥{{item.commodity_sale}}</view>
+            </view>
+          </view>
         </view>
       
          
 
-        <!-- 品牌定制 -->
-        <!-- <view class="dingzhi_content_wrap  {{hidden}}"> -->
-
+        
 
-          <!-- content -->
-          <!-- <view class='new_xinpin_cont'> -->
-            <!-- <navigator url='/pages/goodsGift/goodsGift?classify_name=礼物盒&classify_des=礼物盒&id=2986'>
-              <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/rexiao_1.png' mode='widthFix'  class='rexiao_banner'></image>
-            </navigator> -->
 
-            <!-- /pages/buy/buy?com_id=3544 -->
-
-            <!-- /pages/buy/buy?com_id=3564 -->
-
-            <!-- /pages/buy/buy?com_id=3498 -->
-
-
-            <!-- <view class='new_xinpin_2  clearfix'>
-              <navigator url='/pages/buy/buy?com_id=3544' class='new_xinpin_left'>
-                <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/index_tj_1.png' ></image>
-              </navigator>
-              <navigator url='/pages/buy/buy?com_id=3564' class='new_xinpin_left'>
-                <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/index_tj_2.png' ></image>
-              </navigator>
-              <navigator url='/pages/buy/buy?com_id=3498' class='new_xinpin_right'>
-                <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/index_tj_3.png' ></image>
-              </navigator>
-            </view> -->
-
-            <!-- <view class='new_xinpin_2  clearfix'>
-              <navigator url='/pages/buy/buy?com_id=3582' class='new_xinpin_left'>
-                <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/index_zhongqiu_1.png' ></image>
-              </navigator>
-              <navigator url='/pages/buy/buy?com_id=3639' class='new_xinpin_left'>
-                <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/index_zhongqiu_2.png' ></image>
-              </navigator>
-              <navigator url='/pages/buy/buy?com_id=3635' class='new_xinpin_right'>
-                <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/index_zhongqiu_3.png' ></image>
-              </navigator>
-            </view> -->
-          <!-- </view> -->
+            
 
 
           
@@ -192,113 +179,10 @@
           
 
           
-          <!--  -->
-          <!-- 新title -->
-          <!-- <navigator  url='/pages/brandList/brandList'  class='new_title_wrap'>
-            <view class='title_kind_wrap'>
-              <view class='title_kind_name'  >心 礼 盒</view>
-              <view class='title_kind_intro'>精良之选，用心造物</view>
-            </view>
-            <image src='/images/black_more.png'  class='title_kind_more'></image>
-            <image src='/images/index_title_bg_2.png'  class='index_title_bg'></image>
-          </navigator> -->
-          
-          <!-- 内容 -->
-          <view class="new_dingzhi_content">
-            <view class='dingzhi_top'>
-              <!-- <navigator url='/pages/brandInfor/brandInfor?title={{title1}}&intro={{intro1}}&src={{src4}}&id={{id1}}'>
-                <image src='{{src1}}'  mode='widthFix'  class='new_dingzhi_img'></image>
-              </navigator> -->
-              <view>
-                <image src='http://fds.wondersph.com/xinlihe.jpg'  mode='widthFix'  class='new_dingzhi_img'></image>
-              </view>
-            </view>
-            <!-- <view class='dingzhi_bottom  clearfix'>
-              <view class='dingzhi_bottom_left'>
-                <navigator url='/pages/brandList/brandList'>
-                  <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/index_footer_left.png'  mode='widthFix'  class='new_dingzhi_img'></image>
-                </navigator>
-              </view>
-              <view class='dingzhi_bottom_right'>
-                <navigator url='/pages/goodsGift/goodsGift?classify_name=礼物盒&classify_des=礼物盒&id=2986'>
-                  <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/index_footer_right.png'  mode='widthFix'  class='new_dingzhi_img'></image>
-                </navigator>
-              </view>
-            </view> -->
-
-          </view>
+        
 
         </view>
       </view>
     </view>
   <!-- </view> -->
 </view>
-<!-- 优惠劵弹窗 -->
-<view class="coupon_wrap  {{showCoupon ? '' : 'hidden'}}">
-  <view class='coupon_content_wrap'>
-    <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/index_coupon_bg_top.png'  class='coupon_top_bg'  mode='widthFix'></image>
-    <view class='coupon_bottom_content'>
-      <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/index_coupon_bg_bottom.png'  class='coupon_bottom_bg'></image>
-      <view class='coupon_bottom_cont'>
-
-        <block wx:for="{{coupon}}"  wx:key="index" wx:index="i">
-          <view class='each_coupon  clearfix'>
-            <view class='each_coupon_left'>
-              <image src='/images/index_coupon_each_left.png' class='coupon_bg_left'></image>
-              <view class='each_coupon_cont'>
-                <view class='each_coupon_money'><text>￥</text>{{item.coupon_monry}}</view>
-                <view class='each_coupon_tj'>满{{item.coupon_rule}}可用</view>
-              </view>
-            </view>
-            <view class='each_coupon_right'>
-              <image src='/images/index_coupon_each_right.png'  class='coupon_bg_right'></image>
-              <view class='coupon_right_cont  clearfix'>
-                <view class='coupon_right_right  clearfix'>
-                  <view class='coupon_right_name'>{{item.coupon_name}}</view>
-                  <navigator url='/pages/kind/index' open-type='switchTab' class='use_btn'>立即使用</navigator>
-                </view>
-                <view class='use_data'>30天内有效</view>
-              </view>
-            </view>
-          </view>
-        </block>
-      </view>
-      <view class='close_coupon'  bindtap='closeCoupon'>
-          <image src='/images/index_close_coupon.png'></image>
-        </view>
-    </view>
-  </view>
-</view>
-
-<!-- 切换模式按钮 -->
-<!-- <view class='change_btn'  bindtap='openChangeModel'>
-  <image src='/images/right_tab_xuanli.png' class='change_btn_icon'></image>
-</view>  -->
-
-<!-- 切换弹层 -->
-<!-- <view class='change_msg_bg  {{showMsg ? "" : "hidden"}}'  bindtap='closeMsg'>
-  <view class='change_msg_wrap'>
-    <view class='change_msg_cont'>
-      您已进入商品浏览模式点击右下角可以切换至一键选礼模式
-      <image src='/images/close_icon_white.png' class='change_msg_close' alt='关闭'></image>
-    </view>
-    <view class='change_msg_icon'><image src='/images/msg_bg_right.png' class='change_msg_icon'></image></view>
-  </view>
-</view> -->
-
-<!-- 切换提示弹窗 -->
-<!-- <view class='change_model_wrap  {{showChangeModel ? "" : "hidden"}}'>
-  <view class='change_model_content'>
-    <image src='/images/close_icon_gray.png'  bindtap='closeChangeModel'  class='change_model_close'  alt='关闭'></image>
-    <view class='change_model_cont'>
-      <view class='change_model_title1'>将为您切换至</view>
-      <view class='change_model_title2'>一键选礼模式</view>
-      <view class='change_model_title3'>是否确认？</view>
-      <view class='change_btn_wrap  clearfix'>
-        <image src='/images/change_msg_bg.png' class='change_model_bg'></image>
-        <view class='each_change_btn  btn_left'  bindtap='goChooseGift'>确认</view>
-        <view class='each_change_btn'  bindtap='closeChangeModel'>取消</view>
-      </view>
-    </view>
-  </view>
-</view> -->

pages/index/index.wxss

@@ -1,7 +1,7 @@
 /**index.wxss**/
 
 page{
-  background-color: #fff;
+  background-color: #eeeeee;
 }
 /* .container{
   height:100vh;
@@ -24,12 +24,12 @@ page{
   color: transparent;
 }
 
-.header{
+.header-index{
   display: flex;
   flex-direction: row;
   width:100%;
   height:82rpx;
-  background-color:#1a1d1f;
+  background-color:#fff;
   align-items: center;
   position: fixed;
   top:0;
@@ -37,22 +37,19 @@ page{
   z-index:2;
 }
 .header_logo{
-  /* width:126rpx;
-  height:39rpx; */
-  width:46rpx;
-  /* height:128rpx; */
-  margin-left:30rpx;
+  width:60rpx;
+  margin-left:26rpx;
   
 }
 .header_search_wrap{
   flex: 1;
-  padding:0 39rpx 0 24rpx;
+  padding:0 30rpx 0 20rpx;
 }
 .header_search{
   height:46rpx;
   border-radius:30rpx;
   color:#fff;
-  background-color:#282c2f;
+  background-color:#e5e5e5;
   display: flex;
   align-items: center;
   justify-content: left;
@@ -780,4 +777,74 @@ page{
 }
 .each_change_btn.btn_left{
   background-color: #ab2a2b;
+}
+
+
+/* modiify 20190330 */
+.nav-box{
+  padding:20rpx;
+  background:#fff;
+}
+.nav-item{
+  height:208rpx;
+  width:48%;
+  margin:0 1% 2%;
+}
+.nav-item image{
+  width:200rpx;
+  height:100rpx;
+}
+.goods-listType1{
+  padding:30rpx;
+  background:#fff;
+}
+.goods-listType1 .f-box{
+  margin-bottom:40rpx;
+}
+.goods-listType1 .f-box:last-child{
+  margin:0;
+}
+.goods-img{
+  width:168rpx;
+  height:168rpx;
+  background:#eeedf2;
+}
+.goods-img image{
+  width:168rpx;
+  height:168rpx;
+}
+.goods-summry{
+  color:#666666;
+  font-size:24rpx;
+  margin-top:8rpx;
+}
+.goods-introduce{
+  height:128rpx;
+}
+.goods-listType2{
+  padding:30rpx;
+  background:#fff;
+}
+.goods-listType2 .goods-list{
+  width:332rpx;
+  margin-bottom:26rpx;
+}
+.goods-listType2 .goods-img{
+  width:332rpx;
+  height:332rpx;
+  background:#eeedf2;
+  display: block;
+}
+.goods-listType2 .goods-summary{
+  height:44rpx;
+  line-height:44rpx;
+  background:#f1f7fc;
+  color:#666666;
+  padding:0 10rpx;
+  overflow: hidden;/*超出部分隐藏*/
+  white-space: nowrap;/*不换行*/
+  text-overflow:ellipsis;/*超出部分文字以...显示*/
+}
+.goods-listType2 .goods-title{
+  margin:10rpx 0;
 }

pages/invoiceInfor/invoiceInfor.wxss

@@ -51,8 +51,8 @@ page{
   margin-right: 22rpx;
 }
 .invoice_title_active{
-  color: #b4a078;
-  border:2px solid #b4a078;
+  color: #e60012;
+  border:2px solid #e60012;
 }
 
 .each_invoice_cont input{
@@ -179,7 +179,7 @@ input.short_input{
   line-height: 98rpx;
   color:#fff;
   text-align: center;
-  background-color: #b4a078;
+  background-color: #e60012;
 }
 .save_address{
   display: flex;

pages/kind/index.js

@@ -10,10 +10,10 @@ Page({
     goodsList:[],
     requestState:true, //默认为true,表示还有数据
     filterArray: [
-      { name: '1', value: '0~499元' },
-      { name: '2', value: '500~999元'},
-      { name: '3', value: '1000~1999元' },
-      { name: '4', value: '2000元以上' },
+      { name: '1', value: '0~499元', price: [0,499] },
+      { name: '2', value: '500~999元', price: [500, 999]},
+      { name: '3', value: '1000~1999元', price: [1000, 1999]},
+      { name: '4', value: '2000元以上', price: [2000, "~"] },
     ],
     filterStatic:false,
     page: 1, //默认第一页
@@ -113,6 +113,7 @@ Page({
       filterStatic: !that.data.filterStatic,
       page:1,
       goodsList:[],
+      requestState:true,
     })
     that.getGoodsList(that)
   },
@@ -122,6 +123,7 @@ Page({
       timeSort: that.data.timeSort === null ? 'asc' : that.data.timeSort === 'asc' ? 'desc' : 'asc',
       page:1,
       goodsList: [],
+      requestState: true,
     })
     that.getGoodsList(that)
   },
@@ -138,6 +140,7 @@ Page({
       minPrice: e.detail.value,
       page: 1,
       goodsList: [],
+      requestState: true,
     })
     that.getGoodsList(that)
   },
@@ -147,6 +150,7 @@ Page({
       maxPrice: e.detail.value,
       page: 1,
       goodsList: [],
+      requestState: true,
     })
     that.getGoodsList(that)
   },
@@ -161,6 +165,18 @@ Page({
       url: '/pages/buy/buy?com_id=' + id,
     })
   },
+  radioChange(e){ // radio切换
+    console.log(e.detail.value)
+    let that = this, price = e.detail.value.split(',');
+      that.setData({
+        minPrice: price[0],
+        maxPrice: price[1] == '~' ? null : price[1] ,
+        requestState: true, //数据初始化
+        page: 1,//数据初始化
+        goodsList: []//数据初始化
+      })
+    that.getGoodsList(that)
+  },
   search(){
     wx.redirectTo({
       url: "/pages/search/search",

pages/kind/index.wxml

@@ -54,7 +54,7 @@
           <view class='filter-frist'>
             <radio-group class="radio-group" bindchange="radioChange">
               <label class="radio" wx:for="{{filterArray}}">
-                <radio value="{{item.name}}" color='#e60012' />
+                <radio value="{{item.price}}" color='#e60012' />
                 {{item.value}}
               </label>
             </radio-group>

pages/mine/mine.js

@@ -1,5 +1,6 @@
 // index.js
-var app = getApp()
+var app = getApp();
+  let host = app.globalData.servsers; // 请求的url
 Page({
   data: {
     userId : '',
@@ -39,19 +40,19 @@ Page({
       data: [
         {
           label: "待付款",
-          state: "",
+          state: "0",
           icon: "icon-icon-test",
           num: 0,
         },
         {
           label: "待发货",
-          state: "",
+          state: "2",
           icon: "icon-daifahuo1",
           num: 0,
         },
         {
           label: "待收货",
-          state: "",
+          state: "3",
           icon: "icon-daishouhuo",
           num: 0,
         }
@@ -64,6 +65,7 @@ Page({
     var openid = getApp().globalData.openid;
     var un_id = getApp().globalData.un_id;
     var host = getApp().globalData.servsers;
+   
     wx.showNavigationBarLoading();
 
     wx.request({
@@ -93,6 +95,8 @@ Page({
       userInfo: getApp().globalData.userInfo,
       userId: getApp().globalData.un_id
     })
+    
+    console.log(getApp().globalData.userInfo)
  
   },
 
@@ -110,7 +114,7 @@ Page({
     //     url: '/pages/authorize/authorize?link=mine',
     //   })
     // } else {
-
+    that.getPhone(that)
       userInfo = getApp().globalData.userInfo;
       
       //查询用户身份
@@ -129,6 +133,38 @@ Page({
     wx.navigateTo({
       url: '/pages/orderList/orderList?state='+state,
     })
+  },
+  madeList(e) {
+    let state = e.currentTarget.dataset.state;
+    wx.navigateTo({
+      url: '/customized/pages/order/order?state=' + state,
+    })
+  },
+  bindPhone(){
+    wx.navigateTo({
+      url: '/pages/bindingPhone/bindingPhone',
+    })
+  },
+  getPhone(that){
+    console.log("获取手机号")
+    wx.request({
+      url:host+ '/userapi/userGetPhone',
+      method:'get',
+      data:{
+        user_id: getApp().globalData.un_id
+      },
+      success(res){
+        var tel = res.data.result
+        tel = "" + tel;
+        var reg = /(\d{3})\d{4}(\d{4})/;
+        var tel1 = tel.replace(reg, "$1****$2")
+        console.log(tel1)
+        that.setData({
+          'userInfo.phone':res.data.result,
+          tel:tel1
+        })
+      }
+    })
   }
 
 })

pages/mine/mine.wxml

@@ -11,7 +11,8 @@
     </view>
     <view class='user-right'>
       <view class="userinfo-nickname">{{userInfo.nickName}}</view>
-      <view class='user-phone'>点击绑定手机号</view>
+      <view wx:if="{{!userInfo.phone}}" class='user-phone' bindtap='bindPhone'>点击绑定手机号</view>
+      <view class='user-tel'>{{tel}} </view>
     </view>
   </view>
 
@@ -19,10 +20,10 @@
  <view class='user-order'>
     <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title f-box f-align-items-center">
       <view class='f-item'>{{orderList.label}}</view>
-      <view class='f-s28 f-box f-align-items-center'>
+      <!-- <view class='f-s28 f-box f-align-items-center' data-state="" bindtap='orderList'>
         <view>{{orderList.summary}}</view>
         <icon class='{{orderList.icon}} iconfont'></icon>
-      </view>
+      </view> -->
     </view>
     <view class='f-box order-list f-justify-content-center mar-l20 mar-r20 f-s28'>
       <view class='f-item  order-item' wx:for="{{orderList.data}}" data-state="{{item.state}}" bindtap='orderList'>
@@ -37,10 +38,10 @@
  <view class='user-order'>
     <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title f-box f-align-items-center">
       <view class='f-item'>{{madeList.label}}</view>
-      <view class='f-s28 f-box f-align-items-center'>
+      <!-- <view class='f-s28 f-box f-align-items-center'>
         <view>{{madeList.summary}}</view>
         <icon class='{{madeList.icon}} iconfont'></icon>
-      </view>
+      </view> -->
     </view>
     <view class='f-box order-list f-justify-content-center mar-l20 mar-r20 f-s28'>
       <view class='f-item  order-item' wx:for="{{orderList.data}}" data-state="{{item.state}}" bindtap='madeList'>

pages/mine/mine.wxss

@@ -31,6 +31,13 @@
   color:#fff;
   border-radius:60rpx;
 }
+.user-tel{
+  width:220rpx;
+  line-height:60rpx;
+  height:60rpx;
+  color:#fff;
+  border-radius:60rpx;
+}
 .order-list{
   text-align: center;
 }

pages/mineCoupon/coupon.wxss

@@ -16,7 +16,7 @@
 .coupon_title{
   text-align: left;
   line-height: 110rpx;
-  color: #b4a078;
+  color: #e60012;
   font-size: 78rpx;
   padding: 16rpx 0 0 0;
 }
@@ -32,8 +32,8 @@
   /* border-radius: 6rpx; */
 }
 .use_state_0{
-  color: #b4a078;
-  border: 1rpx solid #b4a078;
+  color: #e60012;
+  border: 1rpx solid #e60012;
 }
 .use_state_1{
   color: #c8c8c8;

pages/orderList/orderList.js

@@ -112,5 +112,17 @@ Page({
         })
       }
     })
-  }
+  },
+  orderInfor: function (options) { //之前查看详情
+    var that = this;
+    var id = options.currentTarget.dataset.id;
+
+    var newCarts = JSON.stringify(that.data.goosdListnew[id]);
+    newCarts = newCarts.replace(/&/g, "zss");
+
+    wx.navigateTo({
+      url: '/pages/confirmedList/confirmedList?goosdListnew=' + newCarts
+    })
+
+  },
 })

pages/patternMenu/patternMenu.js

@@ -40,6 +40,7 @@ Page({
     minPrice:null,//最低价格
     priceSort: null, //价格排序，默认降序
     timeSort: null, //价时间排序，默认降序
+    requestState:true, //默认是可以向下请求的
   },
 
   /**
@@ -81,7 +82,13 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+    let that = this;
+    if (that.data.requestState){
+      that.setData({
+        page:that.data.page + 1
+      })
+      that.getGiftList(that)
+    }
   },
 
   /**
@@ -103,6 +110,7 @@ Page({
       isSelect: e.currentTarget.dataset.id,
       goodsList:[],
       page:1,
+      requestState: true,
     })
     that.getGiftList(that)
   },
@@ -112,6 +120,7 @@ Page({
       timeSort: that.data.timeSort === null ? 'asc' : that.data.timeSort === 'asc' ? 'desc' : 'asc',
       goodsList: [],
       page: 1,
+      requestState: true,
     })
     that.getGiftList(that)
   },
@@ -121,6 +130,7 @@ Page({
       priceSort: that.data.priceSort === null ? 'asc' : that.data.priceSort === 'asc' ? 'desc' : 'asc',
       goodsList: [],
       page: 1,
+      requestState: true,
     })
     that.getGiftList(that)
   },
@@ -142,6 +152,7 @@ Page({
     that.setData({
       minPrice: e.detail.value,
       page: 1,
+      requestState:true,
       goodsList: [],
     })
     that.getGiftList(that)
@@ -151,6 +162,7 @@ Page({
     that.setData({
       maxPrice:e.detail.value,
       page:1,
+      requestState: true,
       goodsList:[],
     })
     that.getGiftList(that)
@@ -202,7 +214,8 @@ Page({
         })
         dataArray.push(...res.data.rows)
         that.setData({
-          goodsList: dataArray
+          goodsList: dataArray,
+          requestState: res.data.rows.length == that.data.limit
         })
       }
     })

pages/searchList/searchList.wxml

@@ -3,7 +3,7 @@
 
   <view class="header_fixed">
     <!-- 头部搜索 -->
-    <view class="header">
+    <view class="header-search">
       <view class="header_search_wrap">
         <navigator url="/pages/search/search"  class="header_search">
           <icon type="search"  size="12" color="#929aa0"  class="header_search_icon"></icon>

pages/searchList/searchList.wxss

@@ -18,7 +18,7 @@ page{
 ::-webkit-scrollbar-track-piece{
   color: transparent;
 }
-.header{
+.header-search{
   display: flex;
   flex-direction: row;
   height:104rpx;
@@ -108,8 +108,8 @@ page{
   box-sizing: border-box;
 }
 .nav_item_active{
-  color:#b4a078;
-  border-bottom:3rpx solid #b4a078; 
+  color:#e60012;
+  border-bottom:3rpx solid #e60012; 
 }
 .header_nav_title,.header_nav_icon{
   display: block;
@@ -187,7 +187,7 @@ page{
 }
 .full_price{
   font:bold 30rpx "Microsoft Yahei";
-  color:#b4a078;
+  color:#e60012;
   padding: 34rpx 0 30rpx 32rpx;
 }
 .full_price_unit{