Merge branch 'dev' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev

src/app.json

@@ -12,7 +12,8 @@
     "pages/consumptionDetails/consumptionDetails",
     "pages/IntegralMall/IntegralMall",
     "pages/integralMallDetail/integralMallDetail",
-    "pages/activateCard/activateCardCallback"
+    "pages/activateCard/activateCardCallback",
+    "pages/index/index"
   ],
   "window": {
     "backgroundTextStyle": "light",

src/pages/index/index.js

+// pages/index/index.js
+const app = getApp()
+const wxService = require('../../utils/wxService')
+const utils = require('../../utils/util')
+const envInfo = require('../../config/index').envInfo
+
+wxService.page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    personCenterObj: {
+      bonus: 10,
+      coupon: 20
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+  handleGoWxCard() {
+    wxService.openCard()
+  },
+  toBonusDetails() {
+    wxService.router(`/pages/integralWater/integralWater`)
+  },
+  toCouponList() {
+    wxService.router(`/pages/coupons/coupons`)
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

src/pages/index/index.json

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

src/pages/index/index.wxml

+<!--pages/index/index.wxml-->
+ <view class="activation-content {{true ? 'user-content' : ''}}">
+    <image class='activation-bg' src='/assets/imgs/user-bg.png'></image>
+    <button type="primary" plain='false' wx:if='{{false}}'>激活立享会员特权</button>
+    <view class='user-info' wx:if='{{true}}'>
+      <view class="user-avatar">
+        <open-data type="userAvatarUrl"></open-data>
+      </view>
+      <view class='user-name-content'>
+        <view class='user-name'>
+          <open-data type="userNickName" class="userinfo-nickname" lang="zh_CN"></open-data>
+          <navigator url='/pages/memberOfOwn/memberOfOwn' style='display:inline-block' hover-class="none">
+            <image class='icon-edit' src='/assets/imgs/icon-edit.png' bindtap="handelPersonCenter"></image>
+          </navigator>
+        </view>
+        <view class='user-id'>34765736454</view>
+      </view>
+      <view class='qr-code pr'>
+        <image src='/assets/imgs/qr-code.png' bindtap="handleGoWxCard"></image>
+      </view>
+    </view>
+  </view>
+  <view class='df tc'>
+    <view class='df-1 point' bindtap="toBonusDetails">
+      <view class='point-desc'>积分</view>
+      <view class='point-number'>{{personCenterObj.bonus}}</view>
+    </view>
+    <view class='df-1 point' bindtap="toCouponList">
+      <view class='point-desc'>优惠券</view>
+      <view class='point-number'>{{personCenterObj.coupon}}</view>
+    </view>
+  </view>

src/pages/index/index.wxss

+/* pages/index/index.wxss */
+@import './../../base/base.wxss';
+.user-content{
+  height: 92rpx;
+  /* width: 598rpx; */
+  padding: 37rpx 46rpx;
+  box-sizing: border-box;
+}
+.activation-content{
+  position: relative;
+  height: 166rpx;
+  margin-top: 18rpx;
+  border-radius: 7rpx;
+}
+.point{
+  padding:36rpx 0 25rpx 0;
+}
+.point-desc{
+  font-size: 20rpx;
+  color: #666666;
+}
+.point-number{
+  font-size: 30rpx;
+  font-weight: bold;
+  color: #333333;
+  margin-bottom: 15rpx;
+}
+.activation-content button{
+  width: 400rpx;
+  height: 68rpx;
+  border-radius: 68rpx;
+  line-height: 68rpx;
+  font-size: 30rpx;
+  position: absolute;
+  top: 49rpx;
+  left: 144rpx;
+}
+.activation-bg{
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  border-radius: 7rpx;
+  z-index: -1;
+
+}
+
+.user-avatar{
+  width: 100rpx;
+  height: 100rpx;
+  overflow:hidden;
+  border-radius: 50%;
+  display: inline-block;
+  margin-right: 46rpx;
+}
+.user-name-content{
+  display: inline-block;
+}
+
+.user-name{
+  margin-bottom: 25rpx;
+}
+.icon-edit{
+  width: 28rpx;
+  height: 28rpx;
+  vertical-align: middle;
+  margin-left: 8rpx;
+}
+.user-id{
+  color: #666666;
+  font-size: 24rpx;
+}
+.qr-code image{
+  width: 100rpx;
+  height: 100rpx;
+}
\ No newline at end of file

src/project.config.json

@@ -40,7 +40,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 7,
+			"current": 12,
 			"list": [
 				{
 					"id": -1,
@@ -113,6 +113,12 @@
 					"name": "激活领卡回调页面",
 					"pathName": "pages/activateCard/activateCardCallback",
 					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "空白页",
+					"pathName": "pages/index/index",
+					"query": ""
 				}
 			]
 		}