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

src/app.js

@@ -3,6 +3,7 @@ import { cEvent } from './utils/event.js'
 const Promise = require('lib/bluebird')
 var utils = require('utils/util.js')
 var commonFunc = require('utils/common.js')
+var contants = require('utils/const.js')
 var cityJson = require('utils/city.js')
 var wxService = require('utils/wxService')
 let config = require('./configScreen/configScreen');
@@ -112,6 +113,8 @@ App({
     imageUrl: envInfo.imgCtx, //图片地址
     isFullSucreen: false, // 当前设备是否为 FullSucreen
     commonFunc: commonFunc,
+    contants: contants,
+    
     cityJson: cityJson,
     // brandId: 2711,
     // brandId: 2005,

src/pages/extendProduct/extendProduct.js

@@ -49,7 +49,6 @@ wxService.page({
     }
     // 可使用
     if (current == 0) {
-      this.getExtendProBanner()
       this.getExtendProList(1,10)
     } else if (current == 1) {
       // 我的推广
@@ -187,13 +186,14 @@ wxService.page({
           wx.hideLoading()
           let extendData = []
           // for (var i in data.content){
-          //   if (data.content[i].content){
+          //   //内容类型 1.文章 2.商品 3.页面
+          //   if (data.content[i].contentType != 3){
           //     console.log('=====', data.content[i].content)
           //     console.log('--------', JSON.parse(data.content[i].content))
           //     var content = JSON.parse(data.content[i].content)
-          //     extendData.push(content)
+          //     data.content[i].content = content
           //   }
-          //   data.content[i].content = extendData
+            
           // }
           this.setData({
             myExtendList: this.data.pageNum == 1 ? [...data.content] : [...this.data.myExtendList, ...data.content],
@@ -203,6 +203,7 @@ wxService.page({
             //   no_data: this.data.orderList.length ? true : false
             // })
           })
+          console.log('00000', this.data.myExtendList)
         }
       }
     })

src/pages/myShare/myShare.js

@@ -140,7 +140,7 @@ wxService.page({
     let tentacleInfo = {
       content: JSON.stringify(e.detail),
       contentId: e.detail.id,
-      contentType: 2, //内容类型 1.文章 2.商品 3.页面
+      contentType: app.globalData.contants.SHARE_TYPE.CONTENT, //内容类型 1.文章 2.商品 3.页面
       title: e.detail.title, //标题
       type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
     }
@@ -203,7 +203,7 @@ wxService.page({
     let tentacleInfo = {
       content: this.route,
       title: this.route,
-      contentType : 3,
+      contentType: app.globalData.contants.SHARE_TYPE.PAGE,
       type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
     };
     wxService.getTentacleContent(tentacleInfo).then(res => {

src/subPackage/page/pages/plus/plus.js

@@ -57,7 +57,20 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    this.getPlusPurchase()
+  },
 
+  // 获取plus购买信息
+  getPlusPurchase(){
+    wxService.get(`/sale/premium/query`).then(res => {
+      const { result, data } = res.data
+      if (result == 0) {
+        this.setData({
+          skuVOList: data
+        })
+      }
+    }).finally(() => {
+    })
   },
 
   /**

src/utils/const.js

+
+export default {
+  SHARE_TYPE : {
+    CONETNT : 1,
+    GOODS : 2,
+    PAGE : 3
+  }
+
+}
\ No newline at end of file