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

src/pages/extendProduct/extendProduct.js

@@ -299,7 +299,9 @@ wxService.page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function (res) {
+    console.log(res)
     if (res.from != 'menu') {
+      console.log('1111111')
       let id = Integer.digit(this.data.currentShareContent.id, 10, 64);
       let tentacleId = Integer.digit(this.data.currentShareContent.tentacleId, 10, 64);
       var path = 'pages/extendProduct/extendProduct?i=' + id + '&t=' + tentacleId;
@@ -317,7 +319,6 @@ wxService.page({
     };
     wxService.getTentacleContent(tentacleInfo).then(res => {
       if (res && res.tentacleId) {
-        this.data.currentShareContent.tentacleId = res.tentacleId;
         let tentacleId = Integer.digit(res.tentacleId, 10, 64);
         var path = `pages/extendProduct/extendProduct?t=${tentacleId}`;
         return {

src/pages/productDetail/productDetail.js

@@ -61,20 +61,20 @@ wxService.page({
   // 分享
   onTapShare() {
     let content = {
-      headline: this.data.productInfo.headline,
-      id: this.data.productInfo.id,
-      article: this.data.productInfo.article,
-      url: this.data.productInfo.url
+      title: this.data.productInfo.productName,
+      id: this.data.productInfo.productId,
+      url: this.data.productInfo.indexUrl
     }
     let tentacleInfo = {
       content: JSON.stringify(content),
-      contentId: this.data.productInfo.id,
-      contentType: 2, //内容类型 1.文章 2.商品 3.页面
-      title: this.data.productInfo.headline, //标题
+      contentId: this.data.productInfo.productId,
+      contentType: app.globalData.contants.SHARE_TYPE.GOODS, //内容类型 1.文章 2.商品 3.页面
+      title: this.data.productInfo.productName, //标题
       type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
     }
 
     this.data.currentShareContent = this.data.productInfo;
+    this.data.currentShareContent.id = this.data.productInfo.productId;
 
     wxService.getTentacleContent(tentacleInfo).then(res => {
       if (res && res.tentacleId) {
@@ -84,8 +84,8 @@ wxService.page({
         var path = 'pages/productDetail/productDetail?i=' + id + '&t=' + tentacleId;
         this.setData({
           showCardModal: true,
-          cardTitle: this.data.productInfo.headline,
-          cardUrl: this.data.productInfo.url,
+          cardTitle: this.data.productInfo.productName,
+          cardUrl: this.data.productInfo.indexUrl,
           pagePath: path
         });
       }
@@ -146,34 +146,6 @@ wxService.page({
     })
   },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-
   // 页面touchstart事件
   pageTouchStart: function (e) {
     if (this.data.showHtml) {
@@ -299,7 +271,4 @@ wxService.page({
       path: path
     }
   }
-
-
-
 })
\ No newline at end of file

src/pages/productDetail/productDetail.wxml

@@ -5,7 +5,6 @@
  bindtouchstart="pageTouchStart"
  bindtouchmove="pageMove"
  bindtouchend="pageMoveEnd"
- bindtap="handleCloseSharePopup"
 >
 	<view>
 		<!-- <buy-image-swiper  image-data="{{imageData}}"/>
@@ -113,10 +112,10 @@
 			 report-submit
 			 name='home'
 			>
-				<navigator class="get-formId--btn footer-icon">
+				<!-- <navigator class="get-formId--btn footer-icon">
 					<image src="https://hwimagecdn.ihotwind.cn/hotwind-mini/images/hotnewicon/bottom-kefu.png" mode="widthFix" />
 					<view class="tab-text">分享</view>
-				</navigator>
+				</navigator> -->
 			</form>
 
 		</view>

src/pages/productDetail/productDetail.wxss

 /* pages/productDetail/productDetail.wxss */
+page{
+  padding-bottom: 100rpx;
+}
 .swiper-image{
   width: 100%;
 }

src/pages/wantToBuyDetail/wantToBuyDetail.js

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

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 17,
+			"current": 16,
 			"list": [
 				{
 					"id": -1,
@@ -144,7 +144,7 @@
 					"id": 16,
 					"name": "商品详情页",
 					"pathName": "pages/productDetail/productDetail",
-					"query": "productId=1000704",
+					"query": "productId=1008190",
 					"scene": null
 				},
 				{

src/subPackage/page/pages/myRelease/myRelease.js

@@ -150,10 +150,11 @@ wxService.page({
 
   // 分享
   _onTapShare(e) {
+    console.log(e)
     let tentacleInfo = {
       content: JSON.stringify(e.detail),
       contentId: e.detail.id,
-      contentType: 2, //内容类型 1.文章 2.商品 3.页面
+      contentType: app.globalData.contants.SHARE_TYPE.CONETNT, //内容类型 1.文章 2.商品 3.页面
       title: e.detail.title, //标题
       type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
     }
@@ -213,14 +214,13 @@ wxService.page({
     }
 
     let tentacleInfo = {
-      content: this.route,
-      title: this.route,
-      contentType: 3,
+      content: '我的发布',
+      title: '我的发布',
+      contentType: app.globalData.contants.SHARE_TYPE.PAGE,
       type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
     };
     wxService.getTentacleContent(tentacleInfo).then(res => {
       if (res && res.tentacleId) {
-        this.data.currentShareContent.tentacleId = res.tentacleId;
         let tentacleId = Integer.digit(res.tentacleId, 10, 64);
         var path = `subPackage/page/pages/myRelease/myRelease?t=${tentacleId}`;
         return {

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.js

@@ -49,12 +49,13 @@ wxService.page({
     let tentacleInfo = {
       content: JSON.stringify(content),
       contentId: this.data.contentInfo.id,
-      contentType: 2, //内容类型 1.文章 2.商品 3.页面
+      contentType: app.globalData.contants.SHARE_TYPE.CONETNT, //内容类型 1.文章 2.商品 3.页面
       title: this.data.contentInfo.headline, //标题
       type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
     }
 
     this.data.currentShareContent = this.data.contentInfo;
+    console.log(this.data.contentInfo)
 
     wxService.getTentacleContent(tentacleInfo).then(res => {
       if (res && res.tentacleId) {
@@ -199,6 +200,7 @@ wxService.page({
   * 用户点击右上角分享
   */
   onShareAppMessage: function (res) {
+    if (res.from != 'menu') {
       let id = Integer.digit(this.data.currentShareContent.id, 10, 64);
       let tentacleId = Integer.digit(this.data.currentShareContent.tentacleId, 10, 64);
       var path = 'subPackage/page/pages/myReleaseDetail/myReleaseDetail?i=' + id + '&t=' + tentacleId;
@@ -206,5 +208,22 @@ wxService.page({
       return {
         path: path
       }
+    }
+
+    let tentacleInfo = {
+      content: '种草详情',
+      title: '种草详情',
+      contentType: app.globalData.contants.SHARE_TYPE.PAGE,
+      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 = `subPackage/page/pages/myReleaseDetail/myReleaseDetail?t=${tentacleId}`;
+        return {
+          path: path
+        }
+      }
+    });
   }
 })
\ No newline at end of file