Merge remote-tracking branch 'origin/master'

8f75afed · Menethil · 854bacf6 · ce225563 · 8f75afed · 8f75afed
Commit 8f75afed authored Aug 28, 2018 by Menethil
--- a/litemall-wx/pages/cart/cart.wxml
+++ b/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>

--- a/litemall-wx/pages/cart/cart.wxss
+++ b/litemall-wx/pages/cart/cart.wxss
-page{
+page {
-    height: 100%;
+  height: 100%;
-    min-height: 100%;
+  min-height: 100%;
-    background: #f4f4f4;
+  background: #f4f4f4;
 }
-.container{
-    background: #f4f4f4;
+.container {
-    width: 100%;
+  background: #f4f4f4;
-    height: auto;
+  width: 100%;
-    min-height: 100%;
+  height: auto;
-    overflow: hidden;
+  min-height: 100%;
-}
+  overflow: hidden;
-.service-policy{
+}
-    width: 750rpx;
-    height: 73rpx;
+.service-policy {
-    background: #f4f4f4;
+  width: 750rpx;
-    padding: 0 31.25rpx;
+  height: 73rpx;
-    display: flex;
+  background: #f4f4f4;
-    flex-flow: row nowrap;
+  padding: 0 31.25rpx;
-    align-items: center;
+  display: flex;
-    justify-content: space-between;
+  flex-flow: row nowrap;
-}
+  align-items: center;
+  justify-content: space-between;
-.service-policy .item{
+}
-    background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/servicePolicyRed-518d32d74b.png) 0 center no-repeat;
-    background-size: 10rpx;
+.service-policy .item {
-    padding-left: 15rpx;
+  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/servicePolicyRed-518d32d74b.png) 0 center no-repeat;
-    display: flex;
+  background-size: 10rpx;
-    align-items: center;
+  padding-left: 15rpx;
-    font-size: 25rpx;
+  display: flex;
-    color: #666;
+  align-items: center;
-}
+  font-size: 25rpx;
+  color: #666;
+}
-.no-login{
-    width: 100%;
+.no-login {
-    height: auto;
+  width: 100%;
-    margin: 0 auto;
+  height: auto;
-}
+  margin: 0 auto;
+}
-.no-login .c{
-    width: 100%;
+.no-login .c {
-    height: auto;
+  width: 100%;
-    margin-top: 200rpx;
+  height: auto;
-}
+  margin-top: 200rpx;
+}
-.no-login .c image{
-    margin: 0 auto;
+.no-login .c image {
-    display: block;
+  margin: 0 auto;
-    text-align: center;
+  display: block;
-    width: 258rpx;
+  text-align: center;
-    height: 258rpx;
+  width: 258rpx;
-}
+  height: 258rpx;
+}
-.no-login .c text{
-    margin: 0 auto;
+.no-login .c text {
-    display: block;
+  margin: 0 auto;
-    width: 258rpx;
+  display: block;
-    height: 59rpx;
+  width: 258rpx;
-    line-height: 29rpx;
+  height: 59rpx;
-    text-align: center;
+  line-height: 29rpx;
-    font-size: 50rpx;
+  text-align: center;
-    color: #999;
+  font-size: 35rpx;
-}
+  color: #999;
+}
-.no-login button{
-    width: 60%;
+.no-login button {
-    margin: 0 auto;
+  width: 90%;
-}
+  margin: 0 auto;
+  color: #fff;
-.no-cart{
+  font-size: 30rpx;
-    width: 100%;
+  height: 96rpx;
-    height: auto;
+  line-height: 96rpx;
-    margin: 0 auto;
+  right: 0;
-}
+  display: flex;
+  justify-content: center;
-.no-cart .c{
+  align-items: center;
-    width: 100%;
+  position: flex;
-    height: auto;
+  bottom: 0;
-    margin-top: 200rpx;
+  left: 0;
-}
+  border-radius: 0;
+  padding: 0;
-.no-cart .c image{
+  margin-left: 5%;
-    margin: 0 auto;
+  text-align: center;
-    display: block;
+  /* padding-left: -5rpx; */
-    text-align: center;
+  border-top-left-radius: 50rpx;
-    width: 258rpx;
+  border-bottom-left-radius: 50rpx;
-    height: 258rpx;
+  border-top-right-radius: 50rpx;
-}
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
-.no-cart .c text{
+  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
-    margin: 0 auto;
+}
-    display: block;
-    width: 258rpx;
+.no-cart {
-    height: 29rpx;
+  width: 100%;
-    line-height: 29rpx;
+  height: auto;
-    text-align: center;
+  margin: 0 auto;
-    font-size: 29rpx;
+}
-    color: #999;
-}
+.no-cart .c {
+  width: 100%;
+  height: auto;
-.cart-view{
+  margin-top: 200rpx;
-    width: 100%;
+}
-    height: auto;
-    overflow: hidden;
+.no-cart .c image {
+  margin: 0 auto;
-}
+  display: block;
+  text-align: center;
-.cart-view .list{
+  width: 258rpx;
-    height: auto;
+  height: 258rpx;
-    width: 100%;
+}
-    overflow: hidden;
-    margin-bottom: 120rpx;
+.no-cart .c text {
-}
+  margin: 0 auto;
+  display: block;
-.cart-view .group-item{
+  width: 258rpx;
-    height: auto;
+  height: 29rpx;
-    width: 100%;
+  line-height: 29rpx;
-    background: #fff;
+  text-align: center;
-    margin-bottom: 18rpx;
+  font-size: 29rpx;
-}
+  color: #999;
+}
+.cart-view {
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
-.cart-view .item{
+.cart-view .list {
-    height: 164rpx;
+  height: auto;
-    width: 100%;
+  width: 100%;
-    overflow: hidden;
+  overflow: hidden;
-}
+  margin-bottom: 120rpx;
-.cart-view .item .checkbox{
+}
-    float: left;
-    height: 34rpx;
+.cart-view .group-item {
-    width: 34rpx;
+  height: auto;
-    margin: 65rpx 18rpx 65rpx 26rpx;
+  width: 100%;
-    background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-0e09baa37e.png) no-repeat;
+  background: #fff;
-    background-size: 34rpx;
+  margin-bottom: 18rpx;
 }
-.cart-view .item .checkbox.checked{
+.cart-view .item {
-    background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-checked-822e54472a.png) no-repeat;
+  height: 164rpx;
-    background-size: 34rpx;
+  width: 100%;
-}
+  overflow: hidden;
+}
-.cart-view .item .cart-goods{
-    float: left;
+.cart-view .item .checkbox {
-    height: 164rpx;
+  float: left;
-    width: 672rpx;
+  height: 34rpx;
-    border-bottom: 1px solid #f4f4f4;
+  width: 34rpx;
-}
+  margin: 65rpx 18rpx 65rpx 26rpx;
+  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-0e09baa37e.png) no-repeat;
-.cart-view .item .img{
+  background-size: 34rpx;
-    float: left;
+}
-    height:125rpx;
-    width: 125rpx;
+.cart-view .item .checkbox.checked {
-    background: #f4f4f4;
+  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-checked-822e54472a.png) no-repeat;
-    margin: 19.5rpx 18rpx 19.5rpx 0;
+  background-size: 34rpx;
 }
