bug修改

customized/pages/boxMade/boxComb/boxComb.js

@@ -349,6 +349,7 @@ Page({
         customGoodsName: '拉杆箱-银灰色',
         customGoodsNum: 1,
         userId: app.globalData.user_id,
+        customGoodsId:wx.getStorageSync('detail').id,
       },
       success: function (res) {
         console.log(res, "加入购物车")

pages/index/index.js

@@ -65,18 +65,19 @@ Page({
         text: '包袋'
       }
     ],
-    navArray: [{
-        src: '/images/news/nav_1.png',
-        bg: '#fafcff',
-        type: 0,
-        href: '/'
-      },
-      {
-        src: '/images/news/nav_2.png',
-        bg: '#fef9f8',
-        type: 1,
-        href: '/pages/kindSecondList/kindSecondList'
-      },
+    navArray: [
+      // {
+      //   src: '/images/news/nav_1.png',
+      //   bg: '#fafcff',
+      //   type: 0,
+      //   href: '/'
+      // },
+      // {
+      //   src: '/images/news/nav_2.png',
+      //   bg: '#fef9f8',
+      //   type: 1,
+      //   href: '/pages/kindSecondList/kindSecondList'
+      // },
       {
         src: '/images/news/nav_3.png',
         bg: '#f7f6fb',

pages/index/index.wxml

@@ -73,7 +73,7 @@
         <!-- 专题精选 -->
         <view class='special-box'>
           <view class='spec-title'>专题精选</view>
-          <swiper autoplay="true" interval="5000" duration="500" previous-margin="0rpx" next-margin="180rpx">
+          <swiper autoplay="true" interval="5000" duration="500" previous-margin="20rpx" next-margin="180rpx">
             <block wx:for="{{specArray}}">
               <swiper-item>
               <view class='mar-r20' style='height:100%'>

pages/login/login.js

@@ -17,6 +17,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options)
     this.setData({
       url:options.url,
       type: options.type ? options.type : 0
@@ -78,12 +79,15 @@ Page({
     })
   },
   pwd(e){
+    
     this.setData({
       pwd: e.detail.value
     })
+    console.log(this.data.pwd)
   },
   login(){
     let that = this;
+    console.log(this.data.pwd)
     wx.request({
       url: host +'/channelLogin',
       method:'post',
@@ -114,11 +118,11 @@ Page({
                 wx.setStorageSync('channelName', res.data.channel.channelName)
                 if(that.data.type ==1){
                   wx.switchTab({
-                    url: that.data.url,
+                    url:that.data.url,
                   })
                 } else {
                   wx.redirectTo({
-                    url: that.data.url,
+                    url:that.data.url,
                   })
                 }
                 

pages/momo/momo.js

@@ -52,7 +52,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.getGiftList(this)
+    
   },
 
   /**
@@ -69,8 +69,10 @@ Page({
     let that = this;
     if (!wx.getStorageSync('channelIdObj')) { // 还没有登录过渠道
       wx.redirectTo({
-        url: '/pages/login/login?url=/pages/momo/momo && type =1',
+        url: '/pages/login/login?url=/pages/momo/momo&&type=1',
       })
+    } else {
+      that.getGiftList(that)
     }
     if (wx.getStorageSync('channelIdObj').channelId) {
       that.setData({

pages/momo/momo.wxml

@@ -1,6 +1,6 @@
 <view>
 <!-- banner -->
-<view class='momo-ban mar-b20'>
+<view class='momo-ban'>
   <image src='../../images/news/momo.jpg' class='momo-img'></image>
 </view>
 <!-- 内容 -->

pages/momo/momo.wxss

@@ -78,7 +78,7 @@ width:40rpx;
 }
 .goods-list{
   width:338rpx;
-  margin-top:26rpx;
+  margin-bottom:26rpx;
 }
 .goods-img{
   width:338rpx;