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

Fixbug zyw

See merge request !136

src/pages/confirmOrder/confirmOrder.js

@@ -371,6 +371,7 @@ wxService.page({
   },
   //获取微信地址
   chooseWxAddress() {
+    const { memberId } = wx.getStorageSync('_baseUserInfo')
     wx.chooseAddress({
       success: (res) => {
         console.log('微信地址', res)
@@ -381,8 +382,27 @@ wxService.page({
         this.setData({
           goodsAddress: false,
           wxAddress: true,
-          addressInfo: res
+          addressInfo: res,
+          params:{
+            userId: memberId,
+            name: res.userName,
+            phone: res.telNumber,
+            province: res.provinceName,
+            city: res.cityName,
+            district: res.countyName,
+            address: res.detailInfo,
+            type: 0
+          }
+        })
+        wxService.post(`/member/addressManage/save`, this.data.params).then(res => {
+          const { result, data } = res.data
+          if (result == 0) {
+            wx.hideLoading()
+          }
+        }).finally(() => {
+          wx.hideLoading()
         })
+
         console.log('WX---------------------', this.data.addressInfo)
       },
       fail: function (err) {

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

@@ -17,7 +17,8 @@ wxService.page({
     showCardModal: false,
     currentShareContent: null,
     pagePath:'',
-    loadingTime: ''
+    loadingTime: '',
+    proList:[]
   },
 
   /**
@@ -100,6 +101,25 @@ wxService.page({
     })
   },
 
+  //获取内容下商品列表
+  getProList() {
+    var params = {
+      productIds: this.data.contentInfo.productIds
+    }
+    if (this.data.contentInfo.productIds && this.data.contentInfo.productIds.length > 0) {
+      wxService.post(`/sale/product/buyer/listPage?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`, params).then(res => {
+        if (!res) return false
+        const { result, data } = res.data
+        if (result == 0 && data.content) {
+          this.setData({
+            proList: data.content
+          })
+        }
+      }).finally(() => {
+      })
+    }
+  },
+
   // 获取内容详情
   getContentDetail() {
     const { memberId, member } = wx.getStorageSync('_baseUserInfo')
@@ -115,7 +135,7 @@ wxService.page({
         this.setData({
           contentInfo: data
         })
-        
+        this.getProList()
       }
 
     }).finally(() => {

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxml

@@ -7,8 +7,30 @@
 	<view class="detail-content border_box">
 		<view class="detail-title">{{contentInfo.headline}}</view>
 		<view class="detail-desc"><x-html html="{{contentInfo.article}}" /></view>
-		<view class="detail-bottom weui-flex df-j--bt">
+		<!-- <view class="detail-bottom weui-flex df-j--bt">
 			<view class="bottom-collapse border_box"> 收起</view>
+		</view> -->
+	</view>
+  <view class="buy-product-wrap">
+		<view class="buy-product-content">
+			<block wx:for="{{proList}}" wx:key="{{index}}">
+				<!-- <navigator hover-class="none" url="/pages/productDetail/productDetail?productId={{item.productId}}"> -->
+					<view class="buy-list" bindtap="onTapToGoodsInfo" data-item="{{contentInfo}}" data-productid="{{item.productId}}">
+						<view class="prod-img">
+							<image src="{{item.indexUrl}}" />
+						</view>
+						<view class="prod-info">
+							<view class="prod-name">{{item.productName}}</view>
+							<!-- <view class="sale-btn">限时特价</view> -->
+							<view class="bottom-price">
+								<text class="price">￥{{item.minSalePrice}}</text>
+								<!-- <text class="cost-price">￥456</text> -->
+								<view class="look-over">购买</view>
+							</view>
+						</view>
+					</view>
+				<!-- </navigator> -->
+			</block>
 		</view>
 	</view>
 	<view class="release-action">
@@ -38,14 +60,14 @@
 		</view>
 	</view>
 </view>
-<view class="bottom-img">
+<!-- <view class="bottom-img">
 	<image
 	 class="img-top"
 	 mode="widthFix"
 	 src="/assets/imgs/7_1_0/go-top.png"
 	 bindtap="goTop"
 	/>
-</view>
+</view> -->
 <!--goHome-->
 <go-home/>
 <x-dialog show="{{showDialig}}" bind:_closeDialog="closeDialog" />

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

 /* subPackage/page/pages/myReleaseDetail.wxss */
 @import './../../../../base/base.wxss';
+page{
+  padding-bottom: 220rpx;
+}
 .detail-img {
   height: 505rpx;
   background-color: rgba(216, 216, 216, 1);
@@ -91,4 +94,47 @@
   font-size: 24rpx;
   color: #999999;
   margin-left: 10rpx;
+}
+.buy-product-wrap{
+  padding: 0 20rpx;
+}
+
+.buy-product-content{
+  width: 710rpx;
+  margin-top: 20rpx;
+}
+.buy-list{
+  width: 100%;
+  border-radius: 10rpx;
+  background-color: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
+  display: flex;
+  margin-bottom: 20rpx;
+}
+.prod-img{
+  height: 220rpx;
+}
+.prod-img image{
+  width: 220rpx;
+  height: 220rpx;
+  border-top-left-radius: 10rpx;
+  border-bottom-left-radius: 10rpx;
+}
+.prod-info{
+  padding: 31rpx 26rpx 39rpx 24rpx;
+}
+.prod-name{
+  font-size: 26rpx;
+  width: 440rpx;
+}
+.sale-btn{
+  width: 74rpx;
+  height: 24rpx;
+  line-height: 24rpx;
+  text-align: center;
+  border-radius: 15rpx;
+  border: 1px solid rgba(203, 60, 60, 1);
+  font-size: 13rpx;
+  color: #CB3C3C;
+  margin-top: 9rpx;
 }
\ No newline at end of file

src/utils/Http.js

@@ -227,7 +227,7 @@ class Http {
       wx.removeStorageSync('TIME_EXPIRATION')
     }
 
-    return JSON.stringify({});
+    return JSON.stringify(null);
   }
 }