首页改版

app.js

@@ -13,7 +13,7 @@ App({
     // 定义全局请求队列
     requestQueue: [],
     // 是否正在进行登陆
-    isLanding: true,
+    isLanding: false,
     // 购物车商品数量
     totalCartCount: 0,
     statusBarHeight: 0,

app.json

@@ -90,7 +90,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#04358D",
-    "navigationBarTitleText": "海马购多店铺商城",
+    "navigationBarTitleText": "海马购",
     "navigationBarTextStyle": "white"
   },
   "tabBar": {
@@ -103,12 +103,6 @@
         "iconPath": "images/tabbar/home.png",
         "selectedIconPath": "images/tabbar/select_home.png"
       },
-      {
-        "pagePath": "pages/category/category",
-        "text": "分类",
-        "iconPath": "images/tabbar/sort.png",
-        "selectedIconPath": "images/tabbar/select_sort.png"
-      },
       {
         "pagePath": "pages/basket/basket",
         "text": "购物车",

app.wxss

@@ -9,6 +9,7 @@
   font-family: Arial;
   display: inline-block;
   color: #e43130;
+  color: #FF4D3A;
 
 }
 

components/topNavtar/topNavtar.wxss

@@ -5,7 +5,7 @@
 	width: 100%;
 	height: 30px;
 	line-height: 30px;
-  background: linear-gradient(to bottom, #D9E7FF, #e0eafa,#F6F6F6 );
+  /* background: linear-gradient(to bottom, #D9E7FF, #e0eafa,#F6F6F6 ); */
 	top: 0;
 	left: 0;
 }

pages/basket/basket.wxml

@@ -10,9 +10,9 @@
 						</label>
 					</view>
 					<view class="shop-box">
-						<view class="shop-icon">
+						<!-- <view class="shop-icon">
 							<image src="../../images/icon/shop.png"></image>
-						</view>
+						</view> -->
 						<view class="shop-name">{{shopCart.shopName}}</view>
 					</view>
 				</view>

pages/basket/basket.wxss

@@ -16,6 +16,7 @@ page {
 .shop-item {
   margin-top: 20rpx;
   background: #fff;
+  margin: 20rpx 24rpx 0;
 }
 
 /* 店铺 */
@@ -141,6 +142,8 @@ page {
   text-align: center;
   width: 200rpx;
   height: 200rpx;
+  width: 160rpx;
+  height: 160rpx;
   line-height: 180rpx;
   font-size: 0;
 }
@@ -148,6 +151,7 @@ page {
 .shop-item .prod-block .item .prodinfo .pic image {
   width: 100%;
   height: 100%;
+  border-radius: 16rpx;
 }
 
 .shop-item .prod-block .item .prodinfo .opt {
@@ -295,8 +299,10 @@ checkbox .wx-checkbox-input {
 /*checkbox选中后样式  */
 
 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  background: #e43130;
-  border-color: #e43130;
+  /* background: #e43130;
+  border-color: #e43130; */
+  background: #04358D;
+  border-color: #04358D;
 }
 
 /*checkbox选中后图标样式  */
@@ -378,7 +384,9 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
 .cart-footer .settle {
   height: 70rpx;
   line-height: 70rpx;
-  padding: 0 50rpx;
+  /* padding: 0 50rpx; */
+  width: 220rpx;
+  text-align: center;
   background: #04358D;
   color: #fff;
   border-radius: 70rpx;

pages/category/category.js

@@ -40,7 +40,13 @@ Page({
         lon: wx.getStorageSync('LONGITUDE'),
       },
       callBack: (res) => {
-        this.get_categoryInfo(res)
+        // this.get_categoryInfo(res)
+
+        if(typeof res == 'number'){
+          this.get_categoryInfo(res)
+        }else{
+          this.get_categoryInfo(res.shopId)
+        }
       }
     };
     http.request(params);

pages/index/index.js

@@ -7,7 +7,13 @@ var qqmapsdk;
 const updateManager = wx.getUpdateManager()
 
 Page({
+  isHand:false,
   data: {
+    active:1,
+    imgUrl:'https://zswl-shop.oss-cn-chengdu.aliyuncs.com/',
+    swiperCurrent:0,
+    swiperList:[],
+    shopName:'附近暂无可配送门店',
     indicatorDots: true,
     indicatorColor: '#d1e5fb',
     indicatorActiveColor: '#1b7dec',
@@ -38,24 +44,22 @@ Page({
     shopDetail: {},
     select_address: '',
     categoryList: [],
+    categoryList1: [],
     currentIndex: 0,
     topCurrentIndex: 0,
     currentTop: 0,
     shop_id: 0,
     get_distance: '',
-    banner_img: [{
-      img: 'http://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/xknrncsYG4L2f1699eed502ae046be52217909706ce0.png/1.png',
-      name: 'favorable'
-    }, {
-      img: 'http://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/SiHsdYVvGOfN8dd011d57987b0572fb77f1e0f33033c.png/1.png',
-      name: 'groupBuy'
-    }, {
-      img: 'http://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/p1bOAGd4UIUL89b253cd162de9931da519d15fc9affb.png/1.png',
-      name: 'new'
-    }, {
-      img: 'http://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/aYuT49lwccIP302a75bbe43de144f4ed2601cbe9398f.png/1.png',
-      name: 'seckill'
-    }]
+    banner_img: [
+    {
+      img:'https://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/JrXik2T4vhwp7c25b370159a7498499e7b4b76cfb288.png/1.png',
+      name:''
+    },
+    {
+      img:'https://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/OFG6necEvIOpcd39097fe6f106894503a4d77c14d7b8.png/1.png',
+      name:''
+    },
+  ]
   },
 
   onLoad: function () {
@@ -77,6 +81,24 @@ Page({
       this.getAllData();
     }, 1000)
   },
+
+  handleTab(e){
+    this.setData({
+      active:Number(e.currentTarget.dataset.active),
+      current:Number(e.currentTarget.dataset.active),
+      hotSalesList:[],
+      isHand:true
+    })
+    setTimeout(() => {
+      this.getHotSalesProds()
+    }, 100);
+  },
+  // 顶部轮播滚动
+  changeIndex(e){
+      this.setData({
+        swiperCurrent:e.detail.current
+      })
+  },
   get_setting: function () {
     let that = this
     wx.getSetting({
@@ -233,6 +255,26 @@ Page({
       }
     });
   },
+  /**
+   * 广告位
+   */
+  getAdv: function () {
+    var params = {
+      url: "/advert/search",
+      method: "GET",
+      data: {
+        current: 1,
+        size:99,
+        status:1
+      },
+      callBack: (res) => {
+        this.setData({
+          swiperList: res.records
+        })
+      }
+    };
+    http.request(params);
+  },
   /**
    * 推荐词,type:1关键词,2热门搜索词，3推荐搜索词
    */
@@ -323,10 +365,10 @@ Page({
    */
   splitList: function (arr) {
     let result = [];
-    let groupCount = Math.ceil(arr.length / 10);
+    let groupCount = Math.ceil(arr.length / 5);
     for (let i = 0; i < groupCount; i++) {
-      let startIndex = i * 10;
-      let endIndex = Math.min((i + 1) * 10, arr.length);
+      let startIndex = i * 5;
+      let endIndex = Math.min((i + 1) * 5, arr.length);
       result.push(arr.slice(startIndex, endIndex));
     }
     return result;
@@ -342,17 +384,26 @@ Page({
       url: "/category/categoryInfo",
       method: "GET",
       data: {
-        shopId: shopId
+        shopId: shopId,
+        current:1,
+        size:99999
       },
       callBack: function (res) {
         let categoryName = ''
-        res.forEach(e => {
+        res.records.forEach(e => {
           categoryName = e.categoryName.split('>')
           e.categoryName = categoryName[0]
         })
-        let newRes = _this.splitList(res)
+        let newRes = _this.splitList(res.records)
+        let categoryList = newRes.splice(0,2)
+        if(categoryList.length == 2){
+          categoryList = categoryList[0].concat(categoryList[1])
+        }else if(categoryList.length == 1){
+          categoryList = categoryList[0]
+        }
         _this.setData({
-          categoryList: newRes,
+          categoryList: categoryList,
+          categoryList1: newRes,
         });
       }
     };
@@ -520,35 +571,36 @@ Page({
    * 新品推荐
    */
   getNewList: function () {
-    var params = {
-      url: "/prod/lastedProdPage",
-      method: "GET",
-      data: {
-        current: 1,
-        size: 4,
-        lat: wx.getStorageSync('LATITUDE'),
-        lon: wx.getStorageSync('LONGITUDE'),
-        distance: wx.getStorageSync('DISTANCE') || 0,
-        shopId:this.data.shop_id
-      },
-      callBack: (res) => {
-        let img = ''
-        res.records.map(e => {
-          img = e.pic.split(',')
-          e.pic = img[0]
-        })
-        this.setData({
-          newList: res.records,
-        })
-      }
-    };
-    http.request(params);
+    // var params = {
+    //   url: "/prod/lastedProdPage",
+    //   method: "GET",
+    //   data: {
+    //     current: 1,
+    //     size: 4,
+    //     lat: wx.getStorageSync('LATITUDE'),
+    //     lon: wx.getStorageSync('LONGITUDE'),
+    //     distance: wx.getStorageSync('DISTANCE') || 0,
+    //     shopId:this.data.shop_id
+    //   },
+    //   callBack: (res) => {
+    //     let img = ''
+    //     res.records.map(e => {
+    //       img = e.pic.split(',')
+    //       e.pic = img[0]
+    //     })
+    //     this.setData({
+    //       newList: res.records,
+    //     })
+    //   }
+    // };
+    // http.request(params);
   },
   /**
    * 获取距离最近店铺id
    * @param {*} e 
    */
   get_neighborShop: function () {
+    console.log('get_neighborShop');
     var params = {
       url: "/shop/neighborShop",
       method: "GET",
@@ -557,13 +609,24 @@ Page({
         lon: wx.getStorageSync('LONGITUDE'),
       },
       callBack: (res) => {
-        this.getaddress_transports(res)
-        this.setData({
-          shop_id: res
-        })
-        setTimeout(() => {
-          this.getClassInfo(res);
-        }, 300)
+        if(typeof res == 'number'){
+          this.getaddress_transports(res)
+          this.setData({
+            shop_id: res
+          })
+          setTimeout(() => {
+            this.getClassInfo(res);
+          }, 300)
+        }else{
+          this.getaddress_transports(res.shopId)
+          this.setData({
+            shop_id: res.shopId,
+            shopName:res.shopName
+          })
+          setTimeout(() => {
+            this.getClassInfo(res.shopId);
+          }, 300)
+        }
       }
     };
     http.request(params);
@@ -589,6 +652,7 @@ Page({
       },
       errCallBack(res) {
         console.log(res);
+        wx.setStorageSync('DISTANCE', 0)
       }
     };
     http.request(params);
@@ -743,6 +807,7 @@ Page({
     this.getAbulk();
     this.getRecommended()
     this.getRecommendeds()
+    this.getAdv()
     setTimeout(() => {
       this.getNewList();
       this.getSnapUpList();
@@ -752,6 +817,7 @@ Page({
 
   //加载轮播图
   getIndexImgs() {
+    console.log('getIndexImgs');
     //加载轮播图
     var params = {
       url: "/indexImgs/0",
@@ -794,7 +860,7 @@ Page({
       data: {
         current: this.data.current,
         size: 10,
-        sort: 1,
+        sort: 3,
         orderBy: 1,
         lat: wx.getStorageSync('LATITUDE'),
         lon: wx.getStorageSync('LONGITUDE'),
@@ -828,6 +894,9 @@ Page({
             })
           }
         }
+        this.setData({
+          isHand:false
+        })
       }
     };
     http.request(param);
@@ -835,11 +904,12 @@ Page({
 
   // 触底加载下一页
   getNextPage() {
+    console.log('getNextPage',this.data.current);
     if (this.data.pages > this.data.current) {
       this.setData({
         current: this.data.current + 1
       })
-      this.getHotSalesProds()
+      !this.data.isHand&&this.getHotSalesProds()
     } else {
       this.setData({
         isAll: true

pages/index/index.wxml

@@ -2,12 +2,14 @@
 <view class="container" style="padding-top: {{pageTopHeight}}px;">
   <navbar>
     <view class="top-navbar-box" wx:if="{{gapTop==1}}" style="opacity: {{titleOpacity}};">
-      <view class="shop-title">海马购</view>
+      <!-- <view class="shop-title">海马购</view> -->
       <view class="shop-info">
-        <view>百货超市</view>|
+        <!-- <view>百货超市</view>| -->
         <view bindtap="toLocationPage" class="shop-address-info">
-          <van-icon name="location-o" />
-          {{select_address||'选择定位'}}
+          <!-- <van-icon name="location-o" /> -->
+          <image class="position-icon" src="../../images/icon/position.png" mode=""/>
+          <!-- {{select_address||'选择定位'}} -->
+          {{shopName||'附近暂无可配送门店'}}
         </view>
       </view>
     </view>
@@ -27,27 +29,46 @@
       <swiper vertical="true" circular="true" autoplay="true" interval="3000" class="search-swiper" bindtap="toSearchPage" bindchange="swiperChange">
         <swiper-item wx:for="{{hotList}}" wx:key="index">{{item.name}}</swiper-item>
       </swiper>
-      <view class="search-line">|</view>
+      <!-- <view class="search-line">|</view> -->
       <view class="search-text" bindtap="inputSearch">搜索</view>
     </view>
     <view class="top-share">
-      <van-icon name="share" />
+      <van-icon name="share" color="#fff" />
       <view class="share-text">分享</view>
       <button class="share-btn" open-type="share"></button>
     </view>
   </view>
   <view class="recommended-box">
-    <scroll-view class="recommended-swiper" scroll-x="true">
+    <scroll-view class="recommended-swiper" enhanced="true" show-scrollbar="false" scroll-x="true">
       <view class="recommended-text" wx:for="{{recommendedList}}" bindtap="recommendedSearch" data-name="{{item.name}}">
         {{item.name}}
       </view>
     </scroll-view>
   </view>
   <!-- 搜索框end -->
+  <view class="bg-box">
+    <image class="bg" src="{{imgUrl+swiperList[swiperCurrent].advertBack}}" mode=""/>
+    <swiper indicator-dots="true" class="swiper-box" interval="3000" circular="true" indicator-active-color="#04358D" autoplay="true" bindchange="changeIndex">
+      <swiper-item wx:for="{{swiperList}}"  wx:key="index" bindtap="goToLevelPage" data-name="{{item}}">
+        <image class="block" src="{{imgUrl+item.advertImg}}" mode=""/>
+      </swiper-item>
+    </swiper>
+    <view class="white-block"></view>
+  </view>
+
   <!-- 板块 -->
-  <view class="swiper-grid-box" wx:if="{{categoryList.length>0}}">
+  <view class="swiper-grid-box" wx:if="{{categoryList1.length>0}}">
+  <view class="grid-box">
+    <van-grid border="{{false}}" column-num="5">
+          <van-grid-item class="my-grid-item" use-slot bind:click="selectMenu" wx:for="{{categoryList}}" wx:key="categoryId" data-pic="{{item.pic}}" data-itemid="{{item.categoryId}}" data-index="{{index}}" data-categories="{{item.categories}}" data-categoryName="{{item.categoryName}}">
+            <image class="swiper-grid-image" src="{{item.icon}}" />
+            <text class="swiper-grid-text">{{item.categoryName}}</text>
+          </van-grid-item>
+        </van-grid>
+  </view>
+    
     <swiper class="swiper-grid" indicator-dots="true" indicator-active-color="#04358D" bindchange="menuSwiper">
-      <swiper-item wx:for="{{categoryList}}" wx:key="index">
+      <swiper-item wx:for="{{categoryList1}}" wx:key="index">
         <van-grid border="{{false}}" column-num="5">
           <van-grid-item class="my-grid-item" use-slot bind:click="selectMenu" wx:for="{{item}}" wx:key="categoryId" data-pic="{{item.pic}}" data-itemid="{{item.categoryId}}" data-index="{{index}}" data-categories="{{item.categories}}" data-categoryName="{{item.categoryName}}">
             <image class="swiper-grid-image" src="{{item.icon}}" />
@@ -58,7 +79,20 @@
     </swiper>
   </view>
   <!-- 板块end -->
-  <view class="bonus-box" wx:if="{{hotSalesList.length>0}}">
+
+  <!-- 通知 广告 -->
+  <view class="notice">
+  <image class="icon" src="../../images/icon/notice-icon.png" mode=""/>
+    【会员超福利】限时30元开卡红包好礼，速点>
+  </view>
+
+  <image class="adv adv1" src="../../images/imgs/adv1.png" mode=""/>
+  
+
+  <!-- 通知广告end -->
+
+
+  <!-- <view class="bonus-box" wx:if="{{hotSalesList.length>0}}">
     <view class="content-bonus" bindtap="toRedPackage">
       <image style="width:36rpx;height: 36rpx;" src="/images/icon/redPack.png" mode="" />
       <view class="bonus-text">天天领红包</view>
@@ -67,7 +101,7 @@
       <image style="width:36rpx;height: 36rpx;" src="/images/icon/ticket.png" mode="" />
       <view class="bonus-text">领券中心</view>
     </view>
-  </view>
+  </view> -->
   <view class="seckill-box" wx:if="{{snapUpList.length>0}}">
   <!-- 秒杀 -->
     <view class="seckill-time">
@@ -90,9 +124,10 @@
       </view>
     </view>
     <!-- 秒杀end -->
+    <image class="adv adv2" src="../../images/imgs/adv2.png" mode=""/>
 
     <!-- 推荐 -->
-    <view class="recommended-card" wx:if="{{newList.length>0}}">
+    <!-- <view class="recommended-card" wx:if="{{newList.length>0}}">
       <view class="new-text">
         <view class="seckill-title new-text-two">新品推荐</view>
         <view class="times">鲜品速荐</view>
@@ -107,8 +142,20 @@
       <view class="more-icon" bindtap="toClassifyPage" data-sts="1">
         <van-icon name="arrow" />
       </view>
-    </view>
+    </view> -->
     <!-- 推荐end -->
+
+    <!-- 分类分页 -->
+    <scroll-view class="tab-box" scroll-x="true" bounces="true" enhanced="true" show-scrollbar="false" style="width: 100%">
+      <view id="demo1" class="tab {{active==1?'active':''}}" bindtap="handleTab" data-active="1">精选热卖</view>
+      <view id="demo1" class="tab {{active==2?'active':''}}" bindtap="handleTab" data-active="2">疯狂折扣</view>
+      <view id="demo1" class="tab {{active==3?'active':''}}" bindtap="handleTab" data-active="3">
+        <image class="icon" src="../../images/imgs/chaozhi.png" alt=""/>
+      </view>
+      <view id="demo1" class="tab {{active==4?'active':''}}" bindtap="handleTab" data-active="4">地道特产</view>
+      <view id="demo1" class="tab {{active==5?'active':''}}" bindtap="handleTab" data-active="5">预售</view>
+    </scroll-view>
+
     <!-- 商城热卖 -->
     <view class="content" wx:if="{{hotSalesList.length>0}}">
       <view class="left">
@@ -133,6 +180,7 @@
                   <view class="name-price">
                     <view style="font-size:26rpx;color: #FF4D3A;">￥</view>{{wxs.toPrice(item.price)}}
                   </view>
+                  <image style="width:52rpx;height:52rpx;" src="/images/icon/car-btn.png" mode=""/>
                   <!-- <view class="stepper-box" wx:if="{{item.notData}}">
                     <view class="stepper-minus" catchtap="minusButton" data-item="{{item}}">-</view>
                     <view class="stepper-num">{{totalNum}}</view>
@@ -159,6 +207,7 @@
                   <view class="name-price">
                     <view style="font-size:26rpx;color: #FF4D3A;">￥</view>{{wxs.toPrice(item.price)}}
                   </view>
+                  <image style="width:52rpx;height:52rpx;" src="/images/icon/car-btn.png" mode=""/>
                   <!-- <view class="stepper-box" wx:if="{{item.notData}}">
                     <view class="stepper-minus" catchtap="minusButton">-</view>
                     <view class="stepper-num">1</view>

pages/index/index.wxss

@@ -1,16 +1,65 @@
 /**index.wxss**/
 
 page {
-  background: #f7f7f7;
+  background: #F6F6F6;
   height: auto;
+  position: relative;
+}
+scroll-view::-webkit-scrollbar{
+display: none;
+width: 0;
+height: 0;
+color: transparent;
+}
+.bg-box{
+  position: absolute;
+  z-index: -1;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 524rpx;
+}
+.bg{
+  position: relative;
+  /* z-index: -1;
+  top: 0;
+  left: 0; */
+  width: 100%;
+  height: 524rpx;
+  vertical-align: bottom;
+}
+.bg-box .white-block{
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 70rpx;
+  background: linear-gradient( 180deg, rgba(255,255,255,0) 0%, rgba(248,248,248,0.52) 39%, #F6F6F6 100%);
+}
+.swiper-box{
+  width: 704rpx!important;
+  height: 180rpx;
+  border-radius: 16rpx;
+  position: absolute;
+  left: 24rpx;
+  bottom: 38rpx;
+}
+.swiper-box swiper-item{
+  width: 704rpx!important;
+
+}
+.swiper-box swiper-item .block{
+  height: 180rpx;
+  width: 704rpx;
+  vertical-align: bottom;
+
 }
 
 /* 轮播图及搜索框 */
 swiper {
   width: 100%;
-  height: 400rpx;
+  /* height: 400rpx; */
   overflow: hidden;
-  margin-top: 80rpx;
 }
 
 swiper.pic-swiper {
@@ -63,12 +112,16 @@ swiper.pic-swiper .banner {
   display: flex;
   align-items: center;
   margin-left: 20rpx;
+  color: #fff;
 }
 
 .top-navbar-box .shop-title {
   font-weight: bold;
   font-size: 36rpx;
 }
+.top-navbar-box .shop-info{
+  color: #fff;
+}
 
 .shop-info {
   margin-left: 12rpx;
@@ -79,7 +132,8 @@ swiper.pic-swiper .banner {
 
 .search-box {
   display: flex;
-  padding: 20rpx 20rpx 30rpx;
+  padding-bottom: 20rpx;
+  margin-top: 20rpx;
 }
 
 .top-search-input {
@@ -91,6 +145,7 @@ swiper.pic-swiper .banner {
   border: 2rpx solid #04358D;
   border-radius: 40rpx;
   height: 60rpx;
+  background: #fff;
 }
 
 .top-search-swiper {
@@ -109,7 +164,7 @@ swiper.pic-swiper .banner {
 .top-search-text {
   width: 100rpx;
   font-weight: bold;
-  font-size: 28rpx;
+  font-size: 24rpx;
   color: #04358D;
 }
 
@@ -117,9 +172,10 @@ swiper.pic-swiper .banner {
   display: flex;
   align-items: center;
   width: 642rpx;
-  border: 2rpx solid #04358D;
+  /* border: 2rpx solid #04358D; */
   border-radius: 40rpx;
   height: 60rpx;
+  background: #fff;
 }
 
 .search-swiper {
@@ -139,9 +195,14 @@ swiper.pic-swiper .banner {
 
 .search-text {
   width: 100rpx;
+  line-height: 50rpx;
+  text-align: center;
+  border-radius: 25rpx;
   font-weight: bold;
   font-size: 28rpx;
-  color: #04358D;
+  color: #FFF;
+  background: #04358D;
+  margin-right: 10rpx;
 }
 
 .top-share {
@@ -168,29 +229,39 @@ swiper.pic-swiper .banner {
 .share-text {
   font-weight: normal;
   font-size: 22rpx;
-  color: #222222;
+  color: #fff;
+  white-space: nowrap;
 }
 
 .recommended-box {
-  height: 80rpx;
+  /* height: 80rpx; */
+  margin-bottom: 20rpx;
+  position: absolute;
+  left: 24rpx;
+  top: 254rpx;
+  width: 726rpx;
 }
 
 .recommended-swiper {
-  height: 80rpx;
+  /* height: 80rpx; */
   white-space: nowrap;
 }
+  
 
 .recommended-text {
   margin-left: 20rpx;
   display: inline-block;
   padding: 6rpx 12rpx;
-  background: #dddbdb;
+  background: rgba(255, 255, 255, .5);
   text-align: center;
   border-radius: 22rpx 22rpx 22rpx 22rpx;
   font-size: 24rpx;
   color: #222222;
 }
-
+.container{
+  padding-left:24rpx;
+  padding-right: 24rpx;
+}
 .container .bg-sear {
   position: fixed;
   z-index: 999;
@@ -230,22 +301,40 @@ swiper.pic-swiper .banner {
 
 /* 分类栏目 */
 .swiper-grid-box {
-  padding: 16rpx;
-  margin-top: -30rpx;
+  /* padding: 16rpx 0; */
+  margin-bottom: 20rpx;
+  border-radius: 16rpx;
+  background: #fff;
+  margin-top: 213rpx;
+  /* margin-top: 300rpx; */
+}
+
+.swiper-grid-box .grid-box .van-grid{
+  border-radius: 16rpx;
+}
+
+.grid-box,.swiper-grid{
+  padding-top: 20rpx;
 }
 
 .swiper-grid {
   margin-top: -10rpx;
   border-radius: 16rpx;
   background-color: #fff;
+  height: 220rpx;
 }
 .my-grid-item .van-grid-item__content {
   padding: 0rpx;
-  margin-top: 20rpx;
+  /* margin-top: 20rpx; */
 }
 .swiper-grid-image{
   width:100rpx;
   height:100rpx;
+  border-radius: 32rpx;
+}
+.swiper-grid .swiper-grid-image{
+  width:72rpx;
+  height:72rpx;
   border-radius: 50%;
 }
 .swiper-grid-text {
@@ -261,6 +350,37 @@ swiper.pic-swiper .banner {
   letter-spacing: normal;
 }
 
+
+.notice{
+  display: flex;
+  align-items: center;
+  font-weight: bold;
+  font-size: 24rpx;
+  color: #E70C11;
+  background: #fff;
+  border-radius: 16rpx;
+  padding: 16rpx 24rpx;
+  margin-bottom: 20rpx;
+}
+
+.notice .icon{
+  width: 40rpx;
+  height: 40rpx;
+}
+
+.adv{
+  width: 100%;
+  vertical-align: bottom;
+  margin-bottom: 20rpx;
+}
+.adv1{
+  height: 392rpx;
+}
+
+.adv2{
+  height: 473rpx;
+}
+
 .bonus-box {
   display: flex;
 }
@@ -269,10 +389,12 @@ swiper.pic-swiper .banner {
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 216rpx;
+  width: 192rpx;
   height: 64rpx;
   background: #FFFFFF;
   border-radius: 16rpx 16rpx 16rpx 16rpx;
+}
+.content-bonus+.content-bonus{
   margin-left: 20rpx;
 }
 
@@ -349,7 +471,7 @@ swiper.pic-swiper .banner {
 
 .recommended-card {
   position: relative;
-  margin: 20rpx;
+  margin: 20rpx 0;
   padding: 20rpx;
   background-color: #FFFFFF;
   display: flex;
@@ -375,9 +497,36 @@ swiper.pic-swiper .banner {
   color: #FF4A39;
 }
 
+/* 分页分类 */
+.tab-box{
+  white-space: nowrap;
+  margin-bottom: 20rpx;
+}
+ 
+.tab-box .tab{
+  display: inline-block;
+  font-size: 32rpx;
+  color: #222222;
+  margin-right: 44rpx;
+}
+.tab-box .tab .icon{
+  width: 105rpx;
+  height: 29rpx;
+}
+.tab-box .tab.active{
+  font-weight: 800;
+  font-size: 36rpx;
+}
+
+
+
+
+
 /* 每日上新 */
 .content {
   text-align: justify;
+  display: flex;
+  justify-content: space-between;
 }
 .reset-localization{
   text-align: center;
@@ -385,10 +534,11 @@ swiper.pic-swiper .banner {
   color: #AAAAAA;
 }
 .swiper-card-box {
-  margin-top: 10rpx;
+  margin-bottom: 20rpx;
   height: 470rpx;
-  margin-left: 3%;
-  width: 96%;
+  /* margin-left: 3%; */
+  /* width: 96%; */
+  width: 344rpx;
 }
 
 .wx-swiper-dots-horizontal .wx-swiper-dot {
@@ -398,7 +548,7 @@ swiper.pic-swiper .banner {
 }
 
 .swiper-card {
-  margin-top: 10rpx;
+  /* margin-top: 10rpx; */
   height: 462rpx;
   background: #FFFFFF;
   border-radius: 16rpx;
@@ -406,16 +556,17 @@ swiper.pic-swiper .banner {
 
 .swiper-card-img {
   height: 462rpx;
-  width: 354rpx;
+  width: 344rpx;
   border-radius: 16rpx;
+  vertical-align: bottom;
 }
 
 .item {
   background-color: #fff;
-  margin: 10rpx 4%;
-  margin-bottom: 0rpx;
+  /* margin-top: 20rpx; */
+  margin-bottom: 20rpx;
   display: inline-block;
-  width: 96%;
+  width: 344rpx;
   border-radius: 16rpx;
   overflow: hidden;
 }
@@ -443,7 +594,8 @@ swiper.pic-swiper .banner {
 }
 
 .item-img {
-  width: 100%
+  width: 100%;
+  vertical-align: bottom;
 }
 
 .item-title {
@@ -498,7 +650,7 @@ swiper.pic-swiper .banner {
 .right {
   display: inline-block;
   vertical-align: top;
-  width: 49%;
+  width: 344rpx;
 }
 
 .stepper-box {
@@ -577,15 +729,24 @@ swiper.pic-swiper .banner {
 .shop-info {
   font-family: PingFang SC, PingFang SC;
   font-weight: 800;
-  font-size: 28rpx;
+  font-size: 24rpx;
   color: #222222;
 }
 
 .shop-address-info {
-  width: 300rpx;
+  width: 500rpx;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  display: flex;
+  align-items: center;
+  font-size: 32rpx;
+}
+
+.position-icon{
+  width: 36rpx;
+  height: 36rpx;
+  vertical-align: bottom;
 }
 
 .popup-line {

pages/locationAdd/locationAdd.js

@@ -79,7 +79,9 @@ Page({
       callBack: (res) => {
         wx.hideLoading();
         this.getAddrList()
-        this.getTxmap()
+        // 当前定位显示选择地址的名称 不再显示路名
+        // this.getTxmap()
+       wx.setStorageSync('ADDRESS', e.currentTarget.dataset.item.addressName)
         setTimeout(() => {
           let pages = getCurrentPages();
           let prevPage = pages[pages.length - 2]; //获取A页面
@@ -96,6 +98,7 @@ Page({
     http.request(params);
   },
   getTxmap: function () {
+
     // 调用腾讯地图api获取当前位置
     qqmapsdk.reverseGeocoder({
       location: {

pages/order-detail/order-detail.wxml

@@ -64,7 +64,7 @@
             </view>
           </view>
           <!-- 申请退款btn -->
-          <text class="apply-refund-btn" catchtap="applyRefund" data-itemactualtotal="{{item.actualTotal}}" data-item="{{item}}" wx:if="{{!item.refundSn && canRefund && orderType !=3||item.status==6}}" data-refundtype="2" data-type="{{status == 2?'1':'2'}}">申请退款</text>
+          <!-- <text class="apply-refund-btn" catchtap="applyRefund" data-itemactualtotal="{{item.actualTotal}}" data-item="{{item}}" wx:if="{{!item.refundSn && canRefund && orderType !=3||item.status==6}}" data-refundtype="2" data-type="{{status == 2?'1':'2'}}">申请退款</text> -->
           <text class="apply-refund-btn" catchtap="viewRefund" data-ordernumber='{{item.orderNumber}}' data-refundsn="{{item.refundSn}}" wx:if="{{item.refundSn}}">查看退款</text>
           <!-- 申请退款btn -->
         </view>

pages/orderList/orderList.wxml

@@ -17,14 +17,12 @@
         <!-- 店铺 -->
         <!-- bindtap='toShopIndex' data-shopid="{{item.shopId}}" -->
         <view class="shop-box">
-          <view class="shop-icon">
-            <image src="../../images/icon/shop.png"></image>
+          <view class="shop-info">
+            <view class="shop-icon">
+              <image src="../../images/icon/shop.png"></image>
+            </view>
+            <view class="shop-name">{{item.shopName}}</view>
           </view>
-          <view class="shop-name">{{item.shopName}}</view>
-        </view>
-        <!-- 订单编号 -->
-        <view class="order-num">
-          <text>订单编号：{{item.orderNumber}}</text>
           <view class='order-state'>
             <text class="order-sts {{item.status<5?'red':''}}">{{['','待支付','待发货','待收货','待评价','已完成','已取消','拼团中'][item.status]}}</text>
             <!-- 退款状态 -->
@@ -40,6 +38,11 @@
             </view>
           </view>
         </view>
+        <!-- 订单编号 -->
+        <view class="order-num">
+          <text>订单编号：{{item.orderNumber}}</text>
+          <!-- 原订单状态位置 -->
+        </view>
         <!-- 商品列表 -->
         <!-- 一个订单单个商品的显示 -->
         <block wx:if="{{item.orderItemDtos.length==1}}">

pages/orderList/orderList.wxss

@@ -51,6 +51,12 @@ page {
   border-bottom: 2rpx solid #f2f2f2;
   display: flex;
   align-items: center;
+  justify-content: space-between;
+
+}
+.shop-box .shop-info{
+  display: flex;
+  align-items: center;
 }
 
 .shop-icon {
@@ -66,7 +72,7 @@ page {
 }
 
 .shop-name {
-  font-size: 28rpx;
+  font-size: 32rpx;
   font-weight: 600;
   position: relative;
   padding-right: 20rpx;
@@ -107,6 +113,7 @@ page {
   color: #999999;
   display: flex;
   align-items: center;
+  font-size: 24rpx;
 }
 
 .order-state .red {
@@ -114,7 +121,7 @@ page {
 }
 
 
-.prod-item .order-num .clear-btn {
+.prod-item .order-state .clear-btn {
   width: 28rpx;
   height: 28rpx;
   font-size: 0;
@@ -122,7 +129,7 @@ page {
   position: relative;
 }
 
-.prod-item .order-num .clear-btn::after {
+.prod-item .order-state .clear-btn::after {
   content: " ";
   display: block;
   position: absolute;
@@ -133,7 +140,7 @@ page {
   background: #eee;
 }
 
-.prod-item .order-num .clear-btn .clear-list-btn {
+.prod-item .order-state .clear-btn .clear-list-btn {
   width: 100%;
   height: 100%;
 }
@@ -190,6 +197,7 @@ page {
 }
 
 .prod-item .item-cont .prod-info .prodname {
+  font-size: 32rpx;
   line-height: 34rpx;
   max-height: 68rpx;
   display: -webkit-box;
@@ -245,11 +253,15 @@ page {
 
 .prod-item .symbol,
 .prod-item .small-num {
-	font-size: 24rpx;
+  font-size: 32rpx;
+  color: #FF4D3A;
+  font-weight: bold;
 }
 
-.prod-item .big {
-	font-size: 32rpx;
+.prod-item .big-num {
+  font-size: 32rpx;
+  color: #FF4D3A;
+  font-weight: bold;
 }
 
 .prod-item  .price-nums .prodcount {
@@ -260,7 +272,7 @@ page {
 
 .prod-item  .total-num {
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
   align-items: center;
   padding: 20rpx;
   font-size: 24rpx;

pages/prod/prod.wxml

@@ -1,186 +1,194 @@
 <!-- 商品详情 -->
-	<view class="container ">
-		<!-- 轮播图 -->
-		<view class="swiper-con">
-			<view class="video-container" wx:if="{{video && isPlaying}}">
-				<video enable-progress-gesture="{{false}}" objectFit="fill" id="myVideo" src="{{video}}" controls bindended="playEnd"></video>
-			</view>
-			<view class="play-btn {{isPlaying?'video-index':''}}" bindtap="videoOper" wx:if="{{video}}">
-				<image class="play-icon" wx:if="{{!isPlaying}}" src="../../images/icon/play-red.png"></image>
-				<text class="play-text {{isPlaying?'video-stop':'video-play'}}">{{isPlaying?'退出播放': videoDuration}}</text>
-			</view>
-			<swiper wx:if="{{!isPlaying}}" circular="{{true}}" indicator-dots="{{indicatorDots}}" indicator-color="{{indicatorColor}}" interval="{{interval}}" duration="{{duration}}" indicator-active-color="{{indicatorActiveColor}}">
-				<block wx:for="{{imgs}}" wx:key='index'>
-					<swiper-item>
-						<image src='{{item}}'></image>
-					</swiper-item>
-				</block>
-			</swiper>
-		</view>
-		<!-- 轮播图end -->
+<view class="container ">
+  <!-- 轮播图 -->
+  <view class="swiper-con">
+    <view class="video-container" wx:if="{{video && isPlaying}}">
+      <video enable-progress-gesture="{{false}}" objectFit="fill" id="myVideo" src="{{video}}" controls bindended="playEnd"></video>
+    </view>
+    <view class="play-btn {{isPlaying?'video-index':''}}" bindtap="videoOper" wx:if="{{video}}">
+      <image class="play-icon" wx:if="{{!isPlaying}}" src="../../images/icon/play-red.png"></image>
+      <text class="play-text {{isPlaying?'video-stop':'video-play'}}">{{isPlaying?'退出播放': videoDuration}}</text>
+    </view>
+    <swiper wx:if="{{!isPlaying}}" circular="{{true}}" indicator-dots="{{indicatorDots}}" indicator-color="{{indicatorColor}}" interval="{{interval}}" duration="{{duration}}" indicator-active-color="{{indicatorActiveColor}}">
+      <block wx:for="{{imgs}}" wx:key='index'>
+        <swiper-item>
+          <image src='{{item}}'></image>
+        </swiper-item>
+      </block>
+    </swiper>
+  </view>
+  <!-- 轮播图end -->
 
-		<!-- 倒计时栏 -->
-		<view class="countdown-box clearfix" wx-if="{{groupActivityId}}">
-			<!-- 拼团 -->
-			<text class="second-kill">拼团</text>
-			<view class="countdown-content">
-				<text class="countdown-tips" wx-if="{{groupActivity.activityStatus === 1}}">距开始仅剩</text>
-				<text class="countdown-tips" wx-if="{{groupActivity.activityStatus !== 1}}">距结束仅剩</text>
-				<text class="countdown-time">{{endOfGroupTime.day}} 天 {{endOfGroupTime.hou}} 时 {{endOfGroupTime.min}} 分 {{endOfGroupTime.sec}} 秒
-				</text>
-			</view>
-		</view>
-		<!-- 商品信息 -->
-		<view class='prod-info'>
-			<view class="tit-wrap">
-				<view class="prod-tit">{{prodName}}</view>
-				<view class="col" bindtap='addOrCannelCollection'>
-					<image wx-if="{{!isCollection}}" src="../../images/icon/prod-col.png"></image>
-					<image wx-if="{{isCollection}}" src="../../images/icon/prod-col-red.png"></image>
-					收藏
-				</view>
-			</view>
-			<view class="sales-p">{{brief}}</view>
-			<!-- 普通商品价格 -->
-			<view class="prod-price" wx-if="{{!groupActivityId}}">
-				<text class="price">￥<text class="price-num">{{wxs.parsePrice(defaultSku.price)[0]}}</text> .{{wxs.parsePrice(defaultSku.price)[1]}}</text>
-				<!-- <text class="sales"></text> -->
-			</view>
-			<!-- 拼团商品价格 -->
-			<view class="goods-price" wx-if="{{groupActivityId}}">
-				<view class="current-price">
-					<text class="current-price">
-          <text class="price">￥<text class="price-num">{{wxs.parsePrice(detaultGroupSku.actPrice)[0]}}</text> .{{wxs.parsePrice(detaultGroupSku.actPrice)[1]}}</text>
-					<!-- <text class="sub">￥{{detaultGroupSku.actPrice}}</text> -->
-					</text>
-					<text class="condition">{{groupActivity.groupNumber}}人拼团价</text>
-				</view>
-				<view class="original">
-					原价
-					<text class="original-price">￥{{wxs.toPrice(detaultGroupSku.price)}}</text>
-				</view>
-			</view>
-			<!-- 积分商品价格 -->
-			<!-- <view class="integral-prod-price" wx-if="">100积分</view> -->
-		</view>
-		<!-- 商品信息end -->
+  <view class="content">
 
-		<!-- 满减折 -->
-		<view class="discount border-radius-box" wx:if="{{prodDiscountList.length}}" bindtap="clickDiscount">
-			<view class="coupon-tit">促销</view>
-			<view class="coupon-con discount-con">
-				<block wx:for="{{prodDiscountList}}" wx:key="discountId" wx:if="{{index<1}}">
-					<view class="discount-item">
-						<view class="discount-tag">{{wxs.parseDiscount(item.discountRule)}}</view>
-						<text class="discount-content">
-            <text wx:if="{{item.discountType}}">每</text> {{item.discountName}}，最高减免{{item.maxReduceAmount}}元
-						</text>
-					</view>
-				</block>
-			</view>
-			<!-- <view class="num">共{{prodDiscountList.length}}张</view> -->
-			<view class="more">...</view>
-		</view>
-		<!-- 满减折end -->
+    <!-- 倒计时栏 -->
+    <view class="countdown-box clearfix" wx-if="{{groupActivityId}}">
+      <!-- 拼团 -->
+      <text class="second-kill">拼团</text>
+      <view class="countdown-content">
+        <text class="countdown-tips" wx-if="{{groupActivity.activityStatus === 1}}">距开始仅剩</text>
+        <text class="countdown-tips" wx-if="{{groupActivity.activityStatus !== 1}}">距结束仅剩</text>
+        <text class="countdown-time">{{endOfGroupTime.day}} 天 {{endOfGroupTime.hou}} 时 {{endOfGroupTime.min}} 分 {{endOfGroupTime.sec}} 秒
+        </text>
+      </view>
+    </view>
+    <!-- 普通商品价格 -->
+    <view class="prod-price" wx-if="{{!groupActivityId}}">
+      <text class="price">￥<text class="price-num">{{wxs.parsePrice(defaultSku.price)[0]}}</text>.{{wxs.parsePrice(defaultSku.price)[1]}}</text>
+      <!-- <text class="sales"></text> -->
+    </view>
+    <!-- 商品信息 -->
+    <view class='prod-info'>
+      <view class="tit-wrap">
+        <view class="prod-tit">{{prodName}}</view>
+        <view class="col" bindtap='addOrCannelCollection'>
+          <image wx-if="{{!isCollection}}" src="../../images/icon/prod-col.png"></image>
+          <image wx-if="{{isCollection}}" src="../../images/icon/prod-col-red.png"></image>
+          <!-- 收藏 -->
+        </view>
+      </view>
+      <view class="sales-p">{{brief}}</view>
+
+      <!-- 拼团商品价格 -->
+      <view class="goods-price" wx-if="{{groupActivityId}}">
+        <view class="current-price">
+          <text class="current-price">
+            <text class="price">￥<text class="price-num">{{wxs.parsePrice(detaultGroupSku.actPrice)[0]}}</text> .{{wxs.parsePrice(detaultGroupSku.actPrice)[1]}}</text>
+            <!-- <text class="sub">￥{{detaultGroupSku.actPrice}}</text> -->
+          </text>
+          <text class="condition">{{groupActivity.groupNumber}}人拼团价</text>
+        </view>
+        <view class="original">
+          原价
+          <text class="original-price">￥{{wxs.toPrice(detaultGroupSku.price)}}</text>
+        </view>
+      </view>
+      <!-- 积分商品价格 -->
+      <!-- <view class="integral-prod-price" wx-if="">100积分</view> -->
+    </view>
+    <!-- 商品信息end -->
 
-		<!-- 领券 -->
-		<view class="coupon border-radius-box" bindtap='showPopup' wx:if="{{couponList.length && !groupActivityId}}">
-			<view class="coupon-tit">领券</view>
-			<view class="coupon-con">
-				<text class="item" wx:for="{{couponList}}" wx:if="{{index<2}}" wx:key="couponId">满{{item.cashCondition}}<block wx:if="{{item.couponType == 1}}">减{{item.reduceAmount}}</block><block wx:if="{{item.couponType == 2}}">打{{item.couponDiscount}}折</block></text>
-			</view>
-			<view class="num">共{{couponList.length}}张</view>
-			<view class="more">...</view>
-		</view>
-		<!-- 领券end -->
-		<!-- 拼团信息 -->
-		<view class="spell-infor" wx-if="{{joinGroupList.length}}">
-			<view class="spell-infor-title">以下小伙伴正在发起拼团，你可以直接参加</view>
-			<view class="spell-infor-content" wx:for="{{joinGroupList}}" wx:key='groupTeamId'>
-				<!-- 头像 -->
-				<view class="head-img">
-					<image src="{{item.sharePic}}"></image>
-				</view>
-				<!-- 信息 -->
-				<view class="spell-msg">
-					<view class="username">{{item.shareNickName}}</view>
-					<view class="spell-text">
-						还差
-						<text class="red-font">{{item.groupNumber - item.joinNum}}</text> 人成团，剩余 {{item.endOfGroupTime.hou}}时{{item.endOfGroupTime.min}}分{{item.endOfGroupTime.sec}}秒
-					</view>
-				</view>
-				<!-- 凑团按钮 -->
-				<view class="join-group" bindtap="toSpellGroupDetail" data-groupteamid="{{item.groupTeamId}}">
-					去凑团
-				</view>
-			</view>
-			<!-- 详情 -->
-			<view class="rules clearfix">
-				<text class="rules-text01">支付开团邀请{{groupActivity.groupNumber}}人参团，人数不足自动退款</text>
-			</view>
-		</view>
-		<!-- 拼团信息end -->
-		<!-- 已选规格 -->
-		<view class="sku border-radius-box" bindtap='showSku'>
-			<view class="sku-tit">已选</view>
-			<view class="sku-con">{{selectedProp.length>1?selectedProp+'，':selectedProp}}{{prodNum}}件</view>
-			<view class="more">...</view>
-		</view>
-		<!-- 已选规格end -->
-		<!-- 评价 -->
-		<view class='cmt-wrap border-radius-box'>
-			<view class="cmt-tit" bindtap='showComment'>
-				<view class="cmt-t">
-					评价
-					<text class="cmt-good">好评{{prodCommData.positiveRating}}%</text>
-				</view>
-				<view class="cmt-count">
-					共{{prodCommData.number}}条
-					<text class="cmt-more"></text>
-				</view>
-			</view>
-			<view class="cmt-cont">
-				<view class="cmt-tag" bindtap='showComment'>
-					<text>全部({{prodCommData.number}})</text>
-					<text>好评({{prodCommData.praiseNumber}})</text>
-					<text>中评({{prodCommData.secondaryNumber}})</text>
-					<text>差评({{prodCommData.negativeNumber}})</text>
-					<text>有图({{prodCommData.picNumber}})</text>
-				</view>
-				<view class="cmt-items">
-					<view class="cmt-item" wx:for="{{littleCommPage}}" wx:key="prodCommId">
-						<view class="cmt-user">
-							<text class="date">{{item.recTime}}</text>
-							<view class="cmt-user-info">
-								<image class="user-img" src="{{item.pic?item.pic:'../../images/icon/head04.png'}}"></image>
-								<view class="nickname">{{item.isAnonymous==1?'匿名评价':item.nickName}}</view>
-								<comm-star value="{{item.score}}"></comm-star>
-							</view>
-						</view>
-						<view class="cmt-cnt">{{item.content}}</view>
-						<scroll-view class="cmt-attr" scroll-x="true" wx:if="{{item.pics.length}}">
-							<image src="{{commPic}}" wx:for='{{item.pics}}' wx:for-item="commPic" wx:key='index' data-pics="{{item.pics}}" data-index="{{index}}" bindtap='clickImg'></image>
-						</scroll-view>
-					</view>
-				</view>
-				<view class="cmt-more-v" wx:if="{{prodCommPage.records.length > 2}}">
-					<text bindtap='showComment'>查看全部评价</text>
-				</view>
-			</view>
-		</view>
-		<!-- 评价 end -->
-		<!-- 店铺 -->
-		<view class="shop-box border-radius-box">
-			<!-- top -->
-			<view class="shopbox-head">
-				<view class="shop-logo">
-					<image src="{{shopLogo}}"></image>
-				</view>
-				<view class="shop-name">{{shopName}}</view>
-				<view class="self-operate" wx-if="{{shopId==1}}">自营店铺</view>
-			</view>
-			<!-- middle -->
-			<!-- <view class="shop-situation">
+    <!-- 满减折 -->
+    <view class="discount border-radius-box" wx:if="{{prodDiscountList.length}}" bindtap="clickDiscount">
+      <view class="coupon-tit">促销</view>
+      <view class="coupon-con discount-con">
+        <block wx:for="{{prodDiscountList}}" wx:key="discountId" wx:if="{{index<1}}">
+          <view class="discount-item">
+            <view class="discount-tag">{{wxs.parseDiscount(item.discountRule)}}</view>
+            <text class="discount-content">
+              <text wx:if="{{item.discountType}}">每</text> {{item.discountName}}，最高减免{{item.maxReduceAmount}}元
+            </text>
+          </view>
+        </block>
+      </view>
+      <!-- <view class="num">共{{prodDiscountList.length}}张</view> -->
+      <view class="more">...</view>
+    </view>
+    <!-- 满减折end -->
+
+    <!-- 领券 -->
+    <view class="coupon border-radius-box" bindtap='showPopup' wx:if="{{couponList.length && !groupActivityId}}">
+      <view class="coupon-tit">领券</view>
+      <view class="coupon-con">
+        <text class="item" wx:for="{{couponList}}" wx:if="{{index<2}}" wx:key="couponId">满{{item.cashCondition}}<block wx:if="{{item.couponType == 1}}">减{{item.reduceAmount}}</block>
+          <block wx:if="{{item.couponType == 2}}">打{{item.couponDiscount}}折</block>
+        </text>
+      </view>
+      <view class="num">共{{couponList.length}}张</view>
+      <view class="more">...</view>
+    </view>
+    <!-- 领券end -->
+    <!-- 拼团信息 -->
+    <view class="spell-infor" wx-if="{{joinGroupList.length}}">
+      <view class="spell-infor-title">以下小伙伴正在发起拼团，你可以直接参加</view>
+      <view class="spell-infor-content" wx:for="{{joinGroupList}}" wx:key='groupTeamId'>
+        <!-- 头像 -->
+        <view class="head-img">
+          <image src="{{item.sharePic}}"></image>
+        </view>
+        <!-- 信息 -->
+        <view class="spell-msg">
+          <view class="username">{{item.shareNickName}}</view>
+          <view class="spell-text">
+            还差
+            <text class="red-font">{{item.groupNumber - item.joinNum}}</text> 人成团，剩余 {{item.endOfGroupTime.hou}}时{{item.endOfGroupTime.min}}分{{item.endOfGroupTime.sec}}秒
+          </view>
+        </view>
+        <!-- 凑团按钮 -->
+        <view class="join-group" bindtap="toSpellGroupDetail" data-groupteamid="{{item.groupTeamId}}">
+          去凑团
+        </view>
+      </view>
+      <!-- 详情 -->
+      <view class="rules clearfix">
+        <text class="rules-text01">支付开团邀请{{groupActivity.groupNumber}}人参团，人数不足自动退款</text>
+      </view>
+    </view>
+    <!-- 拼团信息end -->
+    <!-- 已选规格 -->
+    <view class="sku border-radius-box" bindtap='showSku'>
+      <view class="sku-tit">已选</view>
+      <view class="sku-con">{{selectedProp.length>1?selectedProp+'，':selectedProp}}{{prodNum}}件</view>
+      <view class="more">...</view>
+    </view>
+    <!-- 已选规格end -->
+    <!-- 评价 -->
+    <view class='cmt-wrap border-radius-box'>
+      <view class="cmt-tit" bindtap='showComment'>
+        <view class="cmt-t">
+          评价（{{prodCommData.number}}）
+          <!-- <text class="cmt-good">好评{{prodCommData.positiveRating}}%</text> -->
+        </view>
+        <text class="cmt-good">好评{{prodCommData.positiveRating}}%     <text class="cmt-more"></text></text>
+
+        <!-- <view class="cmt-count">
+          共{{prodCommData.number}}条
+          <text class="cmt-more"></text>
+        </view> -->
+      </view>
+      <view class="cmt-cont">
+        <view class="cmt-tag" bindtap='showComment'>
+          <text>全部({{prodCommData.number}})</text>
+          <text>好评({{prodCommData.praiseNumber}})</text>
+          <text>中评({{prodCommData.secondaryNumber}})</text>
+          <text>差评({{prodCommData.negativeNumber}})</text>
+          <text>有图({{prodCommData.picNumber}})</text>
+        </view>
+        <view class="cmt-items">
+          <view class="cmt-item" wx:for="{{littleCommPage}}" wx:key="prodCommId">
+            <view class="cmt-user">
+              <text class="date">{{item.recTime}}</text>
+              <view class="cmt-user-info">
+                <image class="user-img" src="{{item.pic?item.pic:'../../images/icon/head04.png'}}"></image>
+                <view class="nickname">{{item.isAnonymous==1?'匿名评价':item.nickName}}</view>
+                <comm-star value="{{item.score}}"></comm-star>
+              </view>
+            </view>
+            <view class="cmt-cnt">{{item.content}}</view>
+            <scroll-view class="cmt-attr" scroll-x="true" wx:if="{{item.pics.length}}">
+              <image src="{{commPic}}" wx:for='{{item.pics}}' wx:for-item="commPic" wx:key='index' data-pics="{{item.pics}}" data-index="{{index}}" bindtap='clickImg'></image>
+            </scroll-view>
+          </view>
+        </view>
+        <view class="cmt-more-v" wx:if="{{prodCommPage.records.length > 2}}">
+          <text bindtap='showComment'>查看全部评价</text>
+        </view>
+      </view>
+    </view>
+    <!-- 评价 end -->
+    <!-- 店铺 -->
+    <view class="shop-box border-radius-box">
+      <!-- top -->
+      <view class="shopbox-head">
+        <view class="shop-logo">
+          <image src="{{shopLogo}}"></image>
+        </view>
+        <view class="shop-name">{{shopName}}</view>
+        <!-- <view class="self-operate" wx-if="{{shopId==1}}">自营店铺</view> -->
+        <view class="self-operate" >自营店铺</view>
+      </view>
+      <!-- middle -->
+      <!-- <view class="shop-situation">
       <view class="situation-item">
         <view class="situation-item-num">612354</view>
         <view class="situation-item-txt">粉丝人数</view>
@@ -190,8 +198,8 @@
         <view class="situation-item-txt">全部商品</view>
       </view>
     </view> -->
-			<!-- bottom -->
-			<!-- <view class="handle-shop">
+      <!-- bottom -->
+      <!-- <view class="handle-shop">
       <view class="handle-shop-item">
         <view class="handle-shop-icon star-icon"><image src="../../images/icon/star-empty.png"></image></view>
         <text class="handle-txt">收藏店铺</text>
@@ -201,273 +209,274 @@
         <text class="handle-txt">进入店铺</text>
       </view>
     </view> -->
-		</view>
-		<!-- 店铺end -->
-		<!-- 商品详情 -->
-		<view class="prod-detail">
-			<rich-text nodes="{{content}}"></rich-text>
-		</view>
-		<!-- 商品详情end -->
-		<!-- 底部按钮 -->
-		<view class="cart-footer {{totalStocks>0?'':'gray'}}" wx-if="{{!groupActivityId}}">
-			<view class="btn icon" bindtap='toHomePage'>
-				<image src="../../images/tabbar/homepage.png"></image>
-				首页
-			</view>
-			<view class='btn icon contact-btn-box'>
-				<image src='../../images/icon/shop-customer-service.png'></image>
-				客服
-        <button class="contact-btn" open-type="contact" bindcontact="handleContact" session-from="sessionFrom"></button>
-			</view>
-			<view class="btn icon" bindtap='toCartPage'>
-				<image src="../../images/tabbar/basket.png"></image>
-				购物车
-				<view class='badge badge-1' wx:if="{{totalCartNum>0}}">{{totalCartNum}}</view>
-			</view>
-			<view class="btn cart cart-radius" bindtap='addToCart'>
-				<text>加入购物车</text>
-			</view>
-			<view class="btn buy cart-radius" bindtap='buyNow'>
-				<text>立即购买</text>
-			</view>
-		</view>
-		<!-- 底部按钮 end -->
-		<!-- 积分 底部按钮 -->
-		<!-- <view class="ex-integral-foot">
+    </view>
+    <!-- 店铺end -->
+    <!-- 商品详情 -->
+    <view class="prod-detail">
+      <rich-text nodes="{{content}}"></rich-text>
+    </view>
+    <!-- 商品详情end -->
+  </view>
+
+  <!-- 底部按钮 -->
+  <view class="cart-footer {{totalStocks>0?'':'gray'}}" wx-if="{{!groupActivityId}}">
+    <view class="btn icon" bindtap='toHomePage'>
+      <image src="../../images/tabbar/homepage.png"></image>
+      首页
+    </view>
+    <view class='btn icon contact-btn-box'>
+      <image src='../../images/icon/shop-customer-service.png'></image>
+      客服
+      <button class="contact-btn" open-type="contact" bindcontact="handleContact" session-from="sessionFrom"></button>
+    </view>
+    <view class="btn icon" bindtap='toCartPage'>
+      <image src="../../images/tabbar/basket.png"></image>
+      购物车
+      <view class='badge badge-1' wx:if="{{totalCartNum>0}}">{{totalCartNum}}</view>
+    </view>
+    <view class="btn cart cart-radius" bindtap='addToCart'>
+      <text>加入购物车</text>
+    </view>
+    <view class="btn buy cart-radius" bindtap='buyNow'>
+      <text>立即购买</text>
+    </view>
+  </view>
+  <!-- 底部按钮 end -->
+  <!-- 积分 底部按钮 -->
+  <!-- <view class="ex-integral-foot">
     <view class="ex-integral-btn">立即兑换</view>
   </view> -->
-		<!-- 【拼团】底部按钮 -->
-		<view class="foot-box" wx-if="{{groupActivityId}}">
-			<view class="footer">
-				<view class="foot-btn" bindtap='toHomePage'>
-					<image src="../../images/tabbar/homepage.png"></image>
-					首页
-				</view>
-				<view catchtap='freeTell' class='foot-btn'>
-					<image src='../../images/icon/shop-customer-service.png'></image>
-					客服
-				</view>
-				<view class="foot-btn" bindtap='toCartPage'>
-					<image src="../../images/tabbar/basket.png"></image>
-					购物车
-					<view class='badge badge-1' wx:if="{{totalCartNum>0}}">{{totalCartNum}}</view>
-				</view>
-				<view class="buy-btn alone-buy cart-radius" bindtap='showSku' data-alonebuy="1">
-					<text>单独购买</text>
-				</view>
-				<view class="buy-btn group-buy cart-radius" bindtap='showGroupSku'>
-					<text>开团</text>
-				</view>
-			</view>
-		</view>
-		<!-- end 底部按钮 -->
-	</view>
+  <!-- 【拼团】底部按钮 -->
+  <view class="foot-box" wx-if="{{groupActivityId}}">
+    <view class="footer">
+      <view class="foot-btn" bindtap='toHomePage'>
+        <image src="../../images/tabbar/homepage.png"></image>
+        首页
+      </view>
+      <view catchtap='freeTell' class='foot-btn'>
+        <image src='../../images/icon/shop-customer-service.png'></image>
+        客服
+      </view>
+      <view class="foot-btn" bindtap='toCartPage'>
+        <image src="../../images/tabbar/basket.png"></image>
+        购物车
+        <view class='badge badge-1' wx:if="{{totalCartNum>0}}">{{totalCartNum}}</view>
+      </view>
+      <view class="buy-btn alone-buy cart-radius" bindtap='showSku' data-alonebuy="1">
+        <text>单独购买</text>
+      </view>
+      <view class="buy-btn group-buy cart-radius" bindtap='showGroupSku'>
+        <text>开团</text>
+      </view>
+    </view>
+  </view>
+  <!-- end 底部按钮 -->
+</view>
 
 
 <!-- 满减折弹窗 -->
 <view class="popup-hide" wx:if="{{showDiscountPopup}}">
-	<view class="popup-box border-radius-t-r">
-		<view class="popup-tit border-radius-t-r">
-			<text>促销</text>
-			<text class="close" bindtap='clickDiscount'></text>
-		</view>
-		<view class='popup-cnt popup-discount'>
-			<view class="coupon-con discount-con">
-				<block wx:for="{{prodDiscountList}}" wx:key="discountId">
-					<view class="discount-item">
-						<view class="discount-tag">{{wxs.parseDiscount(item.discountRule)}}</view>
-						<text class="discount-content">
-                <text wx:if="{{item.discountType}}">每</text> {{item.discountName}}，最高减免{{item.maxReduceAmount}}元
-						</text>
-					</view>
-				</block>
-			</view>
-		</view>
-	</view>
+  <view class="popup-box border-radius-t-r">
+    <view class="popup-tit border-radius-t-r">
+      <text>促销</text>
+      <text class="close" bindtap='clickDiscount'></text>
+    </view>
+    <view class='popup-cnt popup-discount'>
+      <view class="coupon-con discount-con">
+        <block wx:for="{{prodDiscountList}}" wx:key="discountId">
+          <view class="discount-item">
+            <view class="discount-tag">{{wxs.parseDiscount(item.discountRule)}}</view>
+            <text class="discount-content">
+              <text wx:if="{{item.discountType}}">每</text> {{item.discountName}}，最高减免{{item.maxReduceAmount}}元
+            </text>
+          </view>
+        </block>
+      </view>
+    </view>
+  </view>
 </view>
 <!-- 满减折弹窗 end -->
 
 <!-- 优惠券弹窗 -->
 <view class="popup-hide" wx:if="{{popupShow}}">
-	<view class="popup-box border-radius-t-r">
-		<view class="popup-tit border-radius-t-r">
-			<text>优惠券</text>
-			<text class="close" bindtap='closePopup'></text>
-		</view>
-		<view class='popup-cnt'>
-			<block wx:for="{{couponList}}" wx:key='couponId'>
-				<coupon showTimeType="{{1}}" canUse="{{true}}" item="{{item}}"></coupon>
-			</block>
-		</view>
-	</view>
+  <view class="popup-box border-radius-t-r">
+    <view class="popup-tit border-radius-t-r">
+      <text>优惠券</text>
+      <text class="close" bindtap='closePopup'></text>
+    </view>
+    <view class='popup-cnt'>
+      <block wx:for="{{couponList}}" wx:key='couponId'>
+        <coupon showTimeType="{{1}}" canUse="{{true}}" item="{{item}}"></coupon>
+      </block>
+    </view>
+  </view>
 </view>
 <!-- 优惠券 end -->
 <!-- 规格弹窗 -->
 <view class="pup-sku" wx:if="{{skuShow}}">
-	<view class="pup-sku-main border-radius-t-r">
-		<view class='pup-sku-header border-radius-t-r'>
-			<view class='close' bindtap='closePopup'></view>
-			<view class="pup-sku-img">
-				<image src="{{defaultSku.pic?defaultSku.pic:pic}}"></image>
-			</view>
-			<view class="pup-sku-prod">
-				<!-- <view class="prod-title">{{prodName}}</view> -->
-				<view class="pup-sku-price" wx:if="{{skuShowType==0 && findSku}}">
-					￥<text class="pup-sku-price-int">{{wxs.parsePrice(defaultSku.price)[0]}}</text>.{{wxs.parsePrice(defaultSku.price)[1]}}
-				</view>
-				<view class="pup-sku-price group-sku-pri" wx:if="{{skuShowType==1 && findSku}}">
-					<text>￥<text class="pup-sku-price-int">{{wxs.parsePrice(detaultGroupSku.actPrice)[0]}}</text>.{{wxs.parsePrice(detaultGroupSku.actPrice)[1]}}</text>
-					<text class="act-price-con">{{groupActivity.groupNumber}}人拼团价</text>
-				</view>
-				<view class="pup-sku-price" wx-if="{{totalStocks<0}}">无货</view>
-				<view class='pup-sku-prop'>
-					<text>已选</text><text decode="{{true}}">&nbsp;{{selectedProp.length>1?selectedProp+'，':selectedProp}}{{prodNum}}&nbsp;件</text>
-				</view>
-			</view>
-		</view>
-		<view class='pup-sku-body'>
-			<view class="pup-sku-area">
-				<block wx:for="{{skuGroup}}" wx:for-index="key" wx:for-item="value" wx:key='*this'>
-					<view class='sku-kind'>{{key}}</view>
-					<view class='sku-choose' wx:if="{{item!=null}}">
-						<block wx:for="{{value}}" wx:key='*this'>
-							<text class="sku-choose-item {{wxs.array_contain(selectedProp,item)?'active':''}} {{['gray','','dashed'][wxs.props_contain2(allProperties,selectedPropObj,key,item,propKeys)]}}" data-ok="{{wxs.props_contain2(allProperties,selectedPropObj,key,item,propKeys)}}"
-                  bindtap='toChooseItem' data-key="{{key}}" data-val="{{item}}">{{item||''}}</text>
-						</block>
-					</view>
-				</block>
-			</view>
-			<view class="pup-sku-count">
-				<view class="num-wrap">
-					<view class="minus" bindtap='onCountMinus'>
-						<text class="row"></text>
-					</view>
-					<view class="text-wrap">
-						<input type="number" value="{{prodNum}}" disabled />
-					</view>
-					<view class="plus" bindtap='onCountPlus'>
-						<text class="row"></text>
-						<text class="col"></text>
-					</view>
-				</view>
-				<view class="count-name">数量</view>
-			</view>
-		</view>
-		<view class='pup-sku-footer {{totalStocks>0?"":"gray"}}'>
-			<view class="btn cart" bindtap='addToCart' wx:if="{{skuShowType==0}}">加入购物车</view>
-			<view class="btn buy" bindtap='buyNow' wx:if="{{skuShowType==0}}">立即购买</view>
-			<view class="btn buy" bindtap='groupConfirmOrder' data-teamid="0" wx:if="{{skuShowType==1}}">
-				开团
-			</view>
-		</view>
-	</view>
+  <view class="pup-sku-main border-radius-t-r">
+    <view class='pup-sku-header border-radius-t-r'>
+      <view class='close' bindtap='closePopup'></view>
+      <view class="pup-sku-img">
+        <image src="{{defaultSku.pic?defaultSku.pic:pic}}"></image>
+      </view>
+      <view class="pup-sku-prod">
+        <!-- <view class="prod-title">{{prodName}}</view> -->
+        <view class="pup-sku-price" wx:if="{{skuShowType==0 && findSku}}">
+          ￥<text class="pup-sku-price-int">{{wxs.parsePrice(defaultSku.price)[0]}}</text>.{{wxs.parsePrice(defaultSku.price)[1]}}
+        </view>
+        <view class="pup-sku-price group-sku-pri" wx:if="{{skuShowType==1 && findSku}}">
+          <text>￥<text class="pup-sku-price-int">{{wxs.parsePrice(detaultGroupSku.actPrice)[0]}}</text>.{{wxs.parsePrice(detaultGroupSku.actPrice)[1]}}</text>
+          <text class="act-price-con">{{groupActivity.groupNumber}}人拼团价</text>
+        </view>
+        <view class="pup-sku-price" wx-if="{{totalStocks<0}}">无货</view>
+        <view class='pup-sku-prop'>
+          <text>已选</text><text decode="{{true}}">&nbsp;{{selectedProp.length>1?selectedProp+'，':selectedProp}}{{prodNum}}&nbsp;件</text>
+        </view>
+      </view>
+    </view>
+    <view class='pup-sku-body'>
+      <view class="pup-sku-area">
+        <block wx:for="{{skuGroup}}" wx:for-index="key" wx:for-item="value" wx:key='*this'>
+          <view class='sku-kind'>{{key}}</view>
+          <view class='sku-choose' wx:if="{{item!=null}}">
+            <block wx:for="{{value}}" wx:key='*this'>
+              <text class="sku-choose-item {{wxs.array_contain(selectedProp,item)?'active':''}} {{['gray','','dashed'][wxs.props_contain2(allProperties,selectedPropObj,key,item,propKeys)]}}" data-ok="{{wxs.props_contain2(allProperties,selectedPropObj,key,item,propKeys)}}" bindtap='toChooseItem' data-key="{{key}}" data-val="{{item}}">{{item||''}}</text>
+            </block>
+          </view>
+        </block>
+      </view>
+      <view class="pup-sku-count">
+        <view class="num-wrap">
+          <view class="minus" bindtap='onCountMinus'>
+            <text class="row"></text>
+          </view>
+          <view class="text-wrap">
+            <input type="number" value="{{prodNum}}" disabled />
+          </view>
+          <view class="plus" bindtap='onCountPlus'>
+            <text class="row"></text>
+            <text class="col"></text>
+          </view>
+        </view>
+        <view class="count-name">数量</view>
+      </view>
+    </view>
+    <view class='pup-sku-footer {{totalStocks>0?"":"gray"}}'>
+      <view class="btn cart" bindtap='addToCart' wx:if="{{skuShowType==0}}">加入购物车</view>
+      <view class="btn buy" bindtap='buyNow' wx:if="{{skuShowType==0}}">立即购买</view>
+      <view class="btn buy" bindtap='groupConfirmOrder' data-teamid="0" wx:if="{{skuShowType==1}}">
+        开团
+      </view>
+    </view>
+  </view>
 </view>
 <!-- 规格弹窗 end -->
 <!-- 评价弹窗 -->
 <view class="cmt-popup" wx:if="{{commentShow}}">
-	<view class="cmt-tit">
-		<view class="cmt-t">
-			商品评价
-			<text class="cmt-good">好评度{{prodCommData.positiveRating}}%</text>
-		</view>
-		<text class="close" bindtap='closePopup'></text>
-	</view>
-	<view class="cmt-cont">
-		<view class="cmt-tag">
-			<text bindtap='getProdCommPage' data-evaluate="-1" class="{{evaluate==-1?'selected':''}}">全部({{prodCommData.number}})</text>
-			<text bindtap='getProdCommPage' data-evaluate="0" class="{{evaluate==0?'selected':''}}">好评({{prodCommData.praiseNumber}})</text>
-			<text bindtap='getProdCommPage' data-evaluate="1" class="{{evaluate==1?'selected':''}}">中评({{prodCommData.secondaryNumber}})</text>
-			<text bindtap='getProdCommPage' data-evaluate="2" class="{{evaluate==2?'selected':''}}">差评({{prodCommData.negativeNumber}})</text>
-			<text bindtap='getProdCommPage' data-evaluate="3" class="{{evaluate==3?'selected':''}}">有图({{prodCommData.picNumber}})</text>
-		</view>
-		<view class="cmt-items">
-			<view class="cmt-item" wx:for="{{prodCommPage.records}}" wx:key="prodCommId">
-				<view class="cmt-user">
-					<text class="date">{{item.recTime}}</text>
-					<view class="cmt-user-info">
-						<image class="user-img" src="{{item.pic?item.pic:'../../images/icon/head04.png'}}"></image>
-						<view class="nickname">{{item.isAnonymous==1?'匿名评价':item.nickName}}</view>
-						<comm-star value="{{item.score}}"></comm-star>
-					</view>
-				</view>
-				<view class="cmt-cnt">{{item.content}}</view>
-				<scroll-view class="cmt-attr" scroll-x="true" wx:if="{{item.pics.length}}">
-					<image src="{{commPic}}" wx:for='{{item.pics}}' wx:for-item="commPic" wx:key='index' data-pics="{{item.pics}}" data-index="{{index}}" bindtap='clickImg'></image>
-				</scroll-view>
-				<view class="cmt-reply" wx:if="{{item.replyContent}}">
-					<text class='reply-tit'>店铺回复：</text>
-					<view class="reply-content">{{item.replyContent}}</view>
-				</view>
-			</view>
-		</view>
-		<!-- 列表空 -->
-		<view class="empty" wx:if="{{!prodCommPage.records.length}}">
-			<view class="empty-icon">
-				<image src="../../images/icon/empty-com.png"></image>
-			</view>
-			<view class="empty-text">还没有商品评价~</view>
-		</view>
-		<!-- /列表空 -->
-		<view class="load-more" wx:if='{{prodCommPage.pages > prodCommPage.current}}'>
-			<text bindtap='getMoreCommPage'>点击加载更多</text>
-		</view>
-	</view>
+  <view class="cmt-tit">
+    <view class="cmt-t">
+      商品评价
+      <text class="cmt-good">好评度{{prodCommData.positiveRating}}%</text>
+    </view>
+    <text class="close" bindtap='closePopup'></text>
+  </view>
+  <view class="cmt-cont">
+    <view class="cmt-tag">
+      <text bindtap='getProdCommPage' data-evaluate="-1" class="{{evaluate==-1?'selected':''}}">全部({{prodCommData.number}})</text>
+      <text bindtap='getProdCommPage' data-evaluate="0" class="{{evaluate==0?'selected':''}}">好评({{prodCommData.praiseNumber}})</text>
+      <text bindtap='getProdCommPage' data-evaluate="1" class="{{evaluate==1?'selected':''}}">中评({{prodCommData.secondaryNumber}})</text>
+      <text bindtap='getProdCommPage' data-evaluate="2" class="{{evaluate==2?'selected':''}}">差评({{prodCommData.negativeNumber}})</text>
+      <text bindtap='getProdCommPage' data-evaluate="3" class="{{evaluate==3?'selected':''}}">有图({{prodCommData.picNumber}})</text>
+    </view>
+    <view class="cmt-items">
+      <view class="cmt-item" wx:for="{{prodCommPage.records}}" wx:key="prodCommId">
+        <view class="cmt-user">
+          <text class="date">{{item.recTime}}</text>
+          <view class="cmt-user-info">
+            <image class="user-img" src="{{item.pic?item.pic:'../../images/icon/head04.png'}}"></image>
+            <view class="nickname">{{item.isAnonymous==1?'匿名评价':item.nickName}}</view>
+            <comm-star value="{{item.score}}"></comm-star>
+          </view>
+        </view>
+        <view class="cmt-cnt">{{item.content}}</view>
+        <scroll-view class="cmt-attr" scroll-x="true" wx:if="{{item.pics.length}}">
+          <image src="{{commPic}}" wx:for='{{item.pics}}' wx:for-item="commPic" wx:key='index' data-pics="{{item.pics}}" data-index="{{index}}" bindtap='clickImg'></image>
+        </scroll-view>
+        <view class="cmt-reply" wx:if="{{item.replyContent}}">
+          <text class='reply-tit'>店铺回复：</text>
+          <view class="reply-content">{{item.replyContent}}</view>
+        </view>
+      </view>
+    </view>
+    <!-- 列表空 -->
+    <view class="empty" wx:if="{{!prodCommPage.records.length}}">
+      <view class="empty-icon">
+        <image src="../../images/icon/empty-com.png"></image>
+      </view>
+      <view class="empty-text">还没有商品评价~</view>
+    </view>
+    <!-- /列表空 -->
+    <view class="load-more" wx:if='{{prodCommPage.pages > prodCommPage.current}}'>
+      <text bindtap='getMoreCommPage'>点击加载更多</text>
+    </view>
+  </view>
 </view>
 <!-- 评价弹窗 end -->
 <!-- 悬浮按钮 -->
 <view class="suspension-box {{showBacktop?'scroll-top':''}}" wx:if="{{!popupShow && !skuShow && !commentShow && !skuGroupShow}}">
-	<!-- 赚字浮层 -->
-	<view class="promo-con" wx:if="{{isDist && isDistProd}}" bindtap='onShowShare' data-type="2">
-		<view class="earn">赚</view>
-	</view>
-	<!-- 分享 -->
-	<button class="suspension-btn btn-type" open-type='share' wx:if="{{!(isDist && isDistProd)}}">
-		<!-- / -->
-		<image src="../../images/icon/share-prod.png"></image>
-	</button>
-	<!-- 回到顶部 -->
-	<view class="suspension-btn" bindtap='backToTop' wx:if="{{showBacktop}}">
-		<image src="../../images/icon/back-to-top.png"></image>
-	</view>
+  <!-- 赚字浮层 -->
+  <view class="promo-con" wx:if="{{isDist && isDistProd}}" bindtap='onShowShare' data-type="2">
+    <view class="earn">赚</view>
+  </view>
+  <!-- 分享 -->
+  <button class="suspension-btn btn-type" open-type='share' wx:if="{{!(isDist && isDistProd)}}">
+    <!-- / -->
+    <image src="../../images/icon/share-prod.png"></image>
+  </button>
+  <!-- 回到顶部 -->
+  <view class="suspension-btn" bindtap='backToTop' wx:if="{{showBacktop}}">
+    <image src="../../images/icon/back-to-top.png"></image>
+  </view>
 </view>
 <!-- /悬浮按钮 -->
 <!-- 分享弹窗 -->
 <view class='promo-share' wx:if="{{shareShow}}">
-	<view class='promo-main'>
-		<view class='promo-icons-close' bindtap='closeEarn'>
-			<image src="../../images/icon/close.png"></image>
-		</view>
-		<view class='promo-tit'>
-			<title>立即分享给好友</title>
-		</view>
-		<view class='promo-desc'>
-			<text>朋友通过你分享的页面成功购买后，你可获得对应的佣金，佣金可“个人中心-分销员中心" 里查看</text>
-		</view>
-		<view class='promo-icons'>
-			<button class='promo-img1' open-type='share'>
-				<image src="../../images/icon/weixin.png"></image>
-				微信
-			</button>
-			<view class='promo-img1' bindtap='genWeixinCode'>
-				<image src="../../images/icon/erweima.png"></image>
-				二维码
-			</view>
-		</view>
-		<view class='promo-btn' bindtap='toDistCenterPage'>我的分销员中心</view>
-	</view>
+  <view class='promo-main'>
+    <view class='promo-icons-close' bindtap='closeEarn'>
+      <image src="../../images/icon/close.png"></image>
+    </view>
+    <view class='promo-tit'>
+      <title>立即分享给好友</title>
+    </view>
+    <view class='promo-desc'>
+      <text>朋友通过你分享的页面成功购买后，你可获得对应的佣金，佣金可“个人中心-分销员中心" 里查看</text>
+    </view>
+    <view class='promo-icons'>
+      <button class='promo-img1' open-type='share'>
+        <image src="../../images/icon/weixin.png"></image>
+        微信
+      </button>
+      <view class='promo-img1' bindtap='genWeixinCode'>
+        <image src="../../images/icon/erweima.png"></image>
+        二维码
+      </view>
+    </view>
+    <view class='promo-btn' bindtap='toDistCenterPage'>我的分销员中心</view>
+  </view>
 </view>
 <!-- 分享弹窗 end -->
 <!-- 二维码弹窗 -->
 <view class='code-popup' wx:if="{{wxCodeShow}}">
-	<view class='code-main'>
-		<view class="close-v" catchtap='closeCodePopup'>
-			<image src="../../images/icon/close.png" class="close-png"></image>
-		</view>
-		<view class="code-v">
-			<image src="{{shareWxCode}}" class="wx-code"></image>
-		</view>
-		<view class="code-txt" bindtap="downloadImg">保存至相册</view>
-	</view>
+  <view class='code-main'>
+    <view class="close-v" catchtap='closeCodePopup'>
+      <image src="../../images/icon/close.png" class="close-png"></image>
+    </view>
+    <view class="code-v">
+      <image src="{{shareWxCode}}" class="wx-code"></image>
+    </view>
+    <view class="code-txt" bindtap="downloadImg">保存至相册</view>
+  </view>
 </view>
 <!-- 二维码弹窗 end -->
 <wxs module="wxs" src="../../wxs/number.wxs" />

pages/prod/prod.wxss

@@ -81,30 +81,43 @@ swiper image {
   z-index: 15;
 }
 
+.content{
+  padding: 24rpx;
+  background: #F6F6F6;
+  /* background: linear-gradient( 180deg, #FFFFFF 0%, #F6F6F6 100%); */
+  border-radius: 32rpx 32rpx 0rpx 0rpx;
+  margin-top: -20rpx;
+  position: relative;
+  z-index: 2;
+}
+
 /** 商品信息 */
 
 .prod-info {
-  padding: 30rpx 30rpx 0 30rpx;
+  padding: 20rpx;
   position: relative;
   background: #fff;
+  border-radius: 16rpx;
 }
 
 .tit-wrap {
   position: relative;
-  line-height: 40rpx;
-  padding-right: 104rpx;
+  line-height: 32rpx;
+  /* padding-right: 104rpx; */
   text-align: justify;
 }
 
 .prod-tit {
+  line-height: 46rpx;
   font-size: 32rpx;
-  color: #333;
+  color: #222222;
   padding-right: 20rpx;
+  font-weight: bold;
 }
 
 .tit-wrap .col {
   position: absolute;
-  top: 0;
+  top: -90rpx;
   right: 0;
   width: 80rpx;
   color: #666;
@@ -153,11 +166,14 @@ swiper image {
   font-size: 26rpx;
   font-weight: 600;
   margin-right: 30rpx;
+  font-size: 48rpx;
 }
 
 .price-num {
-  font-size: 46rpx;
-  font-weight: 400;
+  font-size: 48rpx;
+  font-weight: 600;
+
+  /* font-weight: 400; */
 }
 
 .sales {
@@ -380,14 +396,19 @@ swiper image {
   position: relative;
   border-bottom: 1px solid #ddd;
   padding: 20rpx;
+  display: flex;
+  justify-content: space-between;
 }
 
 .cmt-t {
   width: 300rpx;
+  font-size: 32rpx;
+  color: #222222;
+  font-weight: bold;
 }
 
 .cmt-good {
-  color: #e43130;
+  color: #FF4D3A;
   font-size: 24rpx;
 }
 
@@ -400,10 +421,10 @@ swiper image {
 }
 
 .cmt-more {
-  width: 20rpx;
-  height: 20rpx;
-  border-top: 2rpx solid #999;
-  border-right: 2rpx solid #999;
+  width: 10rpx;
+  height: 10rpx;
+  border-top: 2rpx solid #FF4D3A;
+  border-right: 2rpx solid #FF4D3A;
   transform: rotate(45deg);
   margin-left: 10rpx;
   display: inline-block;
@@ -417,11 +438,12 @@ swiper image {
   position: relative;
   padding: 14px 3px 0 0;
   margin: 0;
+  border-radius: 8rpx;
 }
 
 .cmt-tag text {
   margin: 0 6px 10px 0;
-  background: #fdf0f0;
+  background: #F0F0F0;
   display: inline-block;
   padding: 0 10px;
   height: 25px;
@@ -617,13 +639,15 @@ swiper image {
 } */
 .shop-logo {
   display: inline-block;
-  width: 100rpx;
-  height: 100rpx;
+  width: 80rpx;
+  height: 80rpx;
   background: #fff;
   margin-right: 20rpx;
   vertical-align: middle;
 }
-
+.shop-logo image{
+  border-radius: 16rpx;
+}
 .shop-name,
 .self-operate {
   display: inline-block;
@@ -636,10 +660,14 @@ swiper image {
 }
 
 .self-operate {
-  background: #e43130;
-  color: #fff;
-  font-size: 23rpx;
-  padding: 5rpx 15rpx;
+  width: 112rpx;
+  height: 36rpx;
+  background: #FF4D3A;
+  border-radius: 8rpx 8rpx 8rpx 8rpx;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  text-align: center;
+  /* padding: 5rpx 15rpx; */
   margin-left: 15rpx;
 }
 
@@ -799,7 +827,7 @@ img {
   background: #04358D;
   color: #fff;
   margin-right: 12rpx;
-  font-size: 30rpx;
+  font-size: 28rpx;
   text-align: center;
 }
 

pages/submit-order/submit-order.js

@@ -114,6 +114,8 @@ Page({
     wx.showLoading({
       mask: true
     });
+    // 重置地址  避免超出配送 使用之前地址
+    this.setData({userAddr:null})
     var params = {
       url: "/p/order/confirm",
       method: "POST",

pages/submit-order/submit-order.wxss

@@ -7,17 +7,18 @@ page {
 /* 收货地址 */
 
 .submit-order {
-  margin-bottom: 120rpx;
+  margin: 20rpx 24rpx 120rpx;
 }
 
 .submit-order .delivery-addr {
   position: relative;
   background: #fff;
+  border-radius: 16rpx;
 }
 
 .delivery-addr .addr-bg .add-addr .plus-sign {
-  color: #e43130;
-  border: 2rpx solid #e43130;
+  color: #FF4D3A;
+  border: 2rpx solid #FF4D3A;
   padding: 0rpx 6rpx;
   margin-right: 10rpx;
 }
@@ -176,6 +177,8 @@ radio.item-group .wx-radio-input{
 .shop-item {
   margin-top: 20rpx;
   margin-bottom: 20rpx;
+  border-radius: 16rpx;
+  background-color: #fff;
 }
 .prod-item {
   background-color: #fff;
@@ -208,7 +211,6 @@ radio.item-group .wx-radio-input{
   padding: 20rpx;
   /* margin: 0 20rpx; */
   border-bottom: 1rpx solid #f2f2f2;
-  background: #fff;
 }
 .shop-icon {
   display: inline-block;
@@ -334,7 +336,7 @@ radio.item-group .wx-radio-input{
   display: block;
   /* position: absolute; */
   bottom: 0;
-  color: #e43130;
+  color: #FF4D3A;
   font-size: 32rpx;
 }
 
@@ -384,7 +386,7 @@ radio.item-group .wx-radio-input{
   padding: 3rpx 5rpx;
   border-radius: 8rpx;
   font-size: 23rpx;
-  background: #e43130;
+  background: #FF4D3A;
   color:#fff;
   position: relative;
 }
@@ -396,7 +398,7 @@ radio.item-group .wx-radio-input{
     display: block;
     border-left: 4px solid transparent;
     border-right: 4px solid transparent;
-    border-top: 4px solid #e43130;
+    border-top: 4px solid #FF4D3A;
 }
 .prod-item .prod-block .discount-tips .text-list {
   font-size: 26rpx;
@@ -405,7 +407,7 @@ radio.item-group .wx-radio-input{
 
 .shop-item .prod-block .discount-tips .text-list.reduce-amount {
   font-weight: normal;
-  color: #e43130;
+  color: #FF4D3A;
   padding-left: 20rpx;
 }
 
@@ -420,6 +422,7 @@ radio.item-group .wx-radio-input{
 .order-msg {
   background: #fff;
   font-size: 30rpx;
+  border-radius: 16rpx;
 }
 
 .order-msg .msg-item {
@@ -440,11 +443,13 @@ radio.item-group .wx-radio-input{
 
 .order-msg .msg-item .item.payment {
   border-top: 2rpx solid #f1f1f1;
-  color: #e43130;
+  color: #FF4D3A;
 }
 
 .order-msg .msg-item .item .item-tit {
   line-height: 48rpx;
+  font-size: 28rpx;
+  color: #222;
 }
 
 .order-msg .msg-item .item .item-txt {
@@ -481,7 +486,7 @@ radio.item-group .wx-radio-input{
   color: #999;
 }
 .order-msg .msg-item .item  .coupon-amount{
-  color: #e43130;
+  color: #FF4D3A;
   position: absolute;
   right:60rpx;
 }
@@ -540,7 +545,8 @@ radio.item-group .wx-radio-input{
   background: #04358D;
   text-align: center;
   color: #fff;
-  font-size: 30rpx;
+  font-size: 28rpx;
+  font-weight: bold;
   border-radius: 60rpx;
   height: 2.8em;
   line-height: 2.8em;
@@ -549,7 +555,7 @@ radio.item-group .wx-radio-input{
 
 .submit-order-footer .sub-order .item-txt .price {
   display: inline;
-  color: #e43130;
+  color: #FF4D3A;
   font-size: 28rpx;
 }
 
@@ -679,8 +685,8 @@ checkbox .wx-checkbox-input {
 /*checkbox选中后样式  */
 
 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  background: #e43130;
-  border-color: #e43130;
+  background: #FF4D3A;
+  border-color: #FF4D3A;
 }
 
 /*checkbox选中后图标样式  */
@@ -732,7 +738,7 @@ input.score-int {
 .score-pop-item .confirm-btn{
   display: block;
   border-radius: 50rpx;
-  background-color: #e43130;
+  background-color: #FF4D3A;
   color: #ffffff;
   padding: 10rpx;
   text-align: center;

pages/user/user.js

@@ -467,7 +467,7 @@ Page({
   logout: function () {
     wx.clearStorage()
     wx.removeTabBarBadge({
-      index: 2
+      index: 1
     });
     wx.navigateTo({
       url: "/pages/login/login"

project.config.json

@@ -27,7 +27,8 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    }
+    },
+    "minifyWXSS": false
   },
   "compileType": "miniprogram",
   "projectname": "%E4%BA%9A%E7%B1%B3%E5%A4%9A%E5%BA%97%E9%93%BA%E5%95%86%E5%9F%8E",

project.private.config.json

@@ -8,6 +8,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/prod/prod",
+          "pathName": "pages/prod/prod",
+          "query": "prodid=205199",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/logs/logs",
           "pathName": "pages/logs/logs",

utils/config.js

@@ -2,8 +2,10 @@
 // var domain = "https://shop-h5.zswllife.cn/api"; //统一接口域名，正式环境 
 // var wsDomain = "wss://shop-h5.zswllife.cn/api"; //统一接口域名，正式环境 
 
-var domain = "https://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
-var wsDomain = "wss://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
+// var domain = "https://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
+// var wsDomain = "wss://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
+var domain = "https://shop.haimamart.com/api"; //统一接口域名，正式环境 
+var wsDomain = "wss://shop.haimamart.com/api"; //统一接口域名，正式环境 
 
 // var domain = "http://192.168.1.120:8086"; //统一接口域名，测试环境
 // var wsDomain = "ws://192.168.1.120:8086"; //统一接口域名，测试环境

utils/http.js

@@ -7,11 +7,13 @@ function request(params, isGetTonken) {
   // 如果正在进行登陆，就将非登陆请求放在队列中等待登陆完毕后进行调用
   if (!isGetTonken && globalData.isLanding) {
     globalData.requestQueue.push(params);
+    console.log('ceshi');
     return;
   }
   wx.request({
     url: config.domain + params.url, //接口请求地址
     data: params.data,
+    timeout:10000,
     header: {
       // 'content-type': params.method == "GET" ? 'application/x-www-form-urlencoded' : 'application/json;charset=utf-8',
       'Authorization': params.login ? undefined : wx.getStorageSync('token') || wx.getStorageSync('tempToken')
@@ -20,7 +22,7 @@ function request(params, isGetTonken) {
     dataType: 'json',
     responseType: params.responseType == undefined ? 'text' : params.responseType,
     success: function (res) {
-      // console.log(res);
+      console.log(`接口地址${config.domain + params.url}：成功返回`,res);
       if (res.statusCode == 200) {
         //如果有定义了params.callBack，则调用 params.callBack(res.data)
         if (params.callBack) {
@@ -90,6 +92,7 @@ function request(params, isGetTonken) {
 
     },
     fail: function (err) {
+      console.warn(`接口地址${config.domain + params.url}：报错返回`,res);
       wx.hideLoading();
       setTimeout(() => {
         wx.showToast({
@@ -98,6 +101,9 @@ function request(params, isGetTonken) {
         });
       }, 1)
 
+    },
+    complete: function (res) {
+      console.log(`接口地址${config.domain + params.url}：完成`,res,params.data);
     }
   })
 }
@@ -212,7 +218,7 @@ function getCartCount() {
     callBack: function (res) {
       if (res > 0) {
         wx.setTabBarBadge({
-          index: 2,
+          index: 1,
           text: res + "",
         })
         var app = getApp();