3 Commits be5ed9112f ... 5fa91ec04f

Author SHA1 Message Date
  liguorui 5fa91ec04f Merge remote-tracking branch 'origin/master' 6 years ago
  liguorui 2c8748155c 修改 6 years ago
  liguorui fadc54f0b4 hebing 6 years ago

+ 2 - 2
module/caritem/caritem.wxss

@@ -18,7 +18,7 @@
   background-position: center;
 }
 .caritem_info{
-  padding:15rpx 0rpx 15rpx 40rpx;
+  padding:15rpx 0rpx 15rpx 20rpx;
   align-items:center;
   display: flex;
   flex-direction:column;
@@ -47,7 +47,7 @@
 .caritem_store{
   height: 28rpx;
   margin-left:10rpx;
-  padding:0rpx 5rpx;
+  padding:0rpx 6rpx 0rpx 3rpx;
   max-width:114rpx;
   overflow: hidden;
   white-space: nowrap;

+ 2 - 2
module/search/search.wxss

@@ -47,7 +47,7 @@
   color: rgba(183, 183, 183, 1);
 }
 .cancel_search{
-  margin-left:60rpx;
+  margin-left:50rpx;
   top:13rpx;
   height: 52rpx;
   line-height: 52rpx;
@@ -74,7 +74,7 @@
   top:78rpx;
   left: 100%;
   width:100%;
-  padding-top: 30px;
+  padding-top: 20px;
   background:white;
   transition:all 0.5s;
 }

+ 5 - 9
pages/buy/buy.wxss

@@ -178,17 +178,13 @@
 	color: rgba(56, 55, 53, 1);
 	background-color: rgba(248, 248, 250, 1);
 	border:1px solid rgba(248, 248, 250, 1);
-	text-align: left;
-	position: relative;
-	text-indent: 90rpx;
+	text-align: center;
+	display: flex;
 }
 .more_detail_i image{
-	position: absolute;
-	height: 22rpx;
-	width: 22rpx;
-	margin-right: 10rpx;
-	top:30rpx;
-	left:58rpx;
+	height: 24rpx;
+	width: 24rpx;
+	margin-right: 2rpx;
 }
 .more_detail_active{
 	background: rgba(255, 230, 0, 0.1);

+ 1 - 1
pages/buy/more.wxml

@@ -138,7 +138,7 @@
           data-value="{{item.colour_id}}"
           bindtap="getMoreFilter"
         >
-          <image src="../../img/{{item.colour_id}}.png"/>
+          <image wx:if="{{item.colour_id!=15}}" src="../../img/{{item.colour_id}}.png"/>
           {{item.colour_name}}
         </view>
       </view>

+ 1 - 0
pages/cardetail/cardetail.js

@@ -45,6 +45,7 @@ Page(Object.assign({
       "常用功能":"comonuse",
       "启动检测":"startcheck"
     },
+    currentimg:1,
     openscheme:false,
     loanscale:[0.1,0.2,0.3,0.4,0.5,0.6],
     loantime:[12,24,36],

+ 0 - 1
pages/cardetail/cardetail.wxss

@@ -377,7 +377,6 @@
 }
 
 .cardetail_op_list_space{
-	background-color: white;
 	height: 120rpx;
 }
 .cardetail_op_list{

+ 5 - 0
pages/usercenter/usercenter.js

@@ -104,5 +104,10 @@ Page(Object.assign({
   loginback:function(){
     var number = wx.getStorageSync("mobile");
     this.getPhone(number);
+  },
+  logOut:function(){
+    wx.removeStorageSync("mobile");
+    wx.removeStorageSync("authorization");
+    this.openLog();
   }
 },logs))

+ 4 - 0
pages/usercenter/usercenter.wxml

@@ -40,6 +40,10 @@
 			<image class="usercenter_op_bt" src="../../img/right.png"/>
 		</navigator>
 	</view>
+	<view
+		bindtap="logOut"
+		class="usercenter_logout"
+	>退出登录</view>
 	<template 
       is="footer" 
       data="{{local:3,footerheight:footerheight}}"

+ 13 - 0
pages/usercenter/usercenter.wxss

@@ -62,4 +62,17 @@
 	margin-top:38rpx;
 	width: 22rpx;
 	height: 22rpx;
+}
+.usercenter_logout{
+	margin:140rpx auto 0rpx;
+	background: #EBEBEB;
+	border-radius: 6rpx;
+	height: 88rpx;
+	line-height: 88rpx;
+	font-family: PingFang-SC-Regular;
+	font-size: 30rpx;
+	color: #383735;
+	letter-spacing: 0;
+	text-align: center;
+	width: 620rpx;
 }