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

src/component/skuPopup/skuPopup.wxml

@@ -12,7 +12,7 @@
 		<image mode="widthFix" src="{{curSku.sku_pic_url && curSku.sku_pic_url != 'undefined' ? (imageDomain + curSku.sku_pic_url) : indexImg}}" />
 		<view class="top-text">
 			<!-- <view class="price-text" wx:if="{{exchangePrice <= 0}}">￥{{price / 100}}</view> -->
-			<view class="price-text">￥{{salePrice}}</view>
+			<view class="price-text">￥{{salePrice /100}}</view>
 			<view class="stock-text">库存：{{skuStock}}</view>
 			<view class="sku-text">规格：
 				<block wx:for="{{skuText}}" wx:key="{{index}}">{{item}} </block>

src/pages/productDetail/productDetail.wxml

@@ -27,8 +27,8 @@
 		<view class="product-price">
 			<view class="price-wrap">
 				<view class="price-icon" wx:if="{{memberLevel}}">会员专享价</view>
-				<text class="price">￥618</text>
-				<text class="cost-price">￥888</text>
+				<text class="price">￥{{productInfo.maxSalePrice / 100}}</text>
+				<!-- <text class="cost-price">￥888</text> -->
 			</view>
 			<button
 			 wx:if="{{!currentHasUserInfo}}"

src/pages/userCenter/userCenter.js

@@ -7,6 +7,7 @@ let renderPage = null // 渲染页面数据对象(安全渲染)
 let handlerDataOnPage = null
 let config = require('../../configScreen/configScreen');
 import { Integer } from '../../utils/integerDigitalConvertion'
+const { memberId, member } = wx.getStorageSync('_baseUserInfo')
 
 const logger = utils.logger
 
@@ -35,7 +36,7 @@ wxService.page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad() {
+  onLoad(options) {
     this.setData(
       {
         pages: [],
@@ -55,6 +56,19 @@ wxService.page({
     renderPage = require('../../utils/renderPage').getRenderPage()
     handlerDataOnPage.init(this, 'pages')
     this.initPage(this.data.pageId)
+
+    let memberId = options.memberId;
+    if (memberId) {
+      let tentacleInfo = {
+        content: '首页',
+        title: '首页',
+        tentacleId: memberId,
+        contentType: app.globalData.contants.SHARE_TYPE.HOME,
+        type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
+      };
+
+      this.generatePointObject(tentacleInfo);
+    }
   },
   /** 
    * 监听子组件事件
@@ -262,21 +276,15 @@ wxService.page({
   * 用户点击右上角分享
   */
   onShareAppMessage: function (res) {
-    let tentacleInfo = {
-      content: '首页',
-      title: '首页',
-      contentType: app.globalData.contants.SHARE_TYPE.HOME,
-      type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
-    };
-    wxService.getTentacleContent(tentacleInfo).then(res => {
-      if (res && res.tentacleId) {
-        let tentacleId = Integer.digit(res.tentacleId, 10, 64);
-        var path = `pages/userCenter/userCenter?t=${tentacleId}`;
-        console.log('path', path)
-        return {
-          path: `pages/userCenter/userCenter?t=${tentacleId}`
-        }
-      }
-    });
+
+    //修改为参数memberId
+    var path = `pages/userCenter/userCenter`;
+    if (memberId) {
+      let m = Integer.digit(memberId, 10, 64);
+      path = `pages/userCenter/userCenter?m=${m}`;
+    }
+    return {
+      path: path
+    }
   }
 })
\ No newline at end of file