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

src/base/base.wxss

@@ -1313,7 +1313,7 @@ a {
   white-space: nowrap;
 }
 button {
-  background-color: none;
+  background-color: transparent;
   border-radius:0;
   padding: 0;
 }

src/component/bottomTabs/bottomTabs.wxml

@@ -13,26 +13,26 @@
 					 open-type='getUserInfo'
 					 class='btn btn-primary'
 					 hover-class="btn-hover"
-					 style="height: 100%;background-color: #eee;"
+					 style="height: 100%;"
 					>
 						<image class='tab-img' src="{{utils.formateUrl(currHomePageId == tab.redirectId ? tab.activeImageUrl: tab.imageUrl,baseImgUrl)}}" />
 					</button>
 				</view>
 				<view wx:else class="btn-tab" data-item="{{tab}}" bindtap="handelToPage">
-					<button class='btn btn-primary' style="height: 100%;background-color: #eee;">
+					<button class='btn btn-primary' style="height: 100%;">
 						<image class='tab-img' src="{{utils.formateUrl(currHomePageId == tab.redirectId ? tab.activeImageUrl: tab.imageUrl,baseImgUrl)}}" />
 					</button>
 				</view>
 			</view>
 			<view wx:else class="btn-tab" data-item="{{tab}}" bindtap="handelToPage">
-				<button class='btn btn-primary' style="height: 100%;background-color: #eee;">
+				<button class='btn btn-primary' style="height: 100%">
 					<image class='tab-img' src="{{utils.formateUrl(currHomePageId == tab.redirectId ? tab.activeImageUrl: tab.imageUrl,baseImgUrl)}}" />
 				</button>
 			</view>
 		</view>
 	</block>
 </view>
-<view class="bottom-tab fixed-bottom0" style="height: 108rpx;" wx:if="{{tabBar.num == 5}}">
+<view class="bottom-tab fixed-bottom0" wx:if="{{tabBar.num == 5}}">
 	<block wx:for="{{tabs}}" wx:key="{{index}}" wx:for-item="tab">
 		<view class="tab" data-item="{{tab}}" bindtap="handelToPage">
 			<button wx:if="{{currHomePageId == tab.redirectId}}">

src/component/goHome/goHome.wxml

 <!--component/goHome/goHome.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 class="bottom-img df" bindtap="handelGoHome">
+    <text>首页</text>
+    <!--<image class="img-top" mode="widthFix" src="/assets/imgs/7_1_0/go-top.png"></image>-->
   </view>
\ No newline at end of file

src/component/goHome/goHome.wxss

 /* component/goHome/goHome.wxss */
+@import './../../base/base.wxss';
+
 .bottom-img{
   position: fixed;
   bottom: 143rpx;
-  right: 30rpx;
+  right: 25rpx;
+  width: 82rpx;
+  height: 82rpx;
+  border-radius: 50%;
+  color: #fff;
+  font-size: 24rpx;
+  background-color: rgba(0, 0, 0, 0.2);
+	box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
 }
 .bottom-img .img-top {
-  width: 85rpx;
-  height: 85rpx;
+  width: 82rpx;
+  height: 82rpx;
 }
\ No newline at end of file

src/config/index.js

@@ -4,8 +4,7 @@ const needMock = '' //
 // appid_dev_wx   wxc3b64b09b1d3dfc2
 // appid_test_wx  wx857ea77f4f7f4f34
 // appid_pre_711  wx358b56af62edbde1
-// appid_prod_711  wx700028bf32a3be66  上传生产注意 首页配置接口！！！！！！！！！！！！！！！！！！！！！！
-
+// appid_prod_711  wx700028bf32a3be66 
 
 // 1 2 3 步!!!!!!!!!!!!!!!!!!!!!!  prod appid brandId
 

src/pages/memberOfOwn/memberOfOwn.js

