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

@@ -42,6 +42,17 @@ Page({
   }
  },
  
+ shareFriendOrCircle: function () {
+  //var that = this;
+  if (this.data.openShare === false) {
+    this.setData({
+      openShare: !this.data.openShare
+    });
+  } else {
+    return false;
+  }
+ },
+
  // 保存分享图
  saveShare: function() {
   let that = this;

litemall-wx/pages/goods/goods.wxml

@@ -5,13 +5,30 @@
     </swiper-item>
   </swiper>
   <!-- 分享 -->
- <view class="service-policy" wx:if="{{!isGroupon}}">
-  <button class="savesharebtn" bindtap="saveShare">分享朋友圈</button>
-  <button class="sharebtn" open-type="share">分享给朋友</button>
+  <view class='goods_name'>
+    <view class='goods_name_left'>{{goods.name}}</view>
+    <view class="goods_name_right" bindtap="shareFriendOrCircle">分享</view>
   </view>
+  <view class="share-pop-box" hidden="{{!openShare}}">
+    <view class="share-pop">
+      <view class="close" bindtap="closeShare">
+        <image class="icon" src="/static/images/icon_close.png"></image>
+      </view>
+      <view class='share-info'>
+        <button class="sharebtn" open-type="share" wx:if="{{!isGroupon}}">
+          <image class='sharebtn_image' src='/static/images/wechat.png'></image>
+          <view class='sharebtn_text'>分享给好友</view>
+        </button>
+        <button class="savesharebtn" bindtap="saveShare" wx:if="{{!isGroupon}}">
+          <image class='sharebtn_image' src='/static/images/friend.png'></image>
+          <view class='sharebtn_text'>发朋友圈</view>
+        </button>
+      </view>
+    </view>
+  </view>
+  
   <view class="goods-info">
     <view class="c">
-   <text class="name">{{goods.name}}</text>
       <text class="desc">{{goods.goodsBrief}}</text>
       <view class="price">
         <view class="counterPrice">原价：￥{{goods.counterPrice}}</view>
@@ -104,7 +121,6 @@
     </view>
   </view>
 </view>
-
 <!-- 规格选择界面 -->
 <view class="attr-pop-box" hidden="{{!openAttr}}">
   <view class="attr-pop">

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.js

+var util = require('../../../utils/util.js');
+var api = require('../../../config/api.js');
+
+
+
+var app = getApp();
+
+Page({
+  data: {
+    array: ['请选择反馈类型', '商品相关', '功能异常', '优化建议', '其他'],
+    index: 0,
+    content:'',
+    contentLength:0,
+    mobile:''
+  },
+  bindPickerChange: function (e) {
+    console.log('picker发送选择改变，携带值为', e.detail.value);
+    this.setData({
+      index: e.detail.value
+    });
+  },
+  mobileInput: function (e) {
+    let that = this;
+    this.setData({
+      mobile: e.detail.value,
+    });
+    console.log(that.data.mobile);
+  },
+  contentInput: function (e) {
+   
+    let that = this;
+    this.setData({
+      contentLength: e.detail.cursor,
+      content: e.detail.value,
+    });
+    console.log(that.data.content);
+  },
+  cleanMobile:function(){
+    let that = this;
+
+  },
+  sbmitFeedback : function(e){
+    let that = this;
+    if (that.data.index == 0){
+      util.showErrorToast('请选择反馈类型');
+      return false;
+    }
+
+    if (that.data.content == '') {
+      util.showErrorToast('请输入反馈内容');
+      return false;
+    }
+
+    if (that.data.mobile == '') {
+      util.showErrorToast('请输入手机号码');
+      return false;
+    }
+    wx.showLoading({
+      title: '提交中...',
+      mask:true,
+      success: function () {
+
+      }
+    });
+
+    console.log(that.data);
+
+    util.request(api.FeedbackAdd, { mobile: that.data.mobile, index: that.data.index, content: that.data.content},'POST').then(function (res) {
+      if (res.errno === 0) {
+        console.log(res.data);
+      
+        wx.hideLoading();
+
+        wx.showToast({
+          title: res.data,
+          icon: 'success',
+          duration: 2000,
+          complete: function () {
+            console.log('重新加载');
+            that.setData({
+              index: 0,
+              content: '',
+              contentLength: 0,
+              mobile: ''
+            });
+          }
+        });
+      } else {
+        util.showErrorToast(res.data);
+      }
+      
+    });
+  },
+  onLoad: function (options) {
+  },
+  onReady: function () {
+
+  },
+  onShow: function () {
+
+  },
+  onHide: function () {
+    // 页面隐藏
+
+  },
+  onUnload: function () {
+    // 页面关闭
+  }
+})
\ No newline at end of file

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

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