Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !150

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

@@ -18,7 +18,9 @@ wxService.page({
     currentShareContent: null,
     pagePath:'',
     loadingTime: '',
-    proList:[]
+    proList:[],
+    pageNo: 1,
+    pageSize: 10
   },
 
   /**
@@ -102,6 +104,30 @@ wxService.page({
     })
   },
 
+  //跳转商品详情
+  onTapToGoodsInfo(e) {
+    console.log(e)
+    let item = e.currentTarget.dataset.item;
+    let productId = e.currentTarget.dataset.productid;
+    //组装一个临时触点信息对象到本地
+    let tempObj = {
+      memberId: item.userId ? item.userId : '-99',
+      obj: {
+        id: item.tentacleObjectId,
+        tentacleType: item.tentacleType,
+        tentacleId: item.tentacleId,
+        contentType: item.contentType,
+        contentId: item.contentId
+      }
+    };
+    //存储
+    var timestamp = Date.parse(new Date())
+    var expiration = timestamp + 1800000
+    wx.setStorageSync('TEMP_TENTACLE_INFO', tempObj);
+    wx.setStorageSync('TIME_EXPIRATION', expiration);
+    wxService.router(`/pages/productDetail/productDetail?id=${productId}&fromZc=1`);
+  },
+
   //获取内容下商品列表
   getProList() {
     var params = {

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxss

@@ -137,4 +137,30 @@ page{
   font-size: 13rpx;
   color: #CB3C3C;
   margin-top: 9rpx;
-}
\ No newline at end of file
+}
+.bottom-price{
+  margin-top: 11rpx;
+}
+.price{
+  font-size: 32rpx;
+  color: #CB3C3C;
+}
+.cost-price{
+  text-decoration:line-through;
+  font-size: 20rpx;
+  color: #aaaaaa;
+  margin-left: 10rpx;
+}
+.look-over{
+  width: 125rpx;
+  height: 39rpx;
+  line-height: 39rpx;
+  text-align: center;
+  border-radius: 19rpx;
+  background-color: rgba(203, 60, 60, 1);
+  border: 1px solid rgba(151, 151, 151, 1);
+  color: #ffffff;
+  font-size: 18rpx;
+  float: right;
+}
+