@@ -11,7 +11,7 @@ wxService.page({
    * 页面的初始数据
    */
   data: {
-
+    endTime: '', // 2017-09-01
     date: '',
     focus: false,
     memberCardNo: '',
@@ -33,7 +33,6 @@ wxService.page({
       }
     ],
     index: 0,
-    date: '',
   },
   bindPickerChange(e) {
     this.setData({
@@ -45,29 +44,64 @@ wxService.page({
    */
   onLoad(options) {
     wx.hideShareMenu();
-    console.log('onload')
     const { memberCardNo, memberId } = wx.getStorageSync('_baseUserInfo')
     // if(memberCardNo){
 
     // }
   },
+  //微信支付
+  onTapWxPay() {
+    //调用接口回调拼接数据 TODO
+    this.getPayCodeParam();
+  },
+
+  //获取小程序支付码配置参数
+  getPayCodeParam() {
+    wxService.get(`/platform/brand/openOfflinePayView`).then(res => {
+      if (!res) return false;
+      const { result, data } = res && res.data || res && res.result
+      if (result == 0) {
+        wx.openOfflinePayView({
+          appId: data.appId,
+          nonceStr: data.nonceStr,
+          package: data.package,
+          signType: data.signType,
+          timeStamp: data.timeStamp,
+          paySign: data.paySign,
+          success: function (res) {
+            console.log('success', res)
+          },
+          fail: function (res) {
+            console.log('error', res)
+          },
+          complete: function (res) {
+            console.log('complete', res)
+          }
+        })
+        // this.setInternal();
+      }
+    })
+  },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow() {
-    console.log('onshow')
     // 取会员卡号
     const { memberCardNo, memberId } = wx.getStorageSync('_baseUserInfo')
     if (memberCardNo && memberId) {
+      // 获取当前日期
+      const currentDate = utils.formatDate(new Date())
+      this.setData({
+        endTime: currentDate
+      }, () => {
         this.setData({
           memberCardNo,
           memberId
         }, () => {
           // 获取会员信息
           this.getMemberFind()
-
-
+        })
       })
     }
   },

src/pages/memberOfOwn/memberOfOwn.json

 {
   "navigationBarTitleText": "我的会员",
-  "usingComponents": {
-    "go-home": "/component/goHome/goHome"
-  }
+  "usingComponents": {}
 }
\ No newline at end of file

src/pages/memberOfOwn/memberOfOwn.wxml

@@ -17,6 +17,7 @@
 		</view>
 		<view class='user-qr-code'>
 			<canvas canvas-id="barcode" binderror="canvasIdErrorCallback" />
+			<view class='wx-pay-code' bindtap="onTapWxPay">微信支付</view>
 		</view>
 	</view>
 
@@ -63,8 +64,7 @@
 			<picker
 			 mode="date"
 			 value="{{date}}"
-			 start=""
-			 end=""
+			 end="{{endTime}}"
 			 name="birthday"
 			 disabled="{{memberInfo.birthday}}"
 			 bindchange="bindDateChange"
@@ -109,10 +109,8 @@
         </view>
       </view>
 
-     <button type='primary' class='btn-primary' form-type="submit" style="background-color: rgb(2, 186, 112);">确认</button>
+     <button type='primary' class='btn-primary-own' form-type="submit" style="background-color: rgb(2, 186, 112);">确认</button>
   </form>
 </view>
-	<!--goHome-->
-	<go-home />
 </view>
 

src/pages/memberOfOwn/memberOfOwn.wxss

@@ -59,7 +59,7 @@ page{
   background-color: #ffffff;
   border-radius: 7rpx;
   display: flex;
-  height: 200rpx;
+  height: 300rpx;
   flex-direction: column;
   justify-content: center;
   align-items: center;
@@ -116,7 +116,7 @@ textarea {
   font-size: 26rpx;
 }
 
-.btn-primary{
+.btn-primary-own{
   width: 650rpx;
   margin-top: 100rpx;
   padding-left: 0;
@@ -125,3 +125,20 @@ textarea {
   font-size: 14px;
   box-sizing: border-box;
 }
+.wx-pay-code{
+  padding-left: 0;
+  width: 50%;
+  height: 80rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 14px;
+  box-sizing: border-box;
+  margin-top: 40rpx;
+  color: #ffffff;
+  background: rgb(2, 186, 112);
+}
+
+.wx-pay-code:active{
+  opacity: 0.7;
+}
\ No newline at end of file

src/pages/myShare/myShare.wxml

@@ -25,11 +25,23 @@
 		</view>
 	</scroll-view>
 </view>
-<block wx:if="{{contentPermission}}">
+<button
+ wx:if="{{!currentHasUserInfo}}"
+ bindgetuserinfo="_getUserInfo"
+ data-jflag="false"
+ open-type='getUserInfo'
+ hover-class="btn-hover"
+>
+	<view class="add">+</view>
+</button>
+
+<view wx:if="{{currentHasUserInfo}}">
+	<block wx:if="{{contentPermission}}">
 		<navigator open-type="navigate" url="/subPackage/page/pages/grassCommunity/grassCommunity">
 			<view class="add">+</view>
 		</navigator>
-</block>
+	</block>
+</view>
 <card-modal
  show-card-modal="{{showCardModal}}"
  card-title="{{cardTitle}}"

src/pages/productDetail/productDetail.js

@@ -103,7 +103,6 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    console.log('0this.data.currentHasUserInfo', this.data.currentHasUserInfo)
     this.getProInfo()
     this.getOpenStatus()
     this.data.currentShareContent = null

src/pages/productDetail/productDetail.wxml

@@ -30,7 +30,17 @@
 				<text class="price">￥618</text>
 				<text class="cost-price">￥888</text>
 			</view>
-			<view class="share-wrap" bindtap="onTapShare">
+			<button
+			 wx:if="{{!currentHasUserInfo}}"
+			 bindgetuserinfo="_getUserInfo"
+			 data-jflag="false"
+			 open-type='getUserInfo'
+			 hover-class="btn-hover"
+			>
+				<image class="share-img" src="/assets/imgs/share.png" />
+				<text class="share-text">分享</text>
+			</button>
+			<view wx:if="{{currentHasUserInfo}}" class="share-wrap" bindtap="onTapShare">
 				<image class="share-img" src="/assets/imgs/share.png" />
 				<text class="share-text">分享</text>
 			</view>
@@ -129,7 +139,7 @@
 					 name='nav'
 					 wx:if="{{!fromZc}}"
 					>
-						<button class="cart-button get-formId--btn" formType="submit" >加入购物车</button>
+						<button class="cart-button get-formId--btn" formType="submit">加入购物车</button>
 					</form>
 					<form
 					 class='get-formId get-formId--form'

src/pages/productDetail/productDetail.wxss

 /* pages/productDetail/productDetail.wxss */
+@import './../../base/base.wxss';
+
 page{
   padding-bottom: 100rpx;
 }
 .swiper-image{
   width: 100%;
 }
+.product-price {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 .dots{ 
   position: absolute; 
   left: 0; 
@@ -70,7 +77,7 @@ page{
   margin-left: 8rpx;
 }
 .price-wrap{
-  display: inline-block;
+  flex: 1;
 }
 .product-name{
   color: #333333;

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

@@ -12,11 +12,22 @@
 <view class="diy-banner">
 	<image src="{{bannerUrl}}" />
 </view>
-<block wx:if="{{contentPermission}}">
+<button
+ wx:if="{{!currentHasUserInfo}}"
+ bindgetuserinfo="_getUserInfo"
+ data-jflag="false"
+ open-type='getUserInfo'
+ hover-class="btn-hover"
+>
+	<view class="add">+</view>
+</button>
+<view wx:if="{{currentHasUserInfo}}">
+	<block wx:if="{{contentPermission}}">
 		<navigator open-type="navigate" url="/subPackage/page/pages/grassCommunity/grassCommunity">
 			<view class="add">+</view>
 		</navigator>
-</block>
+	</block>
+</view>
 <!--goHome-->
 <go-home/>
 <water-flow-layout

src/utils/util.js

@@ -14,6 +14,15 @@ const formatTime = date => {
   return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':')
 }
 
+/*格式化日期 2017-09-01*/
+const formatDate = date => {
+  const year = date.getFullYear()
+  const month = date.getMonth() + 1
+  const day = date.getDate()
+
+  return [year, month, day].map(formatNumber).join('-')
+}
+
 /* 获取当前页url */
 function getCurrentPageUrl() {
   var pages = getCurrentPages() // 获取加载的页面
@@ -285,8 +294,7 @@ const formatNumber = n => {
 }
 
 function _getUserInfo(ev) {
-  console.log('iiiiiiiiiiiiii', ev)
-  const userInfo = ev.detail
+  const userInfo = ev.detail || ev
   return getUserInfoByBtn(userInfo).then((data = {}) => {
     const { token } = data
     wx.setStorageSync('_accreditUserInfo', userInfo)
@@ -352,6 +360,7 @@ module.exports = {
   // _: underscore,
   HandlerDataOnPage,
   formatTime: formatTime,
+  formatDate,
   getAppUserInfo,
   formatNumber: formatNumber,
   logger: new Logger(),

src/wxs/utils.wxs

@@ -24,6 +24,7 @@ function formateUrl(url, BASE_IMG_URL){
     if(url){
       url = url.indexOf('http') > -1 ? url : BASE_IMG_URL + url;
     }
+    console.log('url', url)
     return url;
 }