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

Feature zyw sc

See merge request !119

src/app.json

@@ -49,7 +49,8 @@
         "pages/fun/fun",
         "pages/categoryPro/categoryPro",
         "pages/plus/plus",
-        "pages/friendShareList/friendShareList"
+        "pages/friendShareList/friendShareList",
+        "pages/goToHome/goToHome"
       ]
     }
   ],

src/component/plus/plus.js

@@ -25,7 +25,8 @@ Component({
    * 组件的初始数据
    */
   data: {
-    currentTab:'999'
+    currentTab:'999',
+    currentPrice:0
   },
   /**
    * 组件的方法列表
@@ -84,9 +85,11 @@ Component({
       }, 200)
     },
     switchNav(e){
+      console.log(e)
       this.setData({
         currentTab: e.currentTarget.dataset.current,
-        id: e.currentTarget.dataset.id
+        id: e.currentTarget.dataset.id,
+        currentPrice: e.currentTarget.dataset.price
       })
     },
     payPlus() {

src/component/plus/plus.wxml

@@ -14,11 +14,13 @@
 			 data-endTimeStr="{{navItem.endTimeStr}}"
 			 data-btnText="{{navItem.buttonText}}"
 			 data-id="{{navItem.id}}"
+       data-price="{{navItem.price}}"
 			 bindtap="switchNav"
 			 style="{{currentTab == idx ? 'background-image: url('+ plusBgi.activeUrl +');' : 'background-image: url('+ plusBgi.inactiveUrl +');'}}"
 			>
 				<view class="plus-choose">
-					<text>每月仅￥{{navItem.price / navItem.duration * 30}}</text>
+          <text wx:if="{{navItem.duration == 365}}">每月仅￥{{navItem.price / 12}}</text>
+				  <text wx:else>每月仅￥{{navItem.price / navItem.duration * 30}}</text>
 				</view>
 				<view class="card-kinds">
 					{{navItem.name}}
@@ -35,6 +37,7 @@
 			</view>
 		</block>
 	</scroll-view>
+  <view class="pay-wrap">
     <view class="pay">
       <!--微信授权-->
       <block wx:if="{{!currentHasUserInfo}}">
@@ -46,15 +49,16 @@
         hover-class="btn-hover"
         >
           <text>立即支付</text>
-				<text>￥158</text>
+          <text>￥{{currentPrice}}</text>
         </button>
       </block>
       <block wx:else>
         <button class="btn btn-primary" bindtap="payPlus">
           <text>立即支付</text>
-				<text>￥158</text>
+          <text>￥{{currentPrice}}</text>
         </button>
       </block>
     </view>
+  </view>
 </view>
 

src/component/plus/plus.wxss

@@ -39,11 +39,10 @@
 .pay{
   height: 88rpx;
   line-height: 88rpx;
-  position: fixed;
-  bottom: 0;
-  right: 30rpx;
   display: flex;
   align-items: center;
+  flex-direction: row-reverse;
+  margin-right: 30rpx;
 }
 .pay button{
   width: 280rpx;
@@ -89,6 +88,14 @@
   line-height: 26rpx;
   text-align: center;
 }
+.pay-wrap{
+  width: 750rpx;
+  background-color: #ffffff;
+  height: 88rpx;
+  position: fixed;
+  bottom: 0;
+  right: 0;
+}
 
 
 

src/pages/userCenter/userCenter.wxss

 /* pages/userCenter.wxss */
 @import './../../base/base.wxss';
+page{
+  padding-bottom: 320rpx;
+}
 .user-center{
   box-sizing: border-box;
   padding-bottom: 200rpx;

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 13,
+			"current": 42,
 			"list": [
 				{
 					"id": -1,
@@ -313,6 +313,19 @@
 					"pathName": "pages/my_1/my",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "回到首页",
+					"pathName": "subPackage/page/pages/goToHome /goToHome",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "subPackage/page/pages/goToHome /goToHome",
+					"pathName": "subPackage/page/pages/goToHome/goToHome",
+					"scene": null
 				}
 			]
 		}

src/subPackage/page/pages/goToHome/goToHome.js

+// subPackage/page/pages/goToHome/goToHome.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/subPackage/page/pages/goToHome/goToHome.json

+{
+  "navigationBarTitleText": "回到首页",
+  "usingComponents": {}
+}
\ No newline at end of file

src/subPackage/page/pages/goToHome/goToHome.wxml

+<!--subPackage/page/pages/goToHome/goToHome.wxml-->
+	<!-- <view class="bottom-img" bindtap="handelGoHome">
+    <image class="img-top" mode="widthFix" src="/assets/imgs/7_1_0/go-top.png" bindtap="goTop"></image>
+  </view> -->
+  <view class="btn-wrap">
+    <view class="btn-home">
+      <button class="btn btn-primary">回到首页</button>
+    </view>
+  </view>

src/subPackage/page/pages/goToHome/goToHome.wxss

+/* subPackage/page/pages/goToHome/goToHome.wxss */
+.btn-wrap{
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.btn-home{
+  width: 200rpx;
+}
\ No newline at end of file

src/subPackage/page/pages/myInvite/myInvite.js

@@ -125,7 +125,7 @@ wxService.page({
 
   // 点击去分享页面
   gotoInviteShare(){
-    if (this.data.inviteMemberList && this.data.isGoToInvite){
+    if (this.data.isGoToInvite){
       wxService.router('/subPackage/page/pages/share/share')
     }
   },

src/subPackage/page/pages/myInvite/myInvite.wxml

@@ -13,7 +13,7 @@
   </view>
   <!-- <navigator url="/subPackage/page/pages/share/share" hover-class="none"> -->
     <view class="invite-banner" bindtap="gotoInviteShare">
-      <image src="{{inviteMemberList && isGoToInvite ?  inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}"></image>
+      <image src="{{isGoToInvite ?  inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}"></image>
     </view>
   <!-- </navigator> -->
   <view class="order-benefit-wrap">
@@ -49,6 +49,9 @@
         </view>
       </view> -->
     </view>
+    <view class="empty">
+      暂无邀请记录~
+    </view>
   </view>
   <view class="benefit-tips">
     <text>邀请好友只显示前50名</text>

src/subPackage/page/pages/myInvite/myInvite.wxss

@@ -96,3 +96,9 @@
   line-height: 35rpx;
   font-size: 18rpx;
 }
+.empty{
+  color: #808080;
+  text-align: center;
+  width: 100%;
+  margin-top: 200rpx;
+}
\ No newline at end of file

src/subPackage/page/pages/myRelease/myRelease.wxml

@@ -2,11 +2,11 @@
 <view class="release-num weui-flex df-j--bt">
 	<view class="num-invite df-1 border_box">
 		<view class="num">{{inviteSum}}</view>
-		<view class="desc">当前邀请人数</view>
+		<view class="desc">当前分享订单</view>
 	</view>
 	<view class="num-invite-yesterday df-1 border_box">
 		<view class="num">{{yesterdayInviteSum}}</view>
-		<view class="desc">昨天邀请新增</view>
+		<view class="desc">昨天新增分享订单</view>
 	</view>
 </view>
 <view class="diy-banner">