Merge remote-tracking branch 'origin/master'

litemall-wx/pages/cart/cart.wxml

@@ -3,7 +3,7 @@
     <view class="c">
       <image src="http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/noCart-a8fe3f12e5.png" />
       <text>还没有登录</text>
-      <button type="primary" plain="true" bindtap="goLogin">去登录</button>
+      <button style="background-color:#A9A9A9"  bindtap="goLogin">去登录</button>
     </view>
   </view>
   <view class='login' wx:else>

litemall-wx/pages/catalog/catalog.wxss

@@ -68,9 +68,9 @@ page {
 }
 
 .catalog .nav .item.active {
-  color: #ab2b2b;
+  color: #AB956D;
   font-size: 36rpx;
-  border-left: 6rpx solid #ab2b2b;
+  border-left: 6rpx solid #AB956D;
 }
 
 .catalog .cate {

litemall-wx/pages/category/category.wxss

@@ -34,8 +34,8 @@
 }
 
 .cate-nav .item.active .name{
-    color: #ab2b2b;
-    border-bottom: 2px solid #ab2b2b;
+    color: #AB956D;
+    border-bottom: 2px solid #AB956D;
 }
 
 .cate-item{
@@ -113,5 +113,5 @@
   height: 30rpx;
   text-align: center;
   font-size: 30rpx;
-  color: #b4282d;
+  color: #AB956D;
 }
\ No newline at end of file

litemall-wx/pages/goods/goods.js

@@ -41,6 +41,17 @@ Page({
    path: '/pages/index/index?goodId=' + this.data.id
   }
  },
+ 
+ shareFriendOrCircle: function () {
+  //var that = this;
+  if (this.data.openShare === false) {
+    this.setData({
+      openShare: !this.data.openShare
+    });
+  } else {
+    return false;
+  }
+ },
 
  // 保存分享图
  saveShare: function() {

litemall-wx/pages/index/index.wxss

@@ -9,19 +9,22 @@
 }
 
 .m-menu {
+  /* border: 1px solid black; */
+  /* height: 280rpx; */
+  background: #fff;
+ /* padding: 0 25rpx;  */
   display: flex;
-  height: 181rpx;
-  width: 750rpx;
-  flex-flow: row nowrap;
+  /* justify-content: center; */
   align-items: center;
-  justify-content: space-between;
-  background-color: #fff;
+  flex-wrap: wrap;
+  padding-bottom: 0rpx;
+  padding-top: 25rpx
 }
 
 .m-menu .item {
-  flex: 1;
-  display: block;
-  padding: 20rpx 0;
+  /* border: 1px solid black; */
+  width: 150rpx;
+  height: 126rpx;
 }
 
 .m-menu image {
@@ -192,7 +195,7 @@
 .a-groupon .b .price {
  width: 476rpx;
  display: flex;
- color: #b4282d;
+ color: #AB956D;
  line-height: 50rpx;
  font-size: 33rpx;
 }
@@ -249,7 +252,7 @@
   text-align: center;
   line-height: 30rpx;
   font-size: 30rpx;
-  color: #b4282d;
+  color: #AB956D;
 }
 
 .a-popular {
@@ -310,7 +313,7 @@
 .a-popular .b .price {
   width: 456rpx;
   display: block;
-  color: #b4282d;
+  color: #AB956D;
   line-height: 50rpx;
   font-size: 33rpx;
 }
@@ -354,7 +357,7 @@
 
 .a-topic .b .np .price {
   margin-left: 20.8rpx;
-  color: #b4282d;
+  color: #AB956D;
 }
 
 .a-topic .b .desc {
@@ -433,7 +436,7 @@
   height: 30rpx;
   text-align: center;
   font-size: 30rpx;
-  color: #b4282d;
+  color: #AB956D;
 }
 
 .good-grid .more-item{

litemall-wx/pages/ucenter/feedback/feedback.json

+{
+
+}
\ No newline at end of file

litemall-wx/pages/ucenter/feedback/feedback.wxml

+<view class="container">
+
+  <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
+    <view class="picker">
+      <view class="fb-type">
+        <view class="type-label">{{array[index]}}</view>
+        <image class="type-icon" src="http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/pickerArrow-a8b918f05f.png"></image>
+
+      </view>
+    </view>
+  </picker>
+  <view class="fb-body">
+    <textarea class="content" placeholder="对我们网站、商品、服务，你还有什么建议吗？你还希望在商城上买到什么？请告诉我们..."  bindinput ="contentInput" maxlength="500" auto-focus="true" value="{{content}}"/>
+    <view class="text-count">{{contentLength}}/500</view>
+  </view>
+  <view class="fb-mobile">
+    <view class="label">手机号码</view>
+    <view class="mobile-box">
+      <input class="mobile" maxlength="11" type="number" placeholder="方便我们与你联系" bindinput ="mobileInput" value="{{mobile}}"/>
+      <!--
+      <image class="clear-icon" src="https://platform-wxmall.oss-cn-beijing.aliyuncs.com/upload/20180727/150647657fcdd0.png" bindtap="cleanMobile"></image>
+      -->
+    </view>
+  </view>
+
+  <view class="fb-btn" bindtap="sbmitFeedback">提交</view>
+</view>
\ No newline at end of file

litemall-wx/pages/ucenter/index/index.js

@@ -51,6 +51,21 @@ Page({
         url: "/pages/auth/login/login"
       });
     }
+  },
+    goOrderIndex(e) {
+    let tab = e.currentTarget.dataset.index
+    let route = e.currentTarget.dataset.route
+    try {
+      wx.setStorageSync('tab', tab);
+    } catch (e) {
+
+    }
+    wx.navigateTo({
+      url: route,
+      success: function(res) {},
+      fail: function(res) {},
+      complete: function(res) {},
+    })
   },
   goCoupon() {
     if (app.globalData.hasLogin) {
@@ -85,6 +100,17 @@ Page({
    });
   };
  },
+   goFeedback(e) {
+    if (app.globalData.hasLogin) {
+      wx.navigateTo({
+        url: "/pages/ucenter/feedback/feedback"
+      });
+    } else {
+      wx.navigateTo({
+        url: "/pages/auth/login/login"
+      });
+    };
+  },
  goFootprint() {
   if (app.globalData.hasLogin) {
    wx.navigateTo({