Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

分享

See merge request !39

src/app.json

@@ -16,7 +16,8 @@
     "component/bottom/bottom",
     "pages/wantToBuyDetail/wantToBuyDetail",
     "component/buyImageSwiper/buyImageSwiper",
-    "pages/myShare/myShare"
+    "pages/myShare/myShare",
+    "pages/user-center/user-center"
   ],
   "subPackages": [
     {

src/pages/myShare/myShare.wxml

 
 <view class='page-want-buy'>
 	<view class="swiper-tab">
-		<view class="swiper-tab-item {{currentTab==0?'active':''}}" data-current="0" bindtap="clickTab">分享订单</view>
-		<view class="swiper-tab-item {{currentTab==1?'active':''}}" data-current="1" bindtap="clickTab">分享会员</view>
-		<view class="swiper-tab-item {{currentTab==2?'active':''}}" data-current="2" bindtap="clickTab">发现分享</view>
+		<view class="swiper-tab-item" data-current="0" bindtap="clickTab">
+    分享订单
+    <view class="line" wx-if="{{currentTab==0}}"></view>
+    </view>
+		<view class="swiper-tab-item" data-current="1" bindtap="clickTab">分享会员
+    <view class="line" wx-if="{{currentTab==1}}"></view>
+    </view>
+		<view class="swiper-tab-item" data-current="2" bindtap="clickTab">发现分享
+    <view class="line" wx-if="{{currentTab==2}}"></view>
+    </view>
 	</view>
 	<swiper current="{{currentTab}}" duration="300" bindchange="swiperTab">
 			<swiper-item>

src/pages/myShare/myShare.wxss

@@ -11,23 +11,31 @@ scroll-view{
 }
 .swiper-tab{
   width: 100%;
-  height: 46rpx;
-  line-height: 46rpx;
+  height: 60rpx;
   display: flex;
   background-color: #ffffff;
   color: #000000;
   position:fixed;
   z-index:1;
   justify-content: space-around;
+  padding-top: 32rpx;
 }
 .swiper-tab-item{
   text-align: center;
   font-size: 26rpx;
 }
 
-.active{
+/* .active{
   color: #C09A74;
   border-bottom: 5rpx solid #C09A74;
+} */
+.line{
+  width: 60rpx;
+  height: 5rpx;
+  margin: 0 auto;
+  background-color: #C09A74;
+  margin-top: 8rpx;
+  border-radius: 8rpx;
 }
 swiper {
   width: 100%;
@@ -36,7 +44,7 @@ swiper {
   /* padding-bottom:20rpx; */
   position: absolute;
   overflow: scroll;
-  top: 46rpx;
+  top: 60rpx;
 }
 
 

src/pages/user-center/user-center.js

+// pages/user-center/user-center.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

src/pages/user-center/user-center.json

+{
+  "usingComponents": {}
+}
\ No newline at end of file

src/pages/user-center/user-center.wxml

+<!--pages/user-center/user-center.wxml-->
+<text>pages/user-center/user-center.wxml</text>

src/pages/user-center/user-center.wxss

+/* pages/user-center/user-center.wxss */
\ No newline at end of file

src/pages/wantToBuyDetail/wantToBuyDetail.wxss

@@ -19,6 +19,8 @@ scroll-view{
   position:fixed;
   z-index:1;
   justify-content: center;
+  /* padding-top: 32rpx;
+  margin-bottom: 14rpx; */
 }
 .swiper-tab-item{
   text-align: center;