1

1

api/api.js

@@ -116,6 +116,7 @@ module.exports = {
   Commoditywarehouse_head: baseURL + '/api/Commoditywarehouse/Commoditywarehouse_head', //商品库团长列表
   Commoditywarehouse_edit: baseURL + '/api/Commoditywarehouse/Commoditywarehouse_edit', //商品库设置分类
   Commoditywarehouse_delete: baseURL + '/api/Commoditywarehouse/Commoditywarehouse_delete', //商品库删除商品
+  Commodity_edit: baseURL + '/api/Commoditywarehouse/Commodity_edit', //商品库编辑商品
   /* 二维码管理 */
   Code_gang: baseURL + '/api/Code/Code_gang', //拼团详情分享二维码
   Code_user: baseURL + '/api/Code/Code_user', //卖家首页

pages/addtogood/addtogood.js

@@ -20,6 +20,7 @@ Page({
     showSpecification: false, //规格弹出层显示
     specificationText: '统一规格', //
     /* 表单 */
+    id: 0, //商品id
     goodName: '', //商品名称
     goodIntro: '', //商品简介
     imageList: [], //图片列表
@@ -62,6 +63,69 @@ Page({
           that.setData({
             categorys: res.data.data
           })
+          // 编辑商品
+          if (options.enterType == 'edit') {
+            that.setData({
+              id: Number(options.id)
+            })
+            wx.showLoading({
+              title: '加载中',
+              mask: true
+            })
+            wx.request({
+              url: api.Commodity_info,
+              header: {
+                'Authorization': wx.getStorageSync('token')
+              },
+              data: {
+                id: that.data.id
+              },
+              method: 'POST',
+              success(res) {
+                wx.hideLoading()
+                console.log(res);
+                if (res.data.code === 1) {
+                  let categoryIndex = that.data.categorys.findIndex(
+                    (item) => {
+                      return item.id == res.data.data.classification_id;
+                    }
+                  )
+                  that.setData({
+                    goodName: res.data.data.commodity_name,
+                    goodIntro: res.data.data.commodity_introduction,
+                    imageList: res.data.data.commodity_img,
+                    scribePrice: res.data.data.scribe_price,
+                    specifications: res.data.data.specifications == null ? [] : res.data.data.specifications,
+                    price: res.data.data.price,
+                    stock: res.data.data.stock,
+                    categoryIndex,
+                    isAddToGoodsBank: res.data.data.commodity_warehouse,
+                    startingPurchase: res.data.data.starting_purchase,
+                    purchaseRestrictionsNumber: res.data.data.purchase_restrictions_number,
+                    purchaseRestrictionsSecond: res.data.data.purchase_restrictions_second,
+                    startingPurchaseNumber: res.data.data.starting_purchase_number,
+                    prices: res.data.data.step_price == null ? [] : res.data.data.step_price,
+                    // 规格名称
+                    specificationText: res.data.data.specifications == null ? '统一规格' : res.data.data.specifications[0].title + '/' + res.data.data.specifications[0].price + '加币'
+                  })
+                } else {
+                  wx.showToast({
+                    title: res.data.msg,
+                    mask: true,
+                    icon: 'none'
+                  })
+                }
+              },
+              fail(err) {
+                wx.hideLoading()
+                wx.showToast({
+                  title: '发起网络请求失败',
+                  icon: 'none',
+                  mask: true
+                })
+              }
+            })
+          }
         } else {
           wx.showToast({
             title: res.data.msg,
@@ -266,14 +330,14 @@ Page({
                 prices: [],
                 showSpecification: true,
                 specifications: [{
-                  title: '',
-                  price: ''
-                },
-                {
-                  title: '',
-                  price: ''
-                }
-              ]
+                    title: '',
+                    price: ''
+                  },
+                  {
+                    title: '',
+                    price: ''
+                  }
+                ]
               })
             } else {
               that.setData({
@@ -740,6 +804,130 @@ Page({
       }
     })
   },
+  // 确认编辑
+  edit() {
+    let that = this;
+    // 商品名称必录校验
+    if (that.data.goodName == '') {
+      wx.showToast({
+        title: '商品名称未录入',
+        icon: 'none',
+        mask: true
+      })
+      return
+    }
+    // 商品简介必录校验
+    if (that.data.goodIntro == '') {
+      wx.showToast({
+        title: '商品简介未录入',
+        icon: 'none',
+        mask: true
+      })
+      return
+    }
+    // 商品图片必录校验
+    if (that.data.imageList.length == 0) {
+      wx.showToast({
+        title: '商品图片未添加',
+        icon: 'none',
+        mask: true
+      })
+      return
+    }
+    // 划线价格必录校验
+    if (that.data.scribePrice == '') {
+      wx.showToast({
+        title: '划线价格未录入',
+        icon: 'none',
+        mask: true
+      })
+      return
+    }
+    // 售价必录校验
+    if (that.data.price == '') {
+      wx.showToast({
+        title: '售价未录入',
+        icon: 'none',
+        mask: true
+      })
+      return
+    }
+    // 库存
+    let stock = that.data.stock;
+    if (stock == '') {
+      stock = '99999999';
+    }
+    // 如果不录规格也不录阶梯价-规格为统一规格，价格为售价
+    if (that.data.specifications.length == 0 && that.data.prices.length == 0) {
+      let list = that.data.specifications;
+      let obj = {};
+      obj.title = '统一规格';
+      obj.price = that.data.price;
+      list.push(obj);
+      that.setData({
+        specifications: list
+      })
+    }
+    wx.showLoading({
+      title: '提交中',
+      mask: true
+    })
+    wx.request({
+      url: api.Commodity_edit,
+      header: {
+        'Authorization': wx.getStorageSync('token')
+      },
+      method: 'POST',
+      data: {
+        id: that.data.id,
+        commodity_name: that.data.goodName,
+        commodity_img: that.data.imageList,
+        commodity_introduction: that.data.goodIntro,
+        scribe_price: that.data.scribePrice,
+        specifications: that.data.specifications,
+        price: that.data.price,
+        stock: stock,
+        classification_id: that.data.categorys[that.data.categoryIndex].id,
+        commodity_warehouse: that.data.isAddToGoodsBank,
+        starting_purchase: that.data.startingPurchase,
+        purchase_restrictions_number: that.data.purchaseRestrictionsNumber,
+        purchase_restrictions_second: that.data.purchaseRestrictionsSecond,
+        starting_purchase_number: that.data.startingPurchaseNumber,
+        step_price: that.data.prices
+      },
+      success(res) {
+        console.log(res);
+        wx.hideLoading()
+        if (res.data.code === 1) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'success',
+            mask: true,
+            success() {
+              setTimeout(()=>{
+                wx.setStorageSync('isReload', true)
+                wx.navigateBack()
+              }, 1500)
+            }
+          })
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+            mask: true,
+            icon: 'none'
+          })
+        }
+      },
+      fail(err) {
+        wx.hideLoading()
+        wx.showToast({
+          title: '发起网络请求失败',
+          icon: 'none',
+          mask: true
+        })
+      }
+    })
+  },
   // 阶梯价-判断不为空
   judgeNoyNullStepPrice(arr) {
     let isOK = true;

pages/addtogood/addtogood.wxml

@@ -26,6 +26,7 @@
   </view>
   <!-- 添加图片 -->
   <view class="upload">
+    <text style="color: red;">*</text>
     <view class="upload-item column3" wx:for="{{imageList}}">
       <image src="{{item}}" style="width: 100%;height: 100%;border-radius: 20rpx;"></image>
       <image class="del-icon" src="../../images/jian.png" data-index="{{index}}" catchtap="deleteSmallImage"></image>
@@ -145,7 +146,8 @@
 </view>
 <!-- 底部 -->
 <view class="foot">
-  <button catchtap="submit">确认添加</button>
+  <button catchtap="edit" wx:if="{{enterType == 'edit'}}">确认编辑</button>
+  <button catchtap="submit" wx:else>确认添加</button>
 </view>
 <!-- 组件 -->
 <!-- 分类弹出层 -->

pages/goodsbank/goodsbank.js

@@ -172,7 +172,10 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    if(wx.getStorageSync('isReload')) {
+      this.getGoodList()
+      wx.setStorageSync('isReload', false)
+    }
   },
 
   /**
@@ -538,7 +541,11 @@ Page({
   // 编辑商品
   editGoods(e) {
     let index = e.currentTarget.dataset.index;
-    console.log(index);
+    let id = this.data.goods[index].id;
+    // console.log(id);
+    wx.navigateTo({
+      url: '/pages/addtogood/addtogood?enterType=edit&id=' + id,
+    })
   },
   // 删除商品 
   deleteGoods() {

pages/goodsbank/goodsbank.less

@@ -423,7 +423,7 @@ page {
 	.popup-swiper {
 		border-bottom: 1rpx solid #e4e4e4;
 		.banner-box {
-			height: 550rpx;
+			min-height: 750rpx;
 			swiper-item {
 				// display: flex;
 				// justify-content: center;
@@ -433,7 +433,7 @@ page {
 					// height: 550rpx;
 					background: #FFF;
 					width: 100%;
-					height: 550rpx;
+          min-height: 750rpx;
 				}
 			}
 		}

pages/goodsbank/goodsbank.wxml

@@ -162,7 +162,7 @@
     <view class="popup-swiper">
       <swiper indicator-dots circular class="banner-box">
         <swiper-item wx:for="{{currentGood.commodity_img}}">
-          <image mode="aspectFit" src="{{item}}"></image>
+          <image mode="" src="{{item}}"></image>
         </swiper-item>
       </swiper>
     </view>

pages/goodsbank/goodsbank.wxss

@@ -360,7 +360,7 @@ page .foot .manage-checkbox-inner-right .button-2 {
   border-bottom: 1rpx solid #e4e4e4;
 }
 .popup-good-detail .popup-swiper .banner-box {
-  height: 550rpx;
+  min-height: 750rpx;
 }
 .popup-good-detail .popup-swiper .banner-box swiper-item {
   background: #FFF;
@@ -368,7 +368,7 @@ page .foot .manage-checkbox-inner-right .button-2 {
 .popup-good-detail .popup-swiper .banner-box swiper-item image {
   background: #FFF;
   width: 100%;
-  height: 550rpx;
+  min-height: 750rpx;
 }
 .popup-good-detail .popup-title {
   color: #494949;

pages/invitehelpmesell/invitehelpmesell.wxml

@@ -161,14 +161,14 @@
   <view wx:if="{{toptabindex == 1}}" class="bang" style="margin-bottom: {{openManageMode ? '158rpx;' : '0rpx'}};">
     <!-- 卖货团长标签(bodytabindex2为0或2) -->
     <view class="body-tab" wx:if="{{ bodytabindex2 == 0 || bodytabindex2 == 2 }}">
-      <view wx:for="{{bodytab2}}" style="background-color: {{index == bodytabindex2?'white':''}};" bindtap="bodytab2" data-index="{{index}}" wx:key="index">
+      <view class="body-tab-item" wx:for="{{bodytab2}}" style="background-color: {{index == bodytabindex2?'white':''}};" bindtap="bodytab2" data-index="{{index}}" wx:key="index">
         {{item}}
       </view>
     </view>
     <!-- 卖货团长标签(bodytabindex2为1) -->
     <view class="big-box" wx:if="{{ bodytabindex2 == 1 }}">
       <view class="body-tab2">
-        <view wx:for="{{bodytab2}}" style="background-color: {{index == bodytabindex2?'white':''}};" bindtap="bodytab2" data-index="{{index}}" wx:key="index">
+        <view class="body-tab-item" wx:for="{{bodytab2}}" style="background-color: {{index == bodytabindex2?'white':''}};" bindtap="bodytab2" data-index="{{index}}" wx:key="index">
           {{item}}
         </view>
       </view>

pages/invitehelpmesell/invitehelpmesell.wxss

@@ -105,7 +105,7 @@ page {
   align-items: center;
 }
 
-.body-tab2>view {
+.body-tab-item {
   width: 172rpx;
   height: 72rpx;
   display: flex;
@@ -115,6 +115,16 @@ page {
   font-size: 32rpx;
   color: #656565;
 }
+/* .body-tab2>view {
+  width: 172rpx;
+  height: 72rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 20rpx;
+  font-size: 32rpx;
+  color: #656565;
+} */
 .jiaobiao{
   width: 36rpx;
   height: 36rpx;

pages/myhomepage/myhomepage.wxss

@@ -1,6 +1,7 @@
 /* pages/helpsell/helpsell.wxss */
 page{
   background-color: #F7F7F7;
+  padding-bottom: 100rpx;
 }
 .nav-wrap {
   position: fixed;

pages/pintuandetail/pintuandetail.less

@@ -415,8 +415,10 @@ page {
 				color: #656565;
 
 				&>image {
-					height: 32rpx;
-					width: 32rpx;
+					// height: 32rpx;
+          // width: 32rpx;
+          height: 34rpx;
+					width: 34rpx;
 					margin-right: 20rpx;
 					margin-left: 10rpx;
 				}

pages/pintuandetail/pintuandetail.wxml

@@ -207,7 +207,7 @@
       </view>
     </view>
     <!-- 空状态 -->
-    <van-empty wx:if="{{orders.length == 0}}" description="暂无数据" />
+    <van-empty wx:if="{{orders.length == 0}}" description="{{pintuandetail.show_list == 0 ? '订单列表被隐藏':'暂无数据'}}" />
   </view>
   <view class="comment-list" wx:if="{{tabIndex === 1}}">
     <view class="comment" wx:for="{{comments}}">
@@ -225,7 +225,7 @@
       </view>
     </view>
     <!-- 空状态 -->
-    <van-empty wx:if="{{comments.length == 0}}" description="暂无数据" />
+    <van-empty wx:if="{{comments.length == 0}}" description="{{pintuandetail.comment == 0 ? '不支持评论':'暂无数据'}}" />
   </view>
 </view>
 <!-- 底部栏 -->

pages/pintuandetail/pintuandetail.wxss

@@ -274,8 +274,8 @@ page .goods-card .goods-card-top .right-menu {
   color: #656565;
 }
 page .goods-card .goods-card-top .right-menu > image {
-  height: 32rpx;
-  width: 32rpx;
+  height: 34rpx;
+  width: 34rpx;
   margin-right: 20rpx;
   margin-left: 10rpx;
 }

project.private.config.json

@@ -1,7 +1,7 @@
 {
   "setting": {
-    "compileHotReLoad": false,
-    "urlCheck": true,
+    "compileHotReLoad": true,
+    "urlCheck": false,
     "useIsolateContext": false
   },
   "condition": {
@@ -297,7 +297,7 @@
         {
           "name": "发布-创建新拼团-编辑商品-添加商品",
           "pathName": "pages/addtogood/addtogood",
-          "query": "",
+          "query": "enterType=edit&id=42",
           "launchMode": "default",
           "scene": null
         },