-.cart-view .item .info{
+.cart-view .item .cart-goods {
-    float: left;
+  float: left;
-    height:125rpx;
+  height: 164rpx;
-    width: 503rpx;
+  width: 672rpx;
-    margin: 19.5rpx 26rpx 19.5rpx 0;
+  border-bottom: 1px solid #f4f4f4;
 }
-.cart-view .item .t{
+.cart-view .item .img {
-    margin: 8rpx 0;
+  float: left;
-    height: 28rpx;
+  height: 125rpx;
-    font-size: 25rpx;
+  width: 125rpx;
-    color: #333;
+  background: #f4f4f4;
-    overflow: hidden;
+  margin: 19.5rpx 18rpx 19.5rpx 0;
 }
+.cart-view .item .info {
-.cart-view .item .name{
+  float: left;
-    height: 28rpx;
+  height: 125rpx;
-    max-width: 310rpx;
+  width: 503rpx;
-    line-height: 28rpx;
+  margin: 19.5rpx 26rpx 19.5rpx 0;
-    font-size: 25rpx;
-    color: #333;
-    overflow: hidden;
-}
-.cart-view .item .num{
-    height: 28rpx;
-    line-height: 28rpx;
-    float: right;
-}
-.cart-view .item .attr{
-    margin-bottom: 17rpx;
-    height: 24rpx;
-    line-height: 24rpx;
-    font-size: 22rpx;
-    color: #666;
-    overflow: hidden;
-}
-.cart-view .item .b{
-    height: 28rpx;
-    line-height: 28rpx;
-    font-size: 25rpx;
-    color: #333;
-    overflow: hidden;
 }
-.cart-view .item .price{
+.cart-view .item .t {
-    float: left;
+  margin: 8rpx 0;
+  height: 28rpx;
+  font-size: 25rpx;
+  color: #333;
+  overflow: hidden;
 }
-.cart-view .item .open{
+.cart-view .item .name {
-    height: 28rpx;
+  height: 28rpx;
-    width: 150rpx;
+  max-width: 310rpx;
-    display: block;
+  line-height: 28rpx;
-    float: right;
+  font-size: 25rpx;
-    background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/arrowDown-d48093db25.png) right center no-repeat;
+  color: #333;
-    background-size: 25rpx;
+  overflow: hidden;
-    font-size: 25rpx;
-    color: #333;
 }
-.cart-view .item.edit .t{
+.cart-view .item .num {
-    display: none;
+  height: 28rpx;
+  line-height: 28rpx;
+  float: right;
 }
-.cart-view .item.edit .attr{
+.cart-view .item .attr {
-    text-align: right;
+  margin-bottom: 17rpx;
-    background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/arrow-right1-e9828c5b35.png) right center no-repeat;
+  height: 24rpx;
-    padding-right: 25rpx;
+  line-height: 24rpx;
-    background-size: 12rpx 20rpx;
+  font-size: 22rpx;
-    margin-bottom: 24rpx;
+  color: #666;
-    height: 39rpx;
+  overflow: hidden;
-    line-height: 39rpx;
-    font-size: 24rpx;
-    color: #999;
-    overflow: hidden;
 }
-.cart-view .item.edit .b{
+.cart-view .item .b {
-    display: flex;
+  height: 28rpx;
-    height: 52rpx;
+  line-height: 28rpx;
-    overflow: hidden;
+  font-size: 25rpx;
+  color: #333;
+  overflow: hidden;
 }
-.cart-view .item.edit .price{
+.cart-view .item .price {
-    line-height: 52rpx;
+  float: left;
-    height: 52rpx;
-    flex: 1;
 }
-.cart-view .item .selnum{
+.cart-view .item .open {
-    display: none;
+  height: 28rpx;
+  width: 150rpx;
+  display: block;
+  float: right;
+  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/arrowDown-d48093db25.png) right center no-repeat;
+  background-size: 25rpx;
+  font-size: 25rpx;
+  color: #333;
 }
-.cart-view .item.edit .selnum{
+.cart-view .item.edit .t {
-    width: 235rpx;
+  display: none;
-    height: 52rpx;
-    border: 1rpx solid #ccc;
-    display: flex;
 }
-.selnum .cut{
+.cart-view .item.edit .attr {
-    width: 70rpx;
+  text-align: right;
-    height: 100%;
+  background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/arrow-right1-e9828c5b35.png) right center no-repeat;
-    text-align: center;
+  padding-right: 25rpx;
-    line-height: 50rpx;
+  background-size: 12rpx 20rpx;
+  margin-bottom: 24rpx;
+  height: 39rpx;
+  line-height: 39rpx;
+  font-size: 24rpx;
+  color: #999;
+  overflow: hidden;
 }
-.selnum .number{
+.cart-view .item.edit .b {
-    flex: 1;
+  display: flex;
-    height: 100%;
+  height: 52rpx;
-    text-align: center;
+  overflow: hidden;
-    line-height: 68.75rpx;
-    border-left: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    float: left;
 }
-.selnum .add{
+.cart-view .item.edit .price {
-    width: 80rpx;
+  line-height: 52rpx;
-    height: 100%;
+  height: 52rpx;
-    text-align: center;
+  flex: 1;
-    line-height: 50rpx;
 }
+.cart-view .item .selnum {
-.cart-view .group-item .header{
+  display: none;
-    width: 100%;
-    height: 94rpx;
-    line-height: 94rpx;
-    padding: 0 26rpx;
-    border-bottom: 1px solid #f4f4f4;
 }
-.cart-view .promotion .icon{
+.cart-view .item.edit .selnum {
-    display: inline-block;
+  width: 235rpx;
-    height: 24rpx;
+  height: 52rpx;
-    width: 15rpx;
+  border: 1rpx solid #ccc;
+  display: flex;
 }
-.cart-view .promotion{
+.selnum .cut {
-    margin-top: 25.5rpx;
+  width: 70rpx;
-    float: left;
+  height: 100%;
-    height: 43rpx;
+  text-align: center;
-    width: 480rpx;
+  line-height: 50rpx;
-    /*margin-right: 84rpx;*/
-    line-height: 43rpx;
-    font-size: 0;
 }
-.cart-view .promotion .tag{
+.selnum .number {
-    border: 1px solid #f48f18;
+  flex: 1;
-    height: 37rpx;
+  height: 100%;
-    line-height: 31rpx;
+  text-align: center;
-    padding: 0 9rpx;
+  line-height: 68.75rpx;
-    margin-right: 10rpx;
+  border-left: 1px solid #ccc;
-    color: #f48f18;
+  border-right: 1px solid #ccc;
-    font-size: 24.5rpx;
+  float: left;
 }
-.cart-view .promotion .txt{
+.selnum .add {
-    height: 43rpx;
+  width: 80rpx;
-    line-height: 43rpx;
+  height: 100%;
-    padding-right: 10rpx;
+  text-align: center;
-    color: #333;
+  line-height: 50rpx;
-    font-size: 29rpx;
+}
-    overflow: hidden;
+.cart-view .group-item .header {
+  width: 100%;
+  height: 94rpx;
+  line-height: 94rpx;
+  padding: 0 26rpx;
+  border-bottom: 1px solid #f4f4f4;
+}
+.cart-view .promotion .icon {
+  display: inline-block;
+  height: 24rpx;
+  width: 15rpx;
+}
+.cart-view .promotion {
+  margin-top: 25.5rpx;
+  float: left;
+  height: 43rpx;
+  width: 480rpx;
+  /*margin-right: 84rpx;*/
+  line-height: 43rpx;
+  font-size: 0;
+}
+.cart-view .promotion .tag {
+  border: 1px solid #f48f18;
+  height: 37rpx;
+  line-height: 31rpx;
+  padding: 0 9rpx;
+  margin-right: 10rpx;
+  color: #f48f18;
+  font-size: 24.5rpx;
+}
+.cart-view .promotion .txt {
+  height: 43rpx;
+  line-height: 43rpx;
+  padding-right: 10rpx;
+  color: #333;
+  font-size: 29rpx;
+  overflow: hidden;
+}
+.cart-view .get {
+  margin-top: 18rpx;
+  float: right;
+  height: 58rpx;
+  padding-left: 14rpx;
+  border-left: 1px solid #d9d9d9;
+  line-height: 58rpx;
+  font-size: 29rpx;
+  color: #333;
+}
+.cart-bottom {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  height: 100rpx;
+  width: 100%;
+  background: #fff;
+  display: flex;
+}
+.cart-bottom .checkbox {
+  height: 34rpx;
+  padding-left: 60rpx;
+  line-height: 34rpx;
+  margin: 33rpx 18rpx 33rpx 26rpx;
+  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-0e09baa37e.png) no-repeat;
+  background-size: 34rpx;
+  font-size: 29rpx;
+}
+.cart-bottom .checkbox.checked {
+  background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-checked-822e54472a.png) no-repeat;
+  background-size: 34rpx;
+}
+.cart-bottom .total {
+  height: 34rpx;
+  flex: 1;
+  margin: 33rpx 10rpx;
+  font-size: 29rpx;
+}
+.cart-bottom .delete {
+  text-align: center;
+  width: 180rpx;
+  height: 80rpx;
+  line-height: 82rpx;
+  padding: 0;
+  margin: 0;
+  margin-left: -5rpx;
+  padding-right: 25rpx;
+  font-size: 25rpx;
+  color: #f4f4f4;
+  /* text-align: center; */
+  border-top-left-radius: 0rpx;
+  border-bottom-left-radius: 0rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #9a9ba1 0%, #ae8b9c 100%);
+}
+.cart-bottom .checkout {
+  height: 100rpx;
+  width: 210rpx;
+  text-align: center;
+  line-height: 100rpx;
+  font-size: 29rpx;
+  background: #b4282d;
+  color: #fff;
+}
+.action_btn_area {
+  /* border: 1px solid #333; */
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  right: 0;
+  top: 0;
+  width: 380rpx;
+  height: 100rpx;
+}
+.action_btn_area .edit {
+  width: 140rpx;
+  /* border: 1px solid #000; */
+  height: 80rpx;
+  line-height: 82rpx;
+  padding: 0;
+  margin: 0;
+  margin-right: 5rpx;
+  text-align: center;
+  /* padding-left: 25rpx; */
+  font-size: 25rpx;
+  color: #f4f4f4;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  /* background-image: linear-gradient(to right, #ff7701 100%); */
+  background-image: linear-gradient(to right, #AB956D 0%, #AB956D 100%);
+}
+.action_btn_area .checkout {
+  width: 140rpx;
+  height: 80rpx;
+  line-height: 82rpx;
+  padding: 0;
+  margin: 0;
+  margin-left: 5rpx;
+  /* padding-right: 25rpx; */
+  font-size: 25rpx;
+  color: #f4f4f4;
+  text-align: center;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
+.action_btn_area .delete {
+  width: 140rpx;
+  /* border: 1px solid #000; */
+  height: 80rpx;
+  line-height: 82rpx;
+  padding: 0;
+  margin: 0;
+  margin-right: 5rpx;
+  text-align: center;
+  padding-left: -5rpx;
+  font-size: 25rpx;
+  color: #f4f4f4;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
+.action_btn_area .sure {
+  text-align: center;
+  width: 140rpx;
+  height: 80rpx;
+  line-height: 82rpx;
+  padding: 0;
+  margin: 0;
+  margin-right: 10rpx;
+  padding-left: -5rpx;
+  font-size: 25rpx;
+  color: #f4f4f4;
+  /* text-align: center; */
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #AB956D 0%, #AB956D 100%);
+  /* background-image: linear-gradient(to right, #ff7701 0%, #fe4800 100%); */
+}
+.auth_btn {
+  position: fixed;
+  top: 55vh;
+  left: 10vw;
+  width: 80vw;
+  height: 96rpx;
+  line-height: 96rpx;
+  font-size: 25rpx;
+  color: #f4f4f4;
+  /* text-align: center; */
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #8baaaa 0%, #9a9ba1 100%);
 }
-.cart-view .get{
-    margin-top: 18rpx;
-    float: right;
-    height: 58rpx;
-    padding-left: 14rpx;
-    border-left: 1px solid #d9d9d9;
-    line-height: 58rpx;
-    font-size: 29rpx;
-    color: #333;
-}
-.cart-bottom{
-    position: fixed;
-    bottom:0;
-    left:0;
-    height: 100rpx;
-    width: 100%;
-    background: #fff;
-    display: flex;
-}
-.cart-bottom .checkbox{
-    height: 34rpx;
-    padding-left: 60rpx;
-    line-height: 34rpx;
-    margin: 33rpx 18rpx 33rpx 26rpx;
-    background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-0e09baa37e.png) no-repeat;
-    background-size: 34rpx;
-    font-size: 29rpx;
-}
-.cart-bottom .checkbox.checked{
-    background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/checkbox-checked-822e54472a.png) no-repeat;
-    background-size: 34rpx;
-}
-.cart-bottom .total{
-    height: 34rpx;
-    flex: 1;
-    margin: 33rpx 10rpx;
-    font-size: 29rpx;
-}
-.cart-bottom .delete{
-    height: 34rpx;
-    width: auto;
-    margin: 33rpx 18rpx;
-    font-size: 29rpx;
-}
-.cart-bottom .checkout{
-    height: 100rpx;
-    width: 210rpx;
-    text-align: center;
-    line-height: 100rpx;
-    font-size: 29rpx;
-    background: #b4282d;
-    color: #fff;
-}
\ No newline at end of file
--- a/litemall-wx/pages/catalog/catalog.wxss
+++ b/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 {

--- a/litemall-wx/pages/category/category.wxss
+++ b/litemall-wx/pages/category/category.wxss
@@ -34,8 +34,8 @@
 }
 .cate-nav .item.active .name{
-    color: #ab2b2b;
+    color: #AB956D;
-    border-bottom: 2px solid #ab2b2b;
+    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
--- a/litemall-wx/pages/goods/goods.js
+++ b/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() {

--- a/litemall-wx/pages/goods/goods.wxml
+++ b/litemall-wx/pages/goods/goods.wxml
 <view class="container">
- <swiper class="goodsimgs" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
+  <swiper class="goodsimgs" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
-  <swiper-item wx:for="{{goods.gallery}}" wx:key="*this">
+    <swiper-item wx:for="{{goods.gallery}}" wx:key="*this">
-   <image src="{{item}}" background-size="cover"></image>
+      <image src="{{item}}" background-size="cover"></image>
-  </swiper-item>
+    </swiper-item>
- </swiper>
+  </swiper>
- <!-- 分享 -->
+  <!-- 分享 -->
- <view class="service-policy" wx:if="{{!isGroupon}}">
+  <view class='goods_name'>
-  <button class="savesharebtn" bindtap="saveShare">分享朋友圈</button>
+    <view class='goods_name_left'>{{goods.name}}</view>
-  <button class="sharebtn" open-type="share">分享给朋友</button>
+    <view class="goods_name_right" bindtap="shareFriendOrCircle">分享</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>
-    <view class="retailPrice">现价：￥{{checkedSpecPrice}}</view>
-   </view>
-   <view class="brand" wx:if="{{brand.name}}">
-    <navigator url="../brandDetail/brandDetail?id={{brand.id}}">
-     <text>{{brand.name}}</text>
-    </navigator>
-   </view>
  </view>
- </view>
+  <view class="share-pop-box" hidden="{{!openShare}}">
- <view class="section-nav section-attr" bindtap="switchAttrPop">
+    <view class="share-pop">
-  <view class="t">{{checkedSpecText}}</view>
+      <view class="close" bindtap="closeShare">
-  <image class="i" src="/static/images/address_right.png" background-size="cover"></image>
+        <image class="icon" src="/static/images/icon_close.png"></image>
- </view>
+      </view>
- <view class="comments" wx:if="{{comment.count > 0}}">
+      <view class='share-info'>
-  <view class="h">
+        <button class="sharebtn" open-type="share" wx:if="{{!isGroupon}}">
-   <navigator url="/pages/comment/comment?valueId={{goods.id}}&type=0">
+          <image class='sharebtn_image' src='/static/images/wechat.png'></image>
-    <text class="t">评价({{comment.count > 999 ? '999+' : comment.count}})</text>
+          <view class='sharebtn_text'>分享给好友</view>
-    <text class="i">查看全部</text>
+        </button>
-   </navigator>
+        <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="b">
-   <view class="item" wx:for="{{comment.data}}" wx:key="id">
+  <view class="goods-info">
-    <view class="info">
+    <view class="c">
-     <view class="user">
+      <text class="desc">{{goods.goodsBrief}}</text>
-      <image src="{{item.avatar}}"></image>
+      <view class="price">
-      <text>{{item.nickname}}</text>
+        <view class="counterPrice">原价：￥{{goods.counterPrice}}</view>
-     </view>
+        <view class="retailPrice">现价：￥{{checkedSpecPrice}}</view>
-     <view class="time">{{item.addTime}}</view>
+      </view>
+      <view class="brand" wx:if="{{brand.name}}">
+        <navigator url="../brandDetail/brandDetail?id={{brand.id}}">
+          <text>{{brand.name}}</text>
+        </navigator>
+      </view>
    </view>
-    <view class="content">
+  </view>
-     {{item.content}}
+  <view class="section-nav section-attr" bindtap="switchAttrPop">
+    <view class="t">{{checkedSpecText}}</view>
+    <image class="i" src="/static/images/address_right.png" background-size="cover"></image>
+  </view>
+  <view class="comments" wx:if="{{comment.count > 0}}">
+    <view class="h">
+      <navigator url="/pages/comment/comment?valueId={{goods.id}}&type=0">
+        <text class="t">评价({{comment.count > 999 ? '999+' : comment.count}})</text>
+        <text class="i">查看全部</text>
+      </navigator>
    </view>
-    <view class="imgs" wx:if="{{item.picList.length > 0}}">
+    <view class="b">
-     <image class="img" wx:for="{{item.picList}}" wx:key="*this" wx:for-item="iitem" src="{{iitem}} "></image>
+      <view class="item" wx:for="{{comment.data}}" wx:key="id">
+        <view class="info">
+          <view class="user">
+            <image src="{{item.avatar}}"></image>
+            <text>{{item.nickname}}</text>
+          </view>
+          <view class="time">{{item.addTime}}</view>
+        </view>
+        <view class="content">
+          {{item.content}}
+        </view>
+        <view class="imgs" wx:if="{{item.picList.length > 0}}">
+          <image class="img" wx:for="{{item.picList}}" wx:key="*this" wx:for-item="iitem" src="{{iitem}} "></image>
+        </view>
+      </view>
    </view>
-   </view>
  </view>
- </view>
+  <view class="goods-attr">
- <view class="goods-attr">
+    <view class="t">商品参数</view>
-  <view class="t">商品参数</view>
+    <view class="l">
-  <view class="l">
+      <view class="item" wx:for="{{attribute}}" wx:key="name">
-   <view class="item" wx:for="{{attribute}}" wx:key="name">
+        <text class="left">{{item.attribute}}</text>
-    <text class="left">{{item.attribute}}</text>
+        <text class="right">{{item.value}}</text>
-    <text class="right">{{item.value}}</text>
+      </view>
-   </view>
+    </view>
  </view>
- </view>
- <view class="detail">
-  <import src="/lib/wxParse/wxParse.wxml" />
-  <template is="wxParse" data="{{wxParseData:goodsDetail.nodes}}" />
- </view>
- <view class="common-problem">
+  <view class="detail">
-  <view class="h">
+    <import src="/lib/wxParse/wxParse.wxml" />
-   <view class="line"></view>
+    <template is="wxParse" data="{{wxParseData:goodsDetail.nodes}}" />
-   <text class="title">常见问题</text>
  </view>
-  <view class="b">
-   <view class="item" wx:for="{{issueList}}" wx:key="id">
+  <view class="common-problem">
-    <view class="question-box">
+    <view class="h">
-     <text class="spot"></text>
+      <view class="line"></view>
-     <text class="question">{{item.question}}</text>
+      <text class="title">常见问题</text>
    </view>
-    <view class="answer">
+    <view class="b">
-     {{item.answer}}
+      <view class="item" wx:for="{{issueList}}" wx:key="id">
+        <view class="question-box">
+          <text class="spot"></text>
+          <text class="question">{{item.question}}</text>
+        </view>
+        <view class="answer">
+          {{item.answer}}
+        </view>
+      </view>
    </view>
-   </view>
  </view>
- </view>
- <!-- 大家都在看 -->
+  <!-- 大家都在看 -->
- <view class="related-goods" wx:if="{{relatedGoods.length > 0}}">
+  <view class="related-goods" wx:if="{{relatedGoods.length > 0}}">
-  <view class="h">
+    <view class="h">
-   <view class="line"></view>
+      <view class="line"></view>
-   <text class="title">大家都在看</text>
+      <text class="title">大家都在看</text>
-  </view>
+    </view>
-  <view class="b">
+    <view class="b">
-   <view class="item" wx:for="{{relatedGoods}}" wx:key="id">
+      <view class="item" wx:for="{{relatedGoods}}" wx:key="id">
-    <navigator url="/pages/goods/goods?id={{item.id}}">
+        <navigator url="/pages/goods/goods?id={{item.id}}">
-     <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
+          <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
-     <text class="name">{{item.name}}</text>
+          <text class="name">{{item.name}}</text>
-     <text class="price">￥{{item.retailPrice}}</text>
+          <text class="price">￥{{item.retailPrice}}</text>
-    </navigator>
+        </navigator>
-   </view>
+      </view>
+    </view>
  </view>
- </view>
 </view>
 <!-- 规格选择界面 -->
 <view class="attr-pop-box" hidden="{{!openAttr}}">
- <view class="attr-pop">
+  <view class="attr-pop">
-  <view class="close" bindtap="closeAttr">
+    <view class="close" bindtap="closeAttr">
-   <image class="icon" src="/static/images/icon_close.png"></image>
+      <image class="icon" src="/static/images/icon_close.png"></image>
-  </view>
-  <view class="img-info">
-   <image class="img" src="{{goods.picUrl}}"></image>
-   <view class="info">
-    <view class="c">
-     <view class="p">价格：￥{{checkedSpecPrice}}</view>
-     <view class="a">{{tmpSpecText}}</view>
    </view>
-   </view>
+    <view class="img-info">
-  </view>
+      <image class="img" src="{{goods.picUrl}}"></image>
+      <view class="info">
-  <!-- 规格列表 -->
+        <view class="c">
-  <view class="spec-con">
+          <view class="p">价格：￥{{checkedSpecPrice}}</view>
-   <view class="spec-item" wx:for="{{specificationList}}" wx:key="name">
+          <view class="a">{{tmpSpecText}}</view>
-    <view class="name">{{item.name}}</view>
+        </view>
-    <view class="values">
+      </view>
-     <view class="value {{vitem.checked ? 'selected' : ''}}" bindtap="clickSkuValue" wx:for="{{item.valueList}}" wx:for-item="vitem" wx:key="{{vitem.id}}" data-value-id="{{vitem.id}}" data-name="{{vitem.specification}}">{{vitem.value}}</view>
    </view>
-   </view>
-   <view class="spec-con" wx:if="{{groupon.length > 0}}">
+    <!-- 规格列表 -->
-    <view class="spec-item">
+    <view class="spec-con">
-     <view class="name">团购立减</view>
+      <view class="spec-item" wx:for="{{specificationList}}" wx:key="name">
-     <view class="values">
+        <view class="name">{{item.name}}</view>
-      <view class="value {{vitem.checked ? 'selected' : ''}}" bindtap="clickGroupon" wx:for="{{groupon}}" wx:for-item="vitem" wx:key="{{vitem.id}}" data-value-id="{{vitem.id}}" data-name="{{vitem.specification}}">￥{{vitem.discount}} ({{vitem.discountMember}}人)</view>
+        <view class="values">
-     </view>
+          <view class="value {{vitem.checked ? 'selected' : ''}}" bindtap="clickSkuValue" wx:for="{{item.valueList}}" wx:for-item="vitem" wx:key="{{vitem.id}}" data-value-id="{{vitem.id}}" data-name="{{vitem.specification}}">{{vitem.value}}</view>
-    </view>
+        </view>
-   </view>
+      </view>
-   <!-- 数量 -->
+      <view class="spec-con" wx:if="{{groupon.length > 0}}">
-   <view class="number-item">
+        <view class="spec-item">
-    <view class="name">数量</view>
+          <view class="name">团购立减</view>
-    <view class="selnum">
+          <view class="values">
-     <view class="cut" bindtap="cutNumber">-</view>
+            <view class="value {{vitem.checked ? 'selected' : ''}}" bindtap="clickGroupon" wx:for="{{groupon}}" wx:for-item="vitem" wx:key="{{vitem.id}}" data-value-id="{{vitem.id}}" data-name="{{vitem.specification}}">￥{{vitem.discount}} ({{vitem.discountMember}}人)</view>
-     <input value="{{number}}" class="number" disabled="true" type="number" />
+          </view>
-     <view class="add" bindtap="addNumber">+</view>
+        </view>
-    </view>
+      </view>
-   </view>
+      <!-- 数量 -->
+      <view class="number-item">
+        <view class="name">数量</view>
+        <view class="selnum">
+          <view class="cut" bindtap="cutNumber">-</view>
+          <input value="{{number}}" class="number" disabled="true" type="number" />
+          <view class="add" bindtap="addNumber">+</view>
+        </view>
+      </view>
+    </view>
  </view>
- </view>
 </view>
 <!-- 联系客服 -->
 <view class="contact">
- <contact-button style="opacity:0;position:absolute;" type="default-dark" session-from="weapp" size="27">
+  <contact-button style="opacity:0;position:absolute;" type="default-dark" session-from="weapp" size="27">
- </contact-button>
+  </contact-button>
 </view>
 <!-- 底部按钮 -->
 <view class="bottom-btn">
- <view class="l l-collect" bindtap="addCollectOrNot" wx:if="{{!isGroupon}}">
+  <view class="l l-collect" bindtap="addCollectOrNot" wx:if="{{!isGroupon}}">
-  <image class="icon" src="{{ collectImage }}"></image>
+    <image class="icon" src="{{ collectImage }}"></image>
- </view>
+  </view>
- <view class="l l-cart" wx:if="{{!isGroupon}}">
+  <view class="l l-cart" wx:if="{{!isGroupon}}">
-  <view class="box">
+    <view class="box">
-   <text class="cart-count">{{cartGoodsCount}}</text>
+      <text class="cart-count">{{cartGoodsCount}}</text>
-   <image bindtap="openCartPage" class="icon" src="/static/images/ic_menu_shoping_nor.png"></image>
+      <image bindtap="openCartPage" class="icon" src="/static/images/ic_menu_shoping_nor.png"></image>
+    </view>
  </view>
- </view>
+  <view class="r" bindtap="addToCart" wx:if="{{!soldout}}" wx:if="{{!isGroupon}}">加入购物车</view>
- <view class="r" bindtap="addToCart" wx:if="{{!soldout}}" wx:if="{{!isGroupon}}">加入购物车</view>
+  <view class="c" bindtap="addFast" wx:if="{{!soldout}}">{{isGroupon?'参加团购':'立即购买'}}</view>
- <view class="c" bindtap="addFast" wx:if="{{!soldout}}">{{isGroupon?'参加团购':'立即购买'}}</view>
+  <view class="n" wx:if="{{soldout}}">商品已售空</view>
- <view class="n" wx:if="{{soldout}}">商品已售空</view>
 </view>
\ No newline at end of file
--- a/litemall-wx/pages/goods/goods.wxss
+++ b/litemall-wx/pages/goods/goods.wxss
@@ -12,6 +12,30 @@
  height: 750rpx;
 }
+.commodity_screen {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.2;
+  overflow: hidden;
+  z-index: 1000;
+  color: #fff;
+}
+.commodity_attr_box {
+  width: 100%;
+  overflow: hidden;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  z-index: 2000;
+  background: #fff;
+  padding-top: 20rpx;
+}
 /* .service-policy {
  width: 750rpx;
  height: 73rpx;
@@ -52,14 +76,47 @@
 .goods-info .c text {
  display: block;
  width: 687.5rpx;
-  text-align: center;
+  text-align: left;
+}
+.goods_name {
+  /* border: 1px solid black; */
+  height: 86rpx;
+  line-height: 86rpx;
+  border-bottom: 1px solid #fafafa;
+}
+.goods_name_left {
+  /* border: 1px solid #757575; */
+  float: left;
+  height: 86rpx;
+  font-weight: 550;
+  line-height: 86rpx;
+  margin-left: 35rpx;
+  font-size: 38rpx;
+  letter-spacing: 1rpx;
 }
-.goods-info .name {
+.goods_name_right {
-  height: 41rpx;
+  float: right;
-  margin-bottom: 5.208rpx;
+  font-weight: 550;
-  font-size: 41rpx;
+  margin-top: 28rpx;
-  line-height: 41rpx;
+  width: 140rpx;
+  height: 80rpx;
+  line-height: 82rpx;
+  padding: 0;
+  margin: 0;
+  margin-right: 0rpx;
+  text-align: center;
+  font-size: 25rpx;
+  color: #f4f4f4;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 0rpx;
+  border-bottom-right-radius: 0rpx;
+  letter-spacing: 3rpx;
+  /* background-image: linear-gradient(to right, #ff7701 100%); */
+  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
 }
 .goods-info .desc {
@@ -71,29 +128,28 @@
 }
 .goods-info .price {
- height: 70rpx;
+  height: 70rpx;
- align-content: center;
+  align-content: center;
 }
 .goods-info .counterPrice {
- float: left;
+  float: left;
- padding-left: 120rpx;
+  padding-left: 0rpx;
- text-decoration: line-through;
+  text-decoration: line-through;
- font-size: 30rpx;
+  font-size: 30rpx;
- color: #999;
+  color: #999;
 }
 .goods-info .retailPrice {
- /* float: right; */
+  padding-left: 5%;
- padding-left: 60rpx;
+  font-size: 30rpx;
- font-size: 30rpx;
+  color: #a78845;
- color: #a78845;
 }
 .goods-info .brand {
  margin-top: 23rpx;
  min-height: 40rpx;
-  text-align: center;
+  text-align: left;
 }
 .goods-info .brand text {
@@ -431,7 +487,7 @@
  width: 750rpx;
  height: auto;
  overflow: hidden;
- padding-bottom: 80rpx;
+  padding-bottom: 80rpx;
 }
 .related-goods .h {
@@ -601,7 +657,7 @@
 .bottom-btn .c {
  float: left;
-  background: #f48f18;
+  background: #b4282d;
  height: 100rpx;
  line-height: 96rpx;
  flex: 1;
@@ -611,8 +667,8 @@
 }
 .bottom-btn .r {
-  border: 1px solid #b4282d;
+  border: 1px solid #f48f18;
-  background: #b4282d;
+  background: #f48f18;
  float: left;
  height: 100rpx;
  line-height: 96rpx;
@@ -767,74 +823,126 @@
  line-height: 65rpx;
 }
 .contact {
  height: 100rpx;
  width: 100rpx;
-  background-color: #008000;
  border-radius: 100%;
  position: fixed;
-  bottom: 150rpx;
+  bottom: 96rpx;
-  right: 20rpx;
+  right: 10rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 9;
-  flex-direction: column;
-  /*line-height: 100rpx;
-  text-align: center;
-  padding-top: 26rpx;*/
  font-size: 20rpx;
-  color: #008000;
  box-sizing: border-box;
  background: url("https://litemall.oss-cn-shenzhen.aliyuncs.com/kefu.png") no-repeat center 21rpx;
  background-size: 55rpx auto;
 }
-.contact .name {
+.share-pop-box {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 8;
+  bottom: 0;
+  /* display: none; */
+}
+.share-pop {
+  width: 100%;
+  height: auto;
+  max-height: 780rpx;
+  padding: 31.25rpx;
+  background: #fff;
+  position: fixed;
+  z-index: 9;
+  bottom: 100rpx;
+}
+.share-pop .close {
+  position: absolute;
+  width: 48rpx;
+  height: 48rpx;
+  right: 31.25rpx;
+  top: 31.25rpx;
+}
+.share-pop .close .icon {
+  width: 48rpx;
+  height: 48rpx;
+}
+.share-pop .share-info {
+  width: 100%;
+  height: 225rpx;
+  overflow: hidden;
+  margin-bottom: 41.5rpx;
+}
+.sharebtn {
+  top: 75rpx;
+  background: none !important;
  font-size: 32rpx;
-  max-width: 80rpx;
+  color: #fff !important;
-  color: #fff;
+  border-radius: 0%;
+  width: 175rpx;
+  height: 150rpx;
  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  float: left;
+  background: #fff;
+  border-bottom: 0px solid #fafafa;
+  margin-left: 15%;
 }
-.service-policy {
+.sharebtn::after {
- width: 100%;
+  border: none;
- height: 96rpx;
+  border-radius: 0%;
- /* background: #d3b676; */
- border: 2px solid #fff;
- /* align-items: center; */
 }
-.service-policy .sharebtn {
+.savesharebtn {
- width: 49.5%;
+  top: 75rpx;
- float: right;
+  background: none !important;
- border: none;
+  font-size: 32rpx;
- height: 80rpx;
+  color: #fff !important;
- font-size: 32rpx;
+  border-radius: 0%;
- background: #d3b676;
+  width: 175rpx;
- text-align: center;
+  height: 150rpx;
- color: #fff;
+  text-align: center;
- border-radius:0%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  float: right;
+  background: #fff;
+  border-bottom: 0px solid #fafafa;
+  margin-right: 15%;
 }
-.service-policy .sharebtn::after {
+.savesharebtn::after {
- border: none;
+  border: none;
- border-radius:0%;
+  border-radius: 0%;
 }
-.service-policy .savesharebtn {
+.sharebtn_image {
- width: 49.5%;
+  /* border: 1px solid #757575; */
- float: left;
+  width: 128rpx;
- border: none;
+  height: 128rpx;
- height: 80rpx;
+  margin-top: 0rpx;
- font-size: 32rpx;
- background: #d3b676;
- text-align: center;
- color: #fff;
- border-radius:0%;
 }
+.sharebtn_text {
-.service-policy .savesharebtn::after {
+  /* border: 1px solid #757575; */
- border: none;
+  width: 150rpx;
- border-radius:0%;
+  margin-bottom: 2rpx;
+  height: 20rpx;
+  line-height: 20rpx;
+  font-size: 20rpx;
+  color: #555;
+}
+.separate {
+  background: #e0e3da;
+  width: 100%;
+  height: 6rpx;
 }
\ No newline at end of file
--- a/litemall-wx/pages/index/index.wxss
+++ b/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;
+  /* justify-content: center; */
-  width: 750rpx;
-  flex-flow: row nowrap;
  align-items: center;
-  justify-content: space-between;
+  flex-wrap: wrap;
-  background-color: #fff;
+  padding-bottom: 0rpx;
+  padding-top: 25rpx
 }
 .m-menu .item {
-  flex: 1;
+  /* border: 1px solid black; */
-  display: block;
+  width: 150rpx;
-  padding: 20rpx 0;
+  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{

--- a/litemall-wx/pages/ucenter/feedback/feedback.js
+++ b/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
--- a/litemall-wx/pages/ucenter/feedback/feedback.json
+++ b/litemall-wx/pages/ucenter/feedback/feedback.json
+{
+}
\ No newline at end of file
--- a/litemall-wx/pages/ucenter/feedback/feedback.wxml
+++ b/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
--- a/litemall-wx/pages/ucenter/feedback/feedback.wxss
+++ b/litemall-wx/pages/ucenter/feedback/feedback.wxss
+page{
+    background: #f4f4f4;
+    min-height: 100%;
+}
+.container{
+    background: #f4f4f4;
+    min-height: 100%;
+    padding-top: 30rpx;
+}
+.fb-type{
+  height: 104rpx;
+  width: 100%;
+  background: #fff;
+  margin-bottom: 20rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+}
+.fb-type .type-label{
+  height: 36rpx;
+  flex: 1;
+  color: #333;
+  font-size: 28rpx;
+}
+.fb-type .type-icon{
+  height: 36rpx;
+  width: 36rpx;
+}
+.fb-body{
+  width: 100%;
+  background: #fff;
+  height: 374rpx;
+  padding: 18rpx 30rpx 64rpx 30rpx;
+}
+.fb-body .content{
+  width: 100%;
+  height: 100%;
+  color: #333;
+  line-height: 40rpx;
+  font-size: 28rpx;
+}
+.fb-body .text-count{
+  padding-top: 17rpx;
+  line-height: 30rpx;
+  float: right;
+  color: #666;
+  font-size: 24rpx;
+}
+.fb-mobile{
+  height: 162rpx;
+  width: 100%;
+}
+.fb-mobile .label{
+  height: 58rpx;
+  width: 100%;
+  padding-top: 14rpx;
+  padding-bottom: 11rpx;
+  color: #7f7f7f;
+  font-size: 24rpx;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  line-height: 33rpx;
+}
+.fb-mobile .mobile-box{
+  height: 104rpx;
+  width: 100%;
+  color: #333;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  font-size: 24rpx;
+  background: #fff;
+  position: relative;
+}
+.fb-mobile .mobile{
+  position: absolute;
+  top: 27rpx;
+  left: 30rpx;
+  height: 50rpx;
+  width: 100%;
+  color: #333;
+  line-height: 50rpx;
+  font-size: 24rpx;
+}
+.clear-icon{
+  position: absolute;
+  top: 43rpx;
+  right: 30rpx;
+  width: 48rpx;
+  height: 48rpx;
+}
+.fb-btn{
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 80%;
+  height: 90rpx;
+  line-height: 98rpx;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  border-radius: 0;
+  padding: 0;
+  margin: 0;
+  margin-left: 10%; 
+  text-align: center;
+  /* padding-left: -5rpx; */
+  font-size: 25rpx;
+  color: #f4f4f4;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-top-right-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  letter-spacing: 3rpx;
+  background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
+}
\ No newline at end of file
--- a/litemall-wx/pages/ucenter/index/index.js
+++ b/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({

--- a/litemall-wx/pages/ucenter/index/index.wxml
+++ b/litemall-wx/pages/ucenter/index/index.wxml
@@ -6,78 +6,90 @@
    </view>
  </view>
-  <view class="user-menu">
+    <view class='separate'></view>
-    <view class="item">
-      <view class="a" bindtap="goOrder">
+  <view class='user_area'>
-        <text class="icon order"></text>
+    <view class='user_row' bindtap='goOrder'>
-        <text class="txt">我的订单</text>
+      <view class='user_row_left'>我的订单</view>
-      </view>
+      <image class='user_row_right' src='/static/images/goright.png'></image>
    </view>
-    <view class="item">
+    <view class='user_column'>
-      <view class="a" bindtap="goCoupon">
+      <view class='user_column_item' bindtap='goOrderIndex' data-index='1' data-route='/pages/ucenter/order/order'>
-        <text class="icon coupon"></text>
+        <image class='user_column_item_image' src='/static/images/pendpay.png'></image>
-        <text class="txt">优惠券</text>
+        <view class='user_column_item_text'>待付款</view>
      </view>
-    </view>
+      <view class='user_column_item' bindtap='goOrderIndex' data-index='2' data-route='/pages/ucenter/order/order'>
-    <view class="item no-border" bindtap="goGroupon">
+        <image class='user_column_item_image' src='/static/images/send.png'></image>
-      <view class="a">
+        <view class='user_column_item_text'>待发货</view>
-        <text class="icon gift"></text>
-        <text class="txt">团购</text>
      </view>
-    </view>
+      <view class='user_column_item' bindtap='goOrderIndex' data-index='3' data-route='/pages/ucenter/order/order'>
-    <view class="item">
+        <image class='user_column_item_image' src='/static/images/receive.png'></image>
-      <view class="a" bindtap="goCollect">
+        <view class='user_column_item_text'>待收货</view>
-        <image class="user-menu .icon.collect" src="/static/images/icon_collect.png"></image>
-        <text class="txt">我的收藏</text>
      </view>
-    </view>
+      <view class='user_column_item' bindtap='goOrderIndex' data-index='4' data-route='/pages/ucenter/order/order'>
-    <view class="item">
+        <image class='user_column_item_image' src='/static/images/comment.png'></image>
-      <view class="a" bindtap="goFootprint">
+        <view class='user_column_item_text'>待评价</view>
-        <image class="user-menu .icon.collect" src="/static/images/foot.png"></image>
-        <text class="txt">我的足迹</text>
      </view>
    </view>
-    <!-- <view class="item no-border">
+  </view>
-      <view class="a">
-        <text class="icon kefu"></text>
+  <view class='separate'></view>
-        <text class="txt">会员福利</text>
-      </view>
+  <view class='user_row'>
-    </view> -->
+    <view class='user_row_left'>核心服务</view>
-    <view class="item">
+  </view>
-      <view class="a" bindtap="goAddress">
+  <view class='user_column'>
-        <text class="icon address"></text>
-        <text class="txt">地址管理</text>
+    <view class='user_column_item' bindtap='goCoupon' data-route='/pages/ucenter/order/order'>
-      </view>
+      <image class='user_column_item_image' src='/static/images/coupon.png'></image>
+      <view class='user_column_item_text'>优惠卷</view>
    </view>
-    <!-- <view class="item">
+    <view class='user_column_item' bindtap='goCollect' data-route='/pages/ucenter/order/order'>
-      <view class="a">
+      <image class='user_column_item_image' src='/static/images/icon_collect.png'></image>
-        <text class="icon security"></text>
+      <view class='user_column_item_text'>商品收藏</view>
-        <text class="txt">账号安全</text>
+    </view>
-      </view>
+    <view class='user_column_item' bindtap='goFootprint' data-route='/pages/ucenter/order/order'>
-    </view> -->
+      <image class='user_column_item_image' src='/static/images/footprint.png'></image>
-    <!-- 开发环境看不到效果，但是线上环境可以正常使用-->
+      <view class='user_column_item_text'>浏览足迹</view>
-    <!-- 开发者参考以下文档自行测试，建议直接采用文档中的网页版客服工具 -->
+    </view>
-    <!-- https://developers.weixin.qq.com/miniprogram/introduction/custom.html#功能介绍 -->
+    <view class='user_column_item' bindtap='goGroupon' data-route='/pages/ucenter/order/order'>
-    <button class="item" open-type="contact" size="20" session-from="weapp">
+      <image class='user_column_item_image' src='/static/images/group.png'></image>
-      <view class="a">
+      <view class='user_column_item_text'>我的拼团</view>
-        <text class="icon kefu"></text>
+    </view>
-        <text class="txt">联系客服</text>
+    <view class='user_column_item' bindtap='goOrderIndex' data-route='/pages/ucenter/order/order'>
-      </view>
+      <image class='user_column_item_image' src='/static/images/aftersale.png'></image>
-    </button>
+      <view class='user_column_item_text'>退款/售后</view>
-    <button class="item" open-type="getPhoneNumber" bindgetphonenumber="bindPhoneNumber">
-      <view class="a">
-        <image class="user-menu .icon.phone" src="/static/images/mobile.png"></image>
-        <text class="txt">绑定手机号码</text>
-      </view>
-    </button>
-    <view class="item">
-      <view class="a" bindtap="aboutUs">
-        <image class="user-menu .icon.collect" src="/static/images/about_us.png"></image>
-        <text class="txt">关于我们</text>
-      </view>
    </view>
  </view>
+  <view class='separate'></view>
+  <view class='user_row'>
+    <view class='user_row_left'>必备工具</view>
+  </view>
+  <view class='user_tool_area'>
+    <view class='user_tool_item' bindtap='goAddress'>
+      <image class='user_tool_item_image' src='/static/images/address.png'></image>
+      <view class='user_tool_item_text'>地址管理</view>
+    </view>
+    <button class="user_tool_item_phone" open-type="getPhoneNumber" bindgetphonenumber="bindPhoneNumber">
+      <image class='user_tool_item_image' src='/static/images/mobile.png'></image>
+      <view class='user_tool_item_text'>绑定手机</view>
+    </button>
+    <view class='user_tool_item' bindtap='goFeedback'>
+      <image class='user_tool_item_image' src='/static/images/feedback.png'></image>
+      <view class='user_tool_item_text'>意见反馈</view>
+    </view>
+    <view class='user_tool_item'>
+      <contact-button style="opacity:0;position:absolute;" type="default-dark" session-from="weapp" size="27">
+      </contact-button>
+      <image class='user_tool_item_image' src='/static/images/customer.png'></image>
+      <view class='user_tool_item_text'>联系客服</view>
+    </view>
+    <view class='user_tool_item' bindtap='aboutUs'>
+      <image class='user_tool_item_image' src='/static/images/about_us.png'></image>
+      <view class='user_tool_item_text'>关于我们</view>
+    </view>
+  </view>
  <!--<view class="logout" bindtap="exitLogin">退出登录</view>-->
 </view>
\ No newline at end of file
--- a/litemall-wx/pages/ucenter/index/index.wxss
+++ b/litemall-wx/pages/ucenter/index/index.wxss
@@ -12,14 +12,12 @@ page {
 }
 .profile-info {
-  width: 100%;
+  background-color: #ab956d;
-  height: 280rpx;
+  color: #fff;
  display: flex;
-  flex-wrap: wrap;
  align-items: center;
-  justify-content: flex-start;
+  padding: 30rpx;
-  padding: 0 30.25rpx;
+  font-size: 28rpx;
-  background: #333;
 }
 .profile-info .avatar {
@@ -52,126 +50,147 @@ page {
  font-size: 30rpx;
 }
-.user-menu {
+.user_area {
+  /* border: 1px solid black; */
  width: 100%;
-  height: auto;
+  height: 226rpx;
-  overflow: hidden;
+  /* margin: 0 auto; */
+  margin-top: -8rpx;
  background: #fff;
+  /* border-top: 1px solid #f4f4f4; */
 }
-.user-menu .item {
+.user_row {
-  float: left;
+  /* border: 1px solid black; */
-  width: 33.33333%;
+  height: 86rpx;
-  height: 187.5rpx;
+  line-height: 86rpx;
-  border-right: 1px solid rgba(0, 0, 0, 0.15);
+  border-bottom: 1px solid #fafafa;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.15);
-  text-align: center;
 }
-.user-menu .item .a {
+.user_row_left {
+  /* border: 1px solid #757575; */
+  float: left;
+  height: 86rpx;
+  font-weight: 550;
+  line-height: 86rpx;
+  margin-left: 35rpx;
+  font-size: 26rpx;
+  letter-spacing: 1rpx;
+}
+.user_row_right {
+  /* border: 1px solid #757575; */
+  float: right;
+  height: 40rpx;
+  width: 40rpx;
+  font-weight: 550;
+  line-height: 86rpx;
+  margin-top: 28rpx;
+  margin-right: 30rpx;
+}
+.user_column {
+  /* border: 1px solid black; */
+  height: 140rpx;
  display: flex;
-  width: 100%;
-  height: 100%;
-  flex-direction: column;
-  align-items: center;
  justify-content: center;
+  align-items: center;
 }
-.user-menu .item.no-border {
+.user_column_item {
-  border-right: 0;
+  width: 30%;
-}
+  height: 140rpx;
+  /* background: #757575; */
-.user-menu .item.item-bottom {
+  text-align: center;
-  border-bottom: none;
-}
-.user-menu .icon {
-  margin: 0 auto;
-  display: block;
-  height: 52.803rpx;
-  width: 52.803rpx;
-  margin-bottom: 16rpx;
-}
-.user-menu .icon.order {
-  background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -437.5rpx no-repeat;
-  background-size: 52.803rpx;
-}
-.user-menu .icon.coupon {
-  background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -62.4997rpx no-repeat;
-  background-size: 52.803rpx;
 }
-.user-menu .icon.phone {
+.user_column_item_image {
-  display: block;
+  width: 50rpx;
-  height: 55rpx;
+  height: 50rpx;
-  width: 55rpx;
+  margin-top: 30rpx;
-  background-size: 52.803rpx;
 }
-.user-menu .icon.gift {
+.user_column_item_text {
-  background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -187.5rpx no-repeat;
+  /* border: 1px solid black; */
-  background-size: 52.803rpx;
+  margin-top: 5rpx;
+  font-size: 24rpx;
+  color: #555;
 }
-.user-menu .icon.address {
+.separate {
-  background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 0 no-repeat;
+  background: #e0e3da;
-  background-size: 52.803rpx;
+  width: 100%;
+  height: 6rpx;
 }
-.user-menu .icon.security {
+.box_bottom_area {
-  background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -500rpx no-repeat;
+  /* border: 1px solid black; *//* margin-top: 32rpx; */
-  background-size: 52.803rpx;
+  height: auto;
+  background: #fff;
 }
-.user-menu .icon.kefu {
+.user_tool_item {
-  background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -312.5rpx no-repeat;
+  width: 187.5rpx;
-  background-size: 52.803rpx;
+  height: 142rpx;
+  /* border: 1px solid #757575; */
+  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  float: left;
+  background: #fff;
+  border-bottom: 1px solid #fafafa;
 }
-.user-menu .icon.help {
+.user_tool_item_image {
-  background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -250rpx no-repeat;
+  /* border: 1px solid #757575; */
-  background-size: 52.803rpx;
+  width: 50rpx;
-}
+  height: 50rpx;
-.user-menu .icon.about {
+  margin-top: 23rpx;
-  /* background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -62.4997rpx no-repeat; */
-  display: block;
-  height: 55rpx;
-  width: 55rpx;
-  background-size: 52.803rpx;
 }
-.user-menu .icon.feedback {
+.user_tool_item_text {
-  background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -125rpx no-repeat;
+  /* border: 1px solid #757575; */
-  background-size: 52.803rpx;
+  width: 187.5rpx;
+  margin-bottom: 12rpx;
+  height: 42rpx;
+  line-height: 42rpx;
+  font-size: 23rpx;
+  color: #555;
 }
-.user-menu .txt {
+.user_tool_item {
-  display: block;
+  width: 187.5rpx;
-  height: 24rpx;
+  height: 142rpx;
-  width: 100%;
+  /* border: 1px solid #757575; */
-  font-size: 24rpx;
+  text-align: center;
-  color: #333;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  float: left;
+  background: #fff;
+  border-bottom: 1px solid #fafafa;
 }
-.logout {
+.user_tool_item_phone {
-  margin-top: 50rpx;
+   background: none !important;
-  height: 101rpx;
+  font-size: 32rpx;
-  width: 100%;
+  color: #fff !important;
-  line-height: 101rpx;
+  border-radius: 0%;
+    width: 187.5rpx;
+  height: 142rpx;
+  /* border: 1px solid #757575; */
  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  float: left;
  background: #fff;
-  color: #333;
+  border-bottom: 0px solid #fafafa;
-  font-size: 30rpx;
 }
+.user_tool_item_phone::after{
-.about {
+  border: none;
-  width: 100%;
-  background: url(https://cdn.it120.cc/images/weappshop/arrow-right.png) no-repeat 750rpx center;
-  background-size: 16rpx auto, 750rpx auto;
-  margin: 20rpx 0;
-  height: 80rpx;
-  line-height: 80rpx;
-  padding-left: 100rpx;
 }
--- a/litemall-wx/static/images/address.png
+++ b/litemall-wx/static/images/address.png
--- a/litemall-wx/static/images/aftersale.png
+++ b/litemall-wx/static/images/aftersale.png
--- a/litemall-wx/static/images/cart.png
+++ b/litemall-wx/static/images/cart.png
--- a/litemall-wx/static/images/category.png
+++ b/litemall-wx/static/images/category.png
--- a/litemall-wx/static/images/category@selected.png
+++ b/litemall-wx/static/images/category@selected.png