sku

src/component/productListStyleOne/productListStyleOne.wxml

@@ -11,7 +11,8 @@
       </block>
     </view>
   </view>
-  <template name="water-list">
+<template name="water-list">
+    <navigator hover-class="none" url="/pages/productDetail/productDetail?productId={{productId}}">
       <view class="item">
         <image class="item-img" src="{{indexUrl}}" mode="widthFix"></image>
         <view class="item-title-box">
@@ -30,4 +31,5 @@
           </view>
         </view>
       </view>
+    </navigator>
 </template>

src/component/productListStyleTwo/productListStyleTwo.wxml

 <!--component/productListStyleTwo/productListStyleTwo.wxml-->
-<view class="hot-item border_box" wx:for="{{imageData}}" wx:key="{{index}}">
+<block wx:for="{{imageData}}" wx:key="{{index}}">
+  <navigator hover-class="none" url="/pages/productDetail/productDetail?productId={{menuSec.productId}}">
+    <view class="hot-item border_box" >
         <view class="hot-img-box">
           <image class="hot-img" src="{{item.indexUrl}}" mode="widthFix" lazy-load="false" binderror="" bindload="" />
         </view>
@@ -36,6 +38,8 @@
         
           <view/>
         </view>
-</view>
+    </view>
+  </navigator>
+</block>
 
 

src/component/skuPopup/skuPopup.wxml

@@ -6,20 +6,18 @@
   <view class="top-info clearfix">
     <image mode="widthFix" src="{{curSku.sku_pic_url && curSku.sku_pic_url != 'undefined' ? (imageDomain + curSku.sku_pic_url) : indexImg}}"></image>
     <view class="top-text">
-      <view class="price-text" wx:if="{{exchangePrice <= 0}}">￥{{price / 100}}</view>
-      <view class="price-text" wx:else>{{price}}</view>
+      <!-- <view class="price-text" wx:if="{{exchangePrice <= 0}}">￥{{price / 100}}</view> -->
+      <view class="price-text">￥{{salePrice}}</view>
       <view class="stock-text">库存：{{skuStock}}</view>
       <view class="sku-text">规格：<block wx:for="{{skuText}}" wx:key="{{index}}">{{item}} </block></view>
     </view>
   </view>
   <!-- isAllowArrive  0 开启/放开 1 关闭/禁用 -->
   <scroll-view class="mid-info" scroll-y="true">
-    <view class="sku-info" >
-      <view class="spec-name">默认</view>
-      <view class="spec-values">
-      <view class="spec-value active">默认选项</view>
-      <view class="spec-value">默认选项</view>
-      <view class="spec-value">默认选项</view>
+    <view class="sku-info" wx:for="{{specItem}}"  wx:for-index="i" wx:key="{{i}}">
+      <view class="spec-name">{{item.name}}</view>
+      <view class="spec-values" wx:for="{{item.sonList}}" wx:for-index="j" wx:key="{{j}}" wx:for-item="specValue">
+        <view class="spec-value {{specValue.stock == 0 ? ' disabled' : ''}}{{curSpec[i].name == specValue.name ? ' active' : ''}}" bindtap="selectSku" data-id="{{specValue.id}}" data-index="{{i}}" data-name="{{specValue.name}}" data-type="{{goodType}}" data-disable="{{specValue.skuStock == 0 ? true : false}}" data-stock="{{skuStock}}">{{specValue.name}}</view>
 
         <!-- <view wx:if="{{isAllowArrive}}" class="spec-value{{specValue.skuStock == 0 ? ' disabled' : ''}}{{curSpec[i] == specValue.skuName ? ' active' : ''}}" wx:for="{{specInfo.specValue}}" wx:for-index="j" wx:key="{{j}}" wx:for-item="specValue" data-stock="{{specValue.skuStock}}" data-name="{{specValue.skuName}}" data-index="{{i}}" data-type="{{goodType}}" data-disable="{{specValue.skuStock == 0 ? true : false}}" bindtap="selectSku">{{specValue.skuName}}</view> -->
         <!-- <view wx:if="{{!isAllowArrive}}" class="spec-value{{specValue.skuStock == 0 ? ' disabled' : ''}}{{curSpec[i] == specValue.skuName ? ' active' : ''}}" wx:for="{{specInfo.specValue}}" wx:for-index="j" wx:key="{{j}}" wx:for-item="specValue" data-stock="{{specValue.skuStock}}" data-name="{{specValue.skuName}}" data-index="{{i}}" data-type="{{goodType}}" data-disable="{{specValue.skuStock == 0 && goodType == 2 ? true : false}}" bindtap="selectSku">{{specValue.skuName}}</view> -->

src/component/skuPopup/skuPopup.wxss

@@ -19,7 +19,7 @@
   transform: translateY(0); }
 
 .out-stock {
-  background: #FFB400!important;
+  background: #aaaaaa!important;
   }
 .popup-content {
   position: fixed;
@@ -97,6 +97,9 @@
   display: inline-block;
   vertical-align: middle;
 }
