Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !85

src/component/relatedOrderItem/relatedOrderItem.js

@@ -9,26 +9,54 @@ Component({
 	 * 组件的属性列表
 	 */
 	properties: {
+    selectShow: { // 显示标识
+      type: Boolean,
+      value: false
+    }
 	
   },
   attached () {
-	
+    if (this.data.selectShow){
+      
+    }
+    this.getProList()
 	},
 	/**
 	 * 组件的初始数据
 	 */
 	data: {
-		isSelect:false
+		isSelect:false,
+    proList:[]
 	},
 	/**
 	 * 组件的方法列表
 	 */
 	methods: {
-		selectCoupon() {
-      console.log('2222')
+		selectCoupon(e) {
+      console.log(e)
+      let params = {
+        id: e.currentTarget.dataset.item
+      }
       this.setData({
         isSelect: !this.data.isSelect
       })
+      wxService.nextTick(() => {
+        this.triggerEvent('_selectCoupon', params)
+      })
     },
+
+    getProList(){
+      wxService.post(`/sale/product/buyer/listWithMember`).then(res => {
+        const { result, data } = res.data
+        if (result == 0) {
+         this.setData({
+           proList: data
+         })
+         console.log(data)
+        }
+      }).finally(() => {
+      })
+
+    }
   }
 })

src/component/relatedOrderItem/relatedOrderItem.wxml

-<!--component/relatedOrderItem/relatedOrderItem.wxml-->
-<!--<view class="grass-item weui-flex border_box">
-	<view class="grass-img-box">
-		<image class="grass-img" src="./../../assets/imgs/7_1_0/scancode.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
-	</view>
-	<view class="grass-item-desc border_box">
-		<view class="item-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view>
-	</view>
-	<view class="select-radio">
-		<view class="{{isSelect ? 'theme-color' : ''}} coupon-radio">
-			<image
-				wx:if="{{isSelect}}"
-				class="tick-success"
-				src="/assets/imgs/7_1_0/tick-success.png"
-				mode="widthFix"
-			/>
-		</view>
-	</view>
-</view>-->
 
-<view class="grass-item weui-flex border_box" bindtap="selectCoupon">
+<block wx:for="{{proList}}" wx:key="{{index}}">
+  <view class="grass-item weui-flex border_box" bindtap="selectCoupon" data-item="{{item.item}}">
 
-	<view class="grass-img-box">
-		<image
-		 class="grass-img"
-		 src="./../../assets/imgs/7_1_0/scancode.png"
-		 mode="widthFix"
-		 lazy-load="false"
-		 binderror=""
-		 bindload=""
-		/>
-	</view>
+    <view class="grass-img-box">
+      <image
+      class="grass-img"
+      src="{{item.indexUrl}}"
+      mode="widthFix"
+      lazy-load="false"
+      binderror=""
+      bindload=""
+      />
+    </view>
 
-	<view class="grass-item-desc border_box">
-		<view class="item-name">商品名称称商品名称称称商品名称商品名称</view>
-		<view class="item-notice">预计赚5元红包</view>
-	</view>
-	<view class="select-radio">
-		<view class="{{isSelect ? 'theme-color' : ''}} coupon-radio">
-			<image
-			 wx:if="{{isSelect}}"
-			 class="tick-success"
-			 src="/assets/imgs/7_1_0/tick-success.png"
-			 mode="widthFix"
-			/>
-		</view>
-	</view>
-</view>
+    <view class="grass-item-desc border_box">
+      <view class="item-name">{{item.productName}}</view>
+      <!-- <view class="item-notice">预计赚5元红包</view> -->
+    </view>
+    <view class="select-radio">
+      <view class="{{isSelect ? 'theme-color' : ''}} coupon-radio">
+        <image
+        wx:if="{{isSelect}}"
+        class="tick-success"
+        src="/assets/imgs/7_1_0/tick-success.png"
+        mode="widthFix"
+        />
+      </view>
+    </view>
+  </view>
+</block>
 

src/component/relatedOrderItem/relatedOrderItem.wxss

@@ -23,7 +23,6 @@
 	padding: 20rpx 0 20rpx 0;
 	width: 400rpx;
 	height: 74rpx;
-	color: rgba(0, 0, 0, 1);
 	font-size: 26rpx;
 }
 

src/component/selectRelatedGoods/selectRelatedGoods.js

@@ -14,7 +14,8 @@ Component({
    * 组件的初始数据
    */
   data: {
-    isSelect:false
+    isSelect:false,
+    proList:[]
   },
 
   /**
@@ -32,6 +33,17 @@ Component({
         show: false
       })
     },
+    _selectCoupon(e){
+      this.setData({
+        item: e.detail.item
+      })
+    },
+    confirm(){
+      this.setData({
+        show: false,
+        proList:this.data.item
+      })
+    }
 
   },
  

src/component/selectRelatedGoods/selectRelatedGoods.wxml

@@ -19,20 +19,7 @@
     </view>
 
 		<view class="coupon-list" bindtap="selectCoupon">
-      <relate-order-item />
-			<!--
-				<view class="select-radio">
-					<view class="{{isSelect ? 'theme-color' : ''}} coupon-radio">
-						<image
-						 wx:if="{{isSelect}}"
-						 class="tick-success"
-						 src="/assets/imgs/7_1_0/tick-success.png"
-						 mode="widthFix"
-						/>
-					</view>
-				</view>
-
-		-->
+      <relate-order-item selectShow="{{show}}" bind:_selectCoupon="_selectCoupon" />
 		</view>
 
 		<view class="empty-coupon">
@@ -40,6 +27,6 @@
 		</view>
 	</view>
 
-	<view class="post-notes fixed-bottom0">确认添加</view>
+	<view class="post-notes fixed-bottom0" bindtap="confirm">确认添加</view>
 </view>
 

src/component/selectRelatedGoods/selectRelatedGoods.wxss

@@ -57,7 +57,7 @@
 
 .modal-content {
 	position: fixed;
-	z-index: 99;
+	z-index: 99999;
 	width: 100%;
 	bottom: 0;
 	left: 0;

src/subPackage/page/pages/grassCommunity/grassCommunity.wxml

@@ -32,5 +32,5 @@
   </view>
   <button class="post-notes fixed-bottom0" form-type="submit">发布笔记</button>
 </form>
-<select-related-goods show="{{showSelectRelatedGoods}}"/>
+<select-related-goods show="{{showSelectRelatedGoods}}" />