新增功能

app.js

@@ -137,8 +137,8 @@ App({
     fromUserId : '',//分享者的id
     fromUserRole : '',//分享者的role
     //servsers: "https://52yqf.cn/",
-    servsers: "https://www.daliangzao.net/",//正式库
-    // servsers: "https://dlz.info666.com/",//测试域名库
+    // servsers: "https://www.daliangzao.net/",//正式库
+    servsers: "https://dlz.info666.com/",//测试域名库
     //servsers: "https://tt.daliangzao.net/",//测试库
     appid: 'wxf9a0ddcb8c70b939',//appid
     secret: 'a009cb3e46c8ecef9c54a50522f11823',//secret

app.json

@@ -88,7 +88,8 @@
     "components/divider/divider",
     "pages/login/login",
     "pages/orderCanvas/orderCanavs",
-    "pages/channelInfor/channelInfor"
+    "pages/channelInfor/channelInfor",
+    "pages/momo/momo"
   ],
   "subpackages": [
     {

pages/index/index.js

@@ -587,13 +587,24 @@ Page({
     let item = e.currentTarget.dataset.item;
     if (item.type == 1 && !wx.getStorageSync('channelIdObj')) { // 表示是优质的杯,并且还没有登录过渠道
       wx.navigateTo({
-        url: '/pages/login/login?url=/pages/kindSecondList/kindSecondList',
+        url: '/pages/login/login?url=' + item.href,
       })
     } else {
       wx.navigateTo({
         url: item.href,
       })
     }
+  },
+  tapMomo(){
+    if (!wx.getStorageSync('channelIdObj')) { // 还没有登录过渠道
+      wx.navigateTo({
+        url: '/pages/login/login?url=/pages/momo/momo',
+      })
+    } else {
+      wx.navigateTo({
+        url: '/pages/momo/momo',
+      })
+    }
   }
 
 })

pages/index/index.wxml

@@ -20,57 +20,13 @@
       <view scroll-y="true" class="scoll-h"  data-id="0" data-forid="0"  data-current="0"  style="height:{{winHeight}}rpx">
         <!-- banner -->
         <view class="banner_wrap">
-            <swiper indicator-dots="true" indicator-active-color="rgba(255, 255, 255, .3)" indicator-color="#fff"   circular="true"  interval="5000" duration="1000"  autoplay='true'  class="{{bannerFlag == 0 ? 'banner_null_class' : ''}}">  
+            <swiper indicator-dots="false" indicator-active-color="rgba(255, 255, 255, .3)" indicator-color="#fff"   circular="true"  interval="5000" duration="1000"  autoplay='true'  class="{{bannerFlag == 0 ? 'banner_null_class' : ''}}">  
                 <block wx:for="{{banners}}"  wx:key="{{index}}">  
-                  <block wx:if="{{item.banner_flag == '0'}}">
-                    <swiper-item  wx:if="{{item.banner_logo}}"  class="banner">  
-                        <!-- 跳转到文章 -->
-                        <block wx:if="{{item.classify_id == '' || item.classify_id == null}}">
-                            <navigator url="/pages/articleInfor/articleInfor?id={{item.banner_find}}">
-                              <image  src="{{item.banner_logo}}"  mode="scaleToFill" class="slide-image"></image>  
-                            </navigator>  
-                        </block>
-<!-- 
-                        <block wx:elif="{{item.id == '2915'}}">
-                            <navigator url="/pages/aboutUs/aboutUs">
-                              <image  src="{{item.banner_logo}}"  mode="scaleToFill" class="slide-image"></image>  
-                            </navigator>  
-                        </block>
-                        <!-- 女神节 -->
-                        <!-- <block wx:elif="{{item.id == '2917'}}">
-                            <navigator url="/pages/girlsDayInfo/girlsDayInfo">
-                              <image  src="{{item.banner_logo}}"  mode="scaleToFill" class="slide-image"></image>  
-                            </navigator>  
-                        </block> -->
-                        <!-- 加班汪 -->
-                        <!-- <block wx:elif="{{item.id == '2918'}}">
-                            <navigator url="/pages/newYears/newYears">
-                              <image  src="{{item.banner_logo}}"  mode="scaleToFill" class="slide-image"></image>  
-                            </navigator>  
-                        </block> -->
-                        <!-- 樱花 -->
-                        <!-- <block wx:elif="{{item.id == '2922'}}">
-                            <navigator url="/pages/sakuraDay/sakuraDay">
-                              <image  src="{{item.banner_logo}}"  mode="scaleToFill" class="slide-image"></image>  
-                            </navigator>  
-                        </block> -->
-
-
-                        <!-- 端午节 -->
-                        <!-- <block wx:elif="{{item.id == '2930'}}">
-                            <navigator url='/pages/dragonBoatFestivalInfor/dragonBoatFestivalInfor'>
-                              <image  src="{{item.banner_logo}}"  mode="scaleToFill" class="slide-image"></image>  
-                            </navigator>
-                        </block> -->
-
-                        <!-- 跳转到分类 -->
-                        <block wx:else>
-                            <navigator url='/pages/kindSecondList/kindSecondList?classify_name={{item.classify_name}}&classify_des={{item.classify_des}}&id={{item.classify_id}}'>
-                              <image  src="{{item.banner_logo}}"  mode="scaleToFill" class="slide-image"></image>  
-                            </navigator>
-                        </block>
-                      </swiper-item> 
-                  </block> 
+                    <swiper-item  wx:if="{{item.classify_id == '3053'}}"  class="banner">  
+                        <navigator bindtap='tapMomo'>
+                          <image  src="{{item.banner_logo}}"  mode="scaleToFill" class="slide-image"></image>  
+                        </navigator>  
+                    </swiper-item> 
                 </block>  
             </swiper>  
         </view>

pages/momo/momo.js

@@ -0,0 +1,115 @@
+// newsShop/pages/patternMenu/patternMenu.js
+let app = getApp();
+let host = app.globalData.servsers; // 请求的url
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    host: host,
+    requestState: true, //检测请求状态是否结束了
+    filterStatic: false,
+    goodsList: [],
+    page: 1, //默认是第一页
+    limit: 20, //一页20条数据
+    requestState: true, //默认是可以向下请求的
+    loginStatic: false, //登陆状态，默认为false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.getGiftList(this)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    let that = this;
+    if (wx.getStorageSync('channelIdObj').channelId) {
+      that.setData({
+        loginStatic: true,
+      })
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+    let that = this;
+    if (that.data.requestState) {
+      that.setData({
+        page: that.data.page + 1
+      })
+      that.getGiftList(that)
+    }
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  getGiftList(that) {
+    let data = {
+      limit: that.data.limit, // 一页20条数据
+      offset: that.data.page, //当前页数
+      channelId: wx.getStorageSync('channelIdObj').channelId ? wx.getStorageSync('channelIdObj').channelId : ""
+    }
+    wx.request({
+      url: host + '/queryAllCommodityByChannelId',
+      method: 'get',
+      data: data,
+      success(res) {
+        let dataArray = that.data.goodsList;
+        res.data.rows.forEach(el => {
+          el.logo = el.commodity_logo.split(",")
+        })
+        dataArray.push(...res.data.rows)
+        that.setData({
+          goodsList: dataArray,
+          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/momo/momo.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "momo",
+  "usingComponents": {
+    "data-none": "/components/data-none/data-none",
+    "divider": "/components/divider/divider"
+  }
+}

pages/momo/momo.wxml

@@ -0,0 +1,20 @@
+<view>
+<!-- 内容 -->
+<view class='gift-box'>
+  <!-- goodsList -->
+    <view class='f-box f-flex-wrap f-justify-content-between'>
+      <view class='goods-list' wx:for="{{goodsList}}" data-id="{{item.id}}" bindtap='toGoodsDetail'>
+        <image src='{{host}}/images/{{item.logo[0]}}' class='goods-img' mode='aspectFit'></image>
+        <!-- <view class='goods-summary'></view> -->
+        <view class='goods-title'>{{item.commodity_name}}</view>
+        <view class='f-box'>
+          <view wx:if="{{item.commodityChannelPrice && loginStatic}}" class='c-theme'>￥{{item.commodityChannelPrice}}</view>
+          <view class='c-theme f-item {{item.commodityChannelPrice && loginStatic ? "price-cancel" : ""}}'>￥{{item.commodity_sale}}</view>
+        </view>
+      </view>
+    </view>
+    <divider wx:if="{{!requestState && page != 1}}"></divider>
+    <data-none wx:if="{{goodsList.length === 0}}"></data-none>
+</view>
+</view>
+<view class='ceng' bindtap='close' wx:if="{{filterStatic}}"></view>

pages/momo/momo.wxss

@@ -0,0 +1,113 @@
+/* newsShop/pages/patternMenu/patternMenu.wxss */
+page{
+  background:#fff;
+}
+.header{
+  text-align: center;
+}
+.header-item{
+  color:#000;
+  border-bottom-style: solid;
+  border-bottom-width: 4rpx; 
+  border-bottom-color:#fff;
+}
+.header-tab{
+  border-bottom:2rpx solid #e0e0e0;
+}
+.triangle-box{
+  height:32rpx;
+  margin:0rpx 0 0 10rpx;
+}
+.triangle-just{
+  width: 0;
+  height: 0;
+  border-bottom: 11rpx solid #dcdcdc;
+  border-left: 8rpx solid transparent;
+  border-right: 8rpx solid transparent;
+  margin:5rpx 0;
+}
+.triangle-just.active{
+  border-bottom-color:#2d2d2d;
+}
+.triangle-invert.active{
+  border-top-color:#2d2d2d;
+}
+.triangle-invert{
+  margin:5rpx 0;
+  width: 0;
+  height: 0;
+  border-top: 11rpx solid #dcdcdc;
+  border-left: 8rpx solid transparent;
+  border-right: 8rpx solid transparent;
+}
+.filter-frist,.filter-next{
+  text-align: left;
+}
+.filter-main{
+  border-top:2rpx solid #e0e0e0;
+  line-height:70rpx;
+  padding:20rpx;
+  background:#fff;
+  position:absolute;
+  top:82rpx;
+  width:100%;
+}
+.filter-range{
+  width:400rpx;
+  line-height:48rpx;
+}
+.filter-range input{
+  width:150rpx;
+  background:#eeedf2;
+  height:48rpx;
+  border-radius:48rpx;
+  text-align: center;
+}
+.radio-group .radio{
+  line-height:50rpx;
+  display:inline-block;
+  width:40%;
+}
+.radio-group .radio radio{
+transform:scale(0.6);
+width:40rpx;
+}
+.gift-box{
+  margin:0 26rpx;
+  background:#fff;
+}
+.goods-list{
+  width:338rpx;
+  margin-top:26rpx;
+}
+.goods-img{
+  width:338rpx;
+  height:338rpx;
+  background:#eeedf2;
+  display: block;
+}
+.goods-summary{
+  height:44rpx;
+  line-height:44rpx;
+  background:#f1f7fc;
+  color:#666666;
+  padding:0 10rpx;
+  overflow: hidden;/*超出部分隐藏*/
+  white-space: nowrap;/*不换行*/
+  text-overflow:ellipsis;/*超出部分文字以...显示*/
+}
+.goods-title{
+  margin:10rpx 0;
+}
+.goods-price{
+  color:#e60012;
+}
+.ceng{
+  position:fixed;
+  width:100%;
+  height:100%;
+  background:rgba(0,0,0,0.6);
+  z-index:10;
+  top:0;
+  left:0;
+}

pages/orderList/orderList.wxml

@@ -39,8 +39,8 @@
       <view class="f-box f-justify-content-center order-btn">
         <view class='f-item f-box f-justify-content-end mar-r26'>
           <view class='btn' wx:if="{{item.order_sta ==1 || item.order_sta ==2}}" data-index="{{index}}" data-orderId="{{item.order_number}}" bindtap='uploadImg'>{{item.list_order_aff_data[0].pay_order ? "修改凭证" :"上传凭证"}}</view>
-          <view class='btn' wx:if="{{item.order_sta ==4}}">查看物流</view>
-          <view class='btn' wx:if="{{item.order_sta ==4}}">确认收货</view>
+          <!-- <view class='btn' wx:if="{{item.order_sta ==4}}">查看物流</view> -->
+          <view class='btn' wx:if="{{item.order_sta ==4}}" data-index="{{index}}" data-orderId="{{item.order_number}}" bindtap='uploadImg' >{{item.list_order_aff_data[0].pay_order ? "修改尾款单凭证" :"上传尾款单凭证"}}</view>
         </view>
         
         <view>合计:<text class='c-theme'>¥ {{item.com_price_total}}</text></view>

project.config.json

@@ -28,7 +28,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 25,
+			"current": 26,
 			"list": [
 				{
 					"id": 0,
@@ -206,6 +206,12 @@
 					"pathName": "pages/channelInfor/channelInfor",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "momo",
+					"pathName": "pages/momo/momo",
+					"scene": null
 				}
 			]
 		}