+.spec-values{
+  display: inline-block;
+}
 .mid-info .sku-info .spec-value {
   color: #808080;
   font-size: 26rpx;

src/pages/productDetail/productDetail.js

 // pages/productDetail/productDetail.js
 var app = getApp()
+const wxService = require('../../utils/wxService')
 
-Page({
+
+wxService.page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    productId:'',
+    productInfo:'',
     showHtml: false,
     reachBottom: false, // 标识是否触底
     showSkuPopup: false,
-    btnText: '立即购买',
+    btnText: '确定',
     baseImgUrl: app.globalData.imageUrl,
     swiperCurrent: 0,
+    selectSkuName:'',
 
     imageData: [{
       desc: "string",
@@ -52,7 +57,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    if (options && options.productId){
+      this.setData({
+        productId: options.productId
+      })
+    }
   },
 
   swiperChange(e) {
@@ -72,24 +81,28 @@ Page({
   },
 
   /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.getProInfo()
   },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
+  //获取商品详情
+  getProInfo(){
+    wx.showLoading({
+      title: '加载中'
+    })
+    wxService.get(`/sale/product/buyer/findByProductId?productId=${this.data.productId}`).then(res => {
+      const { result, data } = res.data
+      if (result == 0) {
+        wx.hideLoading()
+        this.setData({
+          productInfo: data
+        })
+      }
+    }).finally(() => {
+      wx.hideLoading()
+    })
   },
 
   /**
@@ -173,6 +186,18 @@ Page({
     }).exec()
   },
 
+  confirmClick(event){
+    console.log(event)
+    var selectSkuName = []
+    for (let i in event.detail.selectSku){
+      selectSkuName.push(event.detail.selectSku[i].name)
+    }
+    var selectSkuStr = selectSkuName.join(',')
+    this.setData({
+      selectSkuName: selectSkuStr
+    })
+  }
+
 
 
 })
\ No newline at end of file

src/pages/productDetail/productDetail.wxml

@@ -9,14 +9,14 @@
      -->
       <swiper  
     autoplay="true"  style="height: 750rpx;line-height: 100rpx;" bindchange="swiperChange">
-        <block wx:for="{{imageData}}" wx:key="index"> 
+        <block wx:for="{{productInfo.listUrl}}" wx:key="index"> 
             <swiper-item>
                 <image class="swiper-image"  mode="widthFix" src="{{baseImgUrl}}{{item.imageUrl}}"></image>
             </swiper-item>
         </block>
       </swiper>
        <view class="dots"> 
-        <block wx:for="{{imageData}}" wx:key="index"> 
+        <block wx:for="{{productInfo.listUrl}}" wx:key="index"> 
           <view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view> 
         </block> 
   </view>
@@ -35,10 +35,10 @@
       </view>
     </view>
     <view class="product-name">
-      名称
+      {{productInfo.productName}}
     </view>
     <view class="product-desc">
-      描述
+      {{productInfo.productStatusDesc}}
     </view>
     <view class="member-price">
       <view class="member-price-info">
@@ -51,15 +51,15 @@
         <image class="big-arrow" src="/assets/imgs/big-arrow-right.png"></image>
       </view>
     </view>
-    <view class="choose-wrap">
-      请选择规格
-      <!-- <image class="arrow-right"></image> -->
+    <view class="choose-wrap" bindtap="addCart">
+      {{selectSkuName ? '已选：' + selectSkuName : '请选择规格'}}
+      <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right-sku.png" mode="widthFix"></image>
     </view>
-    <view class="choose-wrap">
-    支持快递配送</view>
+    <!-- <view class="choose-wrap">
+    支持快递配送</view> -->
     <view class="surplus">
       剩余：
-      <text class="surplus-number">300</text>
+      <text class="surplus-number">{{productInfo.stock}}</text>
       件
     </view>
     
@@ -141,19 +141,18 @@
 </view>
 
 <sku-popup
- product-name="{{product.name}}"
- spec-names="{{product.sku_names}}"
- spec-values="{{product.skus}}"
- good-type="{{product.goodType}}"
- is-allow-arrive="{{product.isAllowArrive}}"
- is-notice-status="{{isNoticeStatus}}"
- index-img="{{product.index_url[0]}}"
- image-domain="{{product.image_domain}}"
- sku-infos="{{product.skuStocks}}"
- quantity-average="{{product.quantity_average}}"
+ product-name="{{productInfo.productName}}"
+ spec-item="{{productInfo.specItemList}}"
+ good-type="{{productInfo.productType}}"
+ index-img="{{productInfo.listUrl}}"
+ sku-infos="{{productInfo.productSku}}"
  show="{{showSkuPopup}}"
- exchange-price="{{product.exchange_credits}}"
- integral-role="{{product.integral_role}}"
  bind:skuselect="confirmClick"
  btn-text="{{btnText}}"
+ product-stock="{{productInfo.stock}}"
 />
+
+<!-- <sku-popup 
+ product-sku="{{productInfo.productSku}}"
+ 
+/> -->
\ No newline at end of file

src/pages/productDetail/productDetail.wxss

@@ -231,3 +231,8 @@
   border: none;
   border-radius: 0;
 }
+.arrow-right{
+  width: 15rpx;
+  float:right;
+  margin-top: 26rpx;
+}

src/subPackage/page/pages/fun/fun.js

@@ -46,7 +46,7 @@ wxService.page({
     wx.showLoading({
       title: '加载中'
     })
-    wxService.post(`/sale/product/buyer/findProductListPage?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`, this.data.form.queryDto).then(res => {
+    wxService.post(`/sale/product/buyer/listPageByCategoryId?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`, this.data.form.queryDto).then(res => {
       const { result, data } = res.data
       if (result == 0 && data.content) {
         wx.hideLoading()

src/subPackage/page/pages/fun/fun.wxml

@@ -3,9 +3,9 @@
 <view>
 	<tab-sort/>
 
-  <product-list-style-one image-data="{{proData}}" wx:if="{{}}"/>
+  <product-list-style-one image-data="{{proData}}" />
 
-  <product-list-style-two image-data="{{proData}}"   />
+  <product-list-style-two image-data="{{proData}}"  wx:if="{{}}" />
 
   <view class="empty" wx:if="{{proData.length < 1}}">
     暂无商品哦~