Merge branch 'work1.1_20190926' of http://git.vipzhuang.cn/wxd/MShopWeApp into work1.1_20190926

后端开发-许程
2 parents 7e47a326 94dd68ab
Showing 8 changed files with 1379 additions and 172 deletions
pages/user/add_comment/add_comment.js
pages/user/add_comment/add_comment.json
pages/user/add_comment/add_comment.wxml
pages/user/add_comment/add_comment.wxss
pages/user/collect_list/collect_list.js
pages/user/collect_list/collect_list.json
pages/user/collect_list/collect_list.wxml
pages/user/collect_list/collect_list.wxss
-var t = getApp(),oo=t.globalData, a = t.globalData.setting,os=a, e = t.request, s = require("../../../utils/util.js"),
-    i = require("../../../utils/selectFiles.js");
+var t = getApp(), oo = t.globalData, a = t.globalData.setting, os = a, e = t.request, s = require("../../../utils/util.js"),
+  i = require("../../../utils/selectFiles.js");
 var regeneratorRuntime = require('../../../utils/runtime.js');
  
 Page({
-    data: {
-        url: a.url,
-        resourceUrl: a.resourceUrl,
-        iurl: a.imghost,
-        defaultPhoto: a.resourceUrl + "/static/images/camera.png",
-        filePaths: [],
-        uploadPath: [],
-        maxWord: 0,
-        is_anonymous: !1,
-        goods_rank: 0,
-        service_rank: 0,
-        deliver_rank: 0,
-        content: "",
-        options: null,
-        isLongPress: !1,
-        userinfo:null,
-    },
-    onLoad:async function(a) {
-        var th=this;
-        console.log('onLoad');
-        console.log(a);
+  data: {
+    url: a.url,
+    resourceUrl: a.resourceUrl,
+    iurl: a.imghost,
+    defaultPhoto: a.resourceUrl + "/static/images/camera.png",
+    filePaths: [],
+    uploadPath: [],
+    maxWord: 0,
+    is_anonymous: !1,
+    goods_rank: 0,
+    service_rank: 0,
+    deliver_rank: 0,
+    content: "",
+    options: null,
+    isLongPress: !1,
+    userinfo: null,
+    imgs: [],
+    lenMore:0
+  },
+  onLoad: async function (a) {
+    var th = this;
+    console.log('onLoad');
+    console.log(a);
  
-        await getApp().request.promiseGet("/api/weshop/goods/get/"+os.stoid+"/"+a.goods_id,{1:1}).then(res=>{
-           a.img=th.data.iurl+res.data.data.original_img
-        })
+    await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + a.goods_id, { 1: 1 }).then(res => {
+      a.img = th.data.iurl + res.data.data.original_img
+    })
  
  
-        this.setData({options: a});
-        t.getUserInfo(function(e){
-          console.log(e);
-          th.setData({
-            userinfo:e
-          })
-        })
-    },
-    keyUpChangeNum: function(t) {
-        this.setData({
-            maxWord: t.detail.value.length
-        }), this.data.content = t.detail.value;
-    },
-    checkAnonymous: function() {
-        this.setData({
-            is_anonymous: !this.data.is_anonymous
+    this.setData({ options: a });
+    t.getUserInfo(function (e) {
+      console.log(e);
+      th.setData({
+        userinfo: e
+      })
+    })
+  },
+  keyUpChangeNum: function (t) {
+    this.setData({
+      maxWord: t.detail.value.length
+    }), this.data.content = t.detail.value;
+  },
+  checkAnonymous: function () {
+    this.setData({
+      is_anonymous: !this.data.is_anonymous
+    });
+  },
+  checkGoodsRank: function (t) {
+    this.setData({
+      goods_rank: parseInt(t.currentTarget.dataset.i) + 1
+    });
+  },
+  checkServiceRank: function (t) {
+    this.setData({
+      service_rank: parseInt(t.currentTarget.dataset.i) + 1
+    });
+  },
+  checkDeliverRank: function (t) {
+    this.setData({
+      deliver_rank: parseInt(t.currentTarget.dataset.i) + 1
+    });
+  },
+  selectPhotos: function (t) {
+    if (this.data.isLongPress) this.data.isLongPress = !1; else {
+      var a = this;
+      i.selectPhotos(this.data.filePaths, t.currentTarget.dataset.idx, function (t) {
+        a.setData({
+          filePaths: t
         });
-    },
-    checkGoodsRank: function(t) {
-        this.setData({
-            goods_rank: parseInt(t.currentTarget.dataset.i) + 1
-        });
-    },
-    checkServiceRank: function(t) {
-        this.setData({
-            service_rank: parseInt(t.currentTarget.dataset.i) + 1
-        });
-    },
-    checkDeliverRank: function(t) {
-        this.setData({
-            deliver_rank: parseInt(t.currentTarget.dataset.i) + 1
-        });
-    },
-    selectPhotos: function(t) {
-        if (this.data.isLongPress) this.data.isLongPress = !1; else {
-            var a = this;
-            i.selectPhotos(this.data.filePaths, t.currentTarget.dataset.idx, function(t) {
-                a.setData({
-                    filePaths: t
-                });
-            });
+      });
+    }
+  },
+  removePhoto: function (t) {
+    var a = this;
+    this.data.isLongPress = !0, i.removePhoto(this.data.filePaths, t.currentTarget.dataset.idx, function (t) {
+      a.setData({
+        filePaths: t
+      });
+    });
+  },
+  submitComment: function () {
+    var a = this;
+    if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank) return t.showWarning("请先打完分~");
+    this.uploadPhotos(function () {
+      e.post("/api/weshop/comment/savecomment", {
+        data: {
+          email: ' ',
+          is_show: 1,
+          goods_rank: a.data.goods_rank,
+          service_rank: a.data.service_rank,
+          deliver_rank: a.data.deliver_rank,
+          content: a.data.content,
+          goods_id: a.data.options.goods_id,
+          order_id: a.data.options.order_id,
+          user_id: oo.user_id,
+          store_id: os.stoid,
+          username: a.data.userinfo.nickname
+        },
+        success: function (a) {
+          wx.setStorageSync("user:comment:update", !0), t.showSuccess("评论成功", function () {
+            wx.navigateBack();
+          });
         }
-    },
-    removePhoto: function(t) {
-        var a = this;
-        this.data.isLongPress = !0, i.removePhoto(this.data.filePaths, t.currentTarget.dataset.idx, function(t) {
-            a.setData({
-                filePaths: t
-            });
-        });
-    },
-    submitComment: function() {
-        var a = this;
-        if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank) return t.showWarning("请先打完分~");
-        this.uploadPhotos(function() {
-          e.post("/api/weshop/comment/savecomment", {
-                data: {
-                    email:' ',
-                    is_show:1,
-                    goods_rank: a.data.goods_rank,
-                    service_rank: a.data.service_rank,
-                    deliver_rank: a.data.deliver_rank,
-                    content: a.data.content,
-                    goods_id: a.data.options.goods_id,
-                    order_id: a.data.options.order_id,
-                    user_id: oo.user_id,
-                    store_id:os.stoid,
-                    username: a.data.userinfo.nickname
-                }, 
-                success: function(a) {
-                    wx.setStorageSync("user:comment:update", !0), t.showSuccess("评论成功", function() {
-                        wx.navigateBack();
-                    });
-                }
-            });
-        });
-    },
-    uploadPhotos: function(t, a) {
-        if (0 == this.data.filePaths.length) return t();
-        if ("number" != typeof a) a = 0; else if (a >= this.data.filePaths.length) return t();
-        var s = this;
-        e.uploadFile("/api/user/upload_comment_img", {
-            filePath: s.data.filePaths[a],
-            name: "img_file",
-            success: function(e) {
-                s.data.uploadPath[a] = e.data.result, s.uploadPhotos(t, a + 1);
-            }
-        });
-    },
+      });
+    });
+  },
+  uploadPhotos: function (t, a) {
+    if (0 == this.data.filePaths.length) return t();
+    if ("number" != typeof a) a = 0; else if (a >= this.data.filePaths.length) return t();
+    var s = this;
+    e.uploadFile("/api/user/upload_comment_img", {
+      filePath: s.data.filePaths[a],
+      name: "img_file",
+      success: function (e) {
+        s.data.uploadPath[a] = e.data.result, s.uploadPhotos(t, a + 1);
+      }
+    });
+  },
  
-     //图片失败，默认图片
-    bind_bnerr2: function (e) {
+  //图片失败，默认图片
+  bind_bnerr2: function (e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
-      _errObj[_errImg] = a.imghost+"/public/images/default_goods_image_240.gif";
+    _errObj[_errImg] = a.imghost + "/public/images/default_goods_image_240.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
-  }
+  },
+  // 上传图片
+  chooseImg: function (e) {
+    var that = this;
+    var imgs = this.data.imgs;
+    if (imgs.length >= 3) {
+      this.setData({
+        lenMore: 1
+      });
+      setTimeout(function () {
+        that.setData({
+          lenMore: 0
+        });
+      }, 2500);
+      return false;
+    }
+    wx.chooseImage({
+      // count: 1, // 默认9
+      sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+      sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+      success: function (res) {
+        // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+        var tempFilePaths = res.tempFilePaths;
+        var imgs = that.data.imgs;
+        // console.log(tempFilePaths + '----');
+        for (var i = 0; i < tempFilePaths.length; i++) {
+          if (imgs.length >= 3) {
+            that.setData({
+              imgs: imgs
+            });
+            return false;
+          } else {
+            imgs.push(tempFilePaths[i]);
+          }
+        }
+        // console.log(imgs);
+        that.setData({
+          imgs: imgs
+        });
+      }
+    });
+  },
+  // 删除图片
+  deleteImg: function (e) {
+    var imgs = this.data.imgs;
+    var index = e.currentTarget.dataset.index;
+    imgs.splice(index, 1);
+    this.setData({
+      imgs: imgs
+    });
+  },
+  // 预览图片
+  previewImg: function (e) {
+    //获取当前图片的下标
+    var index = e.currentTarget.dataset.index;
+    //所有图片
+    var imgs = this.data.imgs;
+    wx.previewImage({
+      //当前显示图片
+      current: imgs[index],
+      //所有图片
+      urls: imgs
+    })
+  },
+
+  
 });
 \ No newline at end of file
 {
-    "navigationBarTitleText": "评价晒单",
+    "navigationBarTitleText": "评价宝贝",
     "enablePullDownRefresh": false
 }
 \ No newline at end of file
-<view class="goods-mes pd-bg-fff">
+<!-- <view class="goods-mes pd-bg-fff">
     <view class="goods-img">
         <image class="wh100" src="{{options.img}}" binderror="bind_bnerr2" data-errorimg="options.img"></image>
     </view>
@@ -22,7 +22,7 @@
 <!-- <view class="anonymous">
     <icon bindtap="checkAnonymous" color="{{is_anonymous?'red':'gray'}}" size="20" type="success"></icon> 匿名评价
 </view> -->
-<view class="score-list pd-bg-fff">
+<!-- <view class="score-list pd-bg-fff">
     <view class="score-title">
         <view>评分</view>
         <view>满意请给5分哦</view>
@@ -48,4 +48,134 @@
 </view>
 <view class="btn-wrap">
     <view bindtap="submitComment" class="submit-btn">提 交</view>
+</view> -->
+<view>
+  <!-- 商品评价 -->
+  <view class='commodity'>
+    <!-- 商品信息 -->
+    <view class='information flex-vertical'>
+      <image src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=3117916781,836883337&fm=26&gp=0.jpg"></image>
+      <view class="goods_name xc-black">
+        <!-- 商品名称 -->
+        <view class='ellipsis-2 fs32'>{{options.goods_name}}我弄饭v的v哦女v绝我弄饭v的v哦女v绝望愤怒冻死我弄饭v的v哦女v绝望愤怒冻死望愤怒冻死</view>
+        <!-- 商品价格，数量 -->
+        <view class='flex jc_sb balin'>
+          <!-- 价格 -->
+          <view class='flex-vertical balin'>
+            <view class="fs24">￥</view>
+            <view class="fs35">{{options.price}}3333.00</view>
+          </view>
+
+          <!-- 商品数量 -->
+          <view class='sum flex-vertical balin xc-black'>
+            <view class="fs24">x</view>
+            <view class="fs28">1</view>
+          </view>
+
+        </view>
+
+      </view>
+
+    </view>
+
+
+    <!-- 商品评价信息 -->
+    <view class="addComment">
+      <textarea class="fs24" placeholder="已经收到商品,快跟大家分享一下宝贝吧!" placeholder-class="fs24" maxlength="500"></textarea>
+      <view class="flex addimages">
+        <!-- 评论图片集合 -->
+        <view class="images">
+          <image class="rel" catchtap="previewImg" data-index="{{index}}" src="{{item}}" wx:for="{{imgs}}">
+            <image class="abs" src="../../../images/cancel.png" data-index="{{index}}" bindtap="deleteImg"></image>
+          </image>
+
+        </view>
+
+        <!-- 添加图片按钮框架 -->
+        <view class="addimage flex-center xc-ash" bindtap="chooseImg">
+          <view>
+            <view class="flex-center">
+              <image src="../../../images/camera.png"></image>
+            </view>
+            <view class="flex-center fs20">添加图片</view>
+            <view class="flex-center fs20">{{imgs.length>0?imgs.length:0}}/3</view>
+          </view>
+        </view>
+
+      </view>
+
+
+
+
+
+
+
+
+    </view>
+
+
+
+
+
+
+  </view>
+
+  <!-- 评价等级 -->
+
+  <view class="Grade">
+    <!-- 宝贝评分 -->
+    <view class="title flex-vertical">
+      <view class="column"></view>
+      <view class="fs28">宝贝评分</view>
+    </view>
+
+    <!-- 服务评级 -->
+    <view class="score-items">
+      <view class="score-item flex-vertical">
+        <view class="fs24">描述相符</view>
+        <view class="stars flex-vertical">
+          <image data-i="{{index}}" src="{{index<goods_rank?iurl+'/miniapp/images/StarsredCk.png':iurl+'/miniapp/images/StarswhiteUnCk.png'}}" wx:for="{{5}}" wx:key="{{index}}" bindtap="checkGoodsRank"></image>
+
+        </view>
+      </view>
+
+      <view class="score-item flex-vertical">
+        <view class="fs24">物流服务</view>
+        <view class="stars flex-vertical">
+          <image bindtap="checkDeliverRank" data-i="{{index}}" src="{{index<deliver_rank?iurl+'/miniapp/images/StarsredCk.png':iurl+'/miniapp/images/StarswhiteUnCk.png'}}" wx:for="{{5}}" wx:key="{{index}}"></image>
+
+        </view>
+      </view>
+      <view class="score-item flex-vertical">
+        <view class="fs24">服务态度</view>
+        <view class="stars flex-vertical">
+          <image src="{{index<service_rank?iurl+'/miniapp/images/StarsredCk.png':iurl+'/miniapp/images/StarswhiteUnCk.png'}}" bindtap="checkServiceRank" data-i="{{index}}" wx:for="{{5}}" wx:key="{{index}}"></image>
+
+
+        </view>
+
+      </view>
+
+    </view>
+
+  </view>
 </view>
+
+<!-- 是否匿名评价 -->
+<view class=" Whether ">
+
+  <!-- 选择是否匿名 -->
+  <view class="allClick flex-right-vertical ">
+    <icon class="radio " bindtap="checkAnonymous " color="{{is_anonymous? 'white': 'red'}} " size="15 " type="success "></icon>
+    <view class="fs24 ">匿名评价</view>
+  </view>
+
+  <view class="Submission flex-level ">
+    <view class="fs30 flex-level white " bindtap="submitComment ">
+      提交评价
+    </view>
+  </view>
+
+
+
+</view>
 \ No newline at end of file
-.goods-mes {
+/* .goods-mes {
     height: 100rpx;
     display: flex;
     padding: 30rpx;
@@ -119,4 +119,157 @@
     background-color: #f15353;
     color: #fff;
     margin: auto;
-}
 \ No newline at end of file
+} */
+
+/* 商品详情和评价 */
+
+.commodity {
+  height: 715rpx;
+  border-top: 6rpx solid rgb(245, 245, 245);
+  border-bottom: 6rpx solid rgb(245, 245, 245);
+  padding: 0rpx 30rpx;
+}
+
+.commodity .information {
+  height: 286rpx;
+}
+
+.commodity .information image {
+  width: 186rpx;
+  height: 186rpx;
+}
+
+.information .goods_name {
+  width: 480rpx;
+  margin-left: 25rpx;
+  height: 186rpx;
+}
+
+.information .goods_name .ellipsis-2 {
+  line-height: 40rpx;
+  height: 80rpx;
+}
+
+.information .goods_name .jc_sb {
+  margin-top: 60rpx;
+  color: rgb(212, 28, 52);
+  margin-right: 7rpx;
+}
+
+.information .goods_name .jc_sb .fs32 {
+  line-height: 40rpx;
+}
+
+.information .goods_name .jc_sb .sum {
+  margin-right: 5rpx;
+}
+
+.balin {
+  align-items: baseline;
+}
+
+.addComment {
+  height: 345rpx;
+  width: 690rpx;
+  background-color: rgb(248, 248, 248);
+  padding: 32rpx 0rpx 21rpx 0rpx;
+}
+
+.addComment textarea {
+  padding: 0rpx 18rpx;
+  height: 175rpx;
+  width: 654rpx;
+}
+
+.addComment .addimages {
+  padding: 0rpx 18rpx;
+  margin-top: 20rpx;
+  align-items: flex-end;
+  width: 652rpx;
+}
+
+.addComment .addimages .images {
+  height: 140rpx;
+}
+
+.addComment .addimages .images .rel {
+  width: 140rpx;
+  height: 100%;
+  overflow: visible;
+  margin-right: 15rpx;
+}
+
+.addComment .addimages .images image .abs {
+  width: 30rpx;
+  height: 30rpx;
+  top: -7rpx;
+  right: -7rpx;
+}
+
+.addComment .addimage {
+  width: 139rpx;
+  height: 139rpx;
+  border: 2rpx dashed rgb(196, 196, 196);
+  font-size: 16rpx;
+  margin-left: 6rpx;
+}
+
+.addComment .addimage image {
+  width: 60rpx;
+  height: 58rpx;
+}
+
+.Grade {
+  width: 100%;
+  height: 310rpx;
+  border-bottom: 6rpx solid rgb(245, 245, 245);
+  padding-left: 45rpx;
+}
+
+.Grade .title {
+  width: 100%;
+  height: 105rpx;
+}
+
+.Grade .title .column {
+  height: 30rpx;
+  border-left: 6rpx solid rgb(211, 27, 58);
+  margin-right: 12rpx;
+}
+
+.Grade .score-item {
+  height: 55rpx;
+  line-height: 55rpx;
+}
+
+.Grade .score-item .stars {
+  margin-left: 83rpx;
+}
+
+.Grade .score-item .stars image {
+  width: 35rpx;
+  height: 35rpx;
+  margin-right: 28rpx;
+}
+
+.Whether .flex-right-vertical {
+  height: 67rpx;
+  padding-right: 31rpx;
+}
+
+.Whether .flex-right-vertical .radio {
+  margin-right: 15rpx;
+}
+
+.Whether .Submission {
+  margin-top: 40rpx;
+}
+
+.Whether .white {
+  width: 364rpx;
+  height: 58rpx;
+  background-color: rgb(212, 28, 52);
+  border-radius: 40rpx;
+  line-height: 58rpx;
+}
+
 var t = function(t) {
     return t && t.__esModule ? t : {
-        default: t
+      default: t
     };
-}(require("../../../utils/LoadMore.js")), e = getApp(), a = e.request, o = new t.default();
-var oo = e.globalData.setting, app_d = e.globalData;
+  }(require("../../../utils/LoadMore.js")),
+  e = getApp(),
+  a = e.request,
+  o = new t.default();
+var oo = e.globalData.setting,
+  app_d = e.globalData;
  
 Page({
-    data: {
-        url: e.globalData.setting.imghost,
-        resourceUrl: e.globalData.setting.resourceUrl,
-        iurl: e.globalData.setting.imghost,
-        collects: null,
-        currentPage: 1
-    },
-    onLoad: function() {
-        o.init(this, "", "collects"), this.requestCollectList();
-    },
-    requestCollectList: function() {
-      var t = this, e = "/api/weshop/goodscollect/list?pageSize=10&user_id="
-         +app_d.user_id+"&store_id=" + oo.stoid+"&page=" + t.data.currentPage;
-        o.request(e, function(e) {
-            console.log("requestCollectList");
-            console.log(e);
-            t.data.currentPage++;
+  data: {
+    url: e.globalData.setting.imghost,
+    resourceUrl: e.globalData.setting.resourceUrl,
+    iurl: e.globalData.setting.imghost,
+    collects: null,
+    currentPage: 1,
+    curpage: 1,
+    collects_Recommend: [],
+    ismore: 0,
+    iscollects: 0,
+    loadName: null,
+    editEd: 0, //商品编辑按钮是否点击
+    isall: false, //是否全选
+    sum: 0,
+    total_collects:0,
+    total_goods:0,
+    pageSize:8,//分页数量
+  },
+  onLoad: function() {
+    o.init(this, "", "collects"),
+     this.requestCollectList();
+     // this.requestList();
+  },
+  requestCollectList: function() {
+    isShowLoading: 0;
+    var th = this;
+    e = "/api/weshop/goodscollect/list?" + "pageSize=" + th.data.pageSize +"&user_id=" +
+      app_d.user_id + "&store_id=" + oo.stoid + "&page=" + th.data.currentPage;
+      o.request(e, function(e) {
+         th.data.currentPage++;
+
+         if(th.data.total_collects)
+            th.setData({ iscollects: 1, total_collects:e.data.data.total})
+
+        if (th.data.total_collects<th.data.pageSize){
+          th.requestList();
+        }      
+    });
+  },
+
+  //--到底部刷新---
+  onReachBottom: function() {
+    if (this.data.currentPage*this.data.pageSize<this.data.total_collects){
+      this.requestCollectList();
+    }else{
+      this.requestList();
+    }
+       
+  },
+  cancelCollect: function(t) {
+    var e = t.currentTarget.dataset.id,
+      o = this;
+    a.delete("/api/weshop/goodscollect/del/" + oo.stoid + "/" + e, {
+      success: function(t) {
+        o.deleteItemData(e);
+      }
+    });
+  },
+  deleteItemData: function(t) {
+    for (var e = 0; e < this.data.collects.length; e++)
+      if (this.data.collects[e].collect_id == t) {
+        this.data.collects.splice(e, 1), this.setData({
+          collects: this.data.collects
         });
-    },
-    onReachBottom: function() {
-        o.canloadMore() && this.requestCollectList();
-    },
-    cancelCollect: function(t) {
-        var e = t.currentTarget.dataset.id, o = this;
-         a.delete("/api/weshop/goodscollect/del/" + oo.stoid+"/"+e, {
-            success: function(t) {
-                o.deleteItemData(e);
+        break;
+      }
+  },
+  //图片失败，默认图片
+  bind_bnerr: function (e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _errObj = {};
+    _errObj[_errImg] = this.data.url + "/miniapp/images/del/logo.jpg";
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+
+  },
+
+  //图片失败，默认图片
+  bind_bnerr2: function(e) {
+    var _errImg = e.target.dataset.errorimg;
+    var th = this;
+    this.setData({
+      [_errImg]: th.data.iurl + "/miniapp/images/default_g_img.gif",
+    })
+  },
+ 
+
+  requestList: function() {
+    this.setData({
+      loadName: '加载中...'
+    })
+    var e = this;
+    a.get("/api/weshop/goods/page", {
+      isShowLoading: 0,
+      data: {
+        store_id: 1,
+        user_id: oo.user_id,
+        page: e.data.curpage,
+        pageSize: 10
+      },
+      success: function(t) {
+        e.data.curpage++;
+        var arr1 = e.data.collects_Recommend;
+        var arr2 = t.data.data.pageData;
+        var arr3 = [...arr1, ...arr2];
+
+        var ismore = 0;
+        if (arr3.length == t.data.data.total) ismore = 1
+
+        e.setData({
+          collects_Recommend: arr3,
+          total_goods: t.data.data.total,
+          ismore_goods: ismore,
+          loadName: null
+        }), wx.stopPullDownRefresh();
+      }
+    });
+  },
+
+
+  goto: function(ee) {
+    // e.goto("/pages/index/index/index");
+    wx.switchTab({
+      url: '/pages/index/index/index',
+    })
+  },
+  //编辑商品显示
+  editcollects: function() {
+    var th = this.data;
+    var t = this;
+    if (th.editEd == 0) {
+      t.select_checked(false, null)
+      t.setData({
+        editEd: 1,
+      })
+    } else {
+      t.select_checked(false, null)
+      t.setData({
+        editEd: 0
+      })
+    }
+  },
+  iconClick: function(e) {
+    var th = this.data;
+    var index = e.currentTarget.dataset.index;
+    var collect = "collects[" + index + "].checked";
+    if (this.data.collects[index].checked == true) {
+      this.setData({
+        [collect]: false,
+        isall: 0,
+        sum: --th.sum
+      })
+    } else {
+      var id = th.collects[index].collect_id;
+      this.setData({
+        [collect]: true,
+        sum: ++th.sum
+      })
+      if (th.sum == th.collects.length) {
+        this.setData({
+          isall: 1
+        })
+      }
+    }
+  },
+  //全选为收藏商品checked为true
+  allClick: function() {
+    var th = this;
+    //判断是否全选
+    if (th.data.isall) {
+      for (var i = 0; i <= th.data.collects.length; i++) {
+        var collect = "collects[" + i + "].checked";
+        this.setData({
+          [collect]: false,
+          isall: 0
+        })
+      }
+      this.setData({
+        sum: 0
+      })
+    } else {
+      for (var i = 0; i <= th.data.collects.length; i++) {
+        var collect = "collects[" + i + "].checked";
+        this.setData({
+          [collect]: true,
+          isall: 1
+        })
+      }
+      this.setData({
+        sum: th.data.collects.length
+      })
+    }
+  },
+  //分页删除
+  alldelete: function(e) {
+    var th = this;
+    // 全选的话直接删除
+    if (th.data.isall) {
+      a.delete("/api/weshop/goodscollect/removeUser/" + oo.stoid + "/" + app_d.user_id, {
+        isShowLoading: 0,
+        success: function(e) {
+          th.setData({
+            collects: []
+          })
+          getApp().my_warnning("取消成功", 1, th);
+
+        }
+      })
+    } else { //按照多个id删除收藏商品
+  
+      var new_colls= [];
+      var collectId = th.data.collects;
+
+      var str="";
+      for (var i = 0; i < th.data.collects.length; i++) {
+        if (collectId[i].checked) {
+          str+= collectId[i].collect_id+",";     
+        }else{
+          new_colls.push(collectId[i]);
+        }
+      }
+       str = str.substr(0, str.length - 1);  
+       var url = "/api/weshop/goodscollect/removeByIds/" + oo.stoid + "/" + app_d.user_id + "/" + str;
+
+      a.delete(url, {
+          isShowLoading: 0,
+          success: function(e) {
+          
+            th.setData({
+              collects: new_colls,
+              sum: 0
+            })
+            // th.select_checked(false,null);
+              getApp().my_warnning("取消收藏成功", 1, th);
             }
-        });
-    },
-    deleteItemData: function(t) {
-        for (var e = 0; e < this.data.collects.length; e++) if (this.data.collects[e].collect_id== t) {
-            this.data.collects.splice(e, 1), this.setData({
-                collects: this.data.collects
-            });
-            break;
+          
+        })
+      
+    }
+  },
+  select_checked:function(check,sum){
+        var th = this;
+        if(sum==null){
+          for (var i = 0; i < this.data.collects.length; i++) {
+            var collect = "collects[" + i + "].checked";
+            th.setData({
+              [collect]: check
+            })
         }
-    },
-     
-    //图片失败，默认图片
-    bind_bnerr2: function (e) {
-          var _errImg = e.target.dataset.errorimg;
-          var th=this;
-          this.setData({
-            [_errImg]: th.data.iurl+"/miniapp/images/default_g_img.gif",
+        }else{
+          var collect = "collects[" + sum + "].checked";
+          th.setData({
+            [collect]: check
           })
-    }
+        }
+  }
 });
 \ No newline at end of file
 {
     "navigationBarTitleText": "我的收藏",
-    "enablePullDownRefresh": false
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+      "warn": "/components/long_warn/long_warn"
+    }
 }
 \ No newline at end of file
-<view class="container">
+<!-- <view class="container">
     <view class="collect-ul">
         <view class="collect-li" wx:for="{{collects}}" wx:key="{{index}}">
             <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
@@ -18,4 +18,185 @@
         <view class="no-data-title">没有相关的数据</view>
         <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
     </view>
+</view> -->
+<!-- 无收藏时显示 -->
+<view class="noCollection" wx:if="{{iscollects==0?false:true && collects.length<1}}">
+  <view class="flex-level">
+    <image src="../../../images/Nocollection.png"></image>
+  </view>
+  <view class="flex-level fs30 xc-ash">当前暂无收藏</view>
+  <view class="flex-level">
+    <navigator url="/pages/index/index/index" bindtap="goto">
+      <view class="flex-center fs28 white">去首页逛逛</view>
+    </navigator>
+  </view>
 </view>
+
+<view class="Collection" wx:if="{{collects.length>0}}">
+  <!-- 收藏商品 -->
+  <view class="commodity">
+    <!-- 商品数量 -->
+    <view class="sum flex-vertical-between">
+      <view class="flex-center">共{{collects.length}}件商品</view>
+      <view class="flex-right-vertical editEd" bindtap="editcollects">{{editEd?'完成':'编辑'}}</view>
+    </view> 
+    <!-- 商品集合 -->
+    <view class="{{editEd?'collects_max colls_max':'collects_max'}}">
+      <view class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}"  wx:for="{{collects}}" wx:key="{{index}}">
+        <view class="radioCheck iconClick" wx:if="{{editEd}}">
+          <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio>
+        </view>
+        <!-- 商品图片 -->
+        <view class="flex">
+          <view class="{{editEd?'collect_image iconrp':'collect_image'}}">
+            <image src="{{item.original_img}}" onerror="this.src='../../../images/right.png'"></image>
+          </view>
+
+          <!-- 商品属性 -->
+          <view class="attribute">
+
+            <view class="attribute_name ellipsis-2">
+              <view class="name fs32">{{item.goods_name}}</view>
+            </view>
+
+            <!-- 商品价格 -->
+            <view class="attribute_money flex-vertical line">
+              <view class="money_left flex-vertical line">
+                <!-- 优惠价 -->
+                <view class="price flex xc-wc">
+                  <view class="fs24">￥</view>
+                  <view class="fs40">{{item.shop_price}}</view>
+                </view>
+                <!-- 原价 -->
+                <view class="flex fs20 line through xc-ash">
+                  <view>零售价:</view>
+                  <view>￥{{item.market_price}}</view>
+                </view>
+              </view>
+
+              <view class="money_right flex" wx:if="{{!editEd}}">
+                <view class="similar flex-level fs20">
+                  <view>找相似</view>
+                </view>
+                <image src="../../../images/delete.png" bindtap="cancelCollect" data-id="{{item.collect_id}}"></image>
+              </view>
+
+            </view>
+
+          </view>
+
+        </view>
+      </view>
+
+    </view>
+
+  </view>
+
+
+
+  <view class="title" wx:if="{{collects.length>0}}">
+
+    <!-- <view>
+
+      <view class="China flex-level">
+        <view class="le flex-vertical">
+          <view class="one"></view>
+          <view class="two"></view>
+          <view class="three"></view>
+        </view>
+
+        <view class="Recommend flex-level" bindtap="requestList">热门好物</view>
+
+        <view class="le flex-vertical">
+          <view class="three flex-vertical"></view>
+          <view class="two"></view>
+          <view class="one"></view>
+        </view>
+      </view>
+
+ 
+      <view class="english flex-center">
+        <view class="silk"></view>
+        <view class="esh five-level-word">GOOD HOT THING</view>
+        <view class="silk"></view>
+      </view>
+
+    </view> -->
+    <view class="Recommend flex-center">
+      <view class="lin"></view>
+      <view class="flex-center">
+        <image src="../../../images/Diamonds.png"></image>
+        <view class="fs28">好物推荐</view>
+      </view>
+      <view class="lin"></view>
+    </view>
+
+    <view class="collects">
+      <view class="hang ">
+
+        <!-- 商品详情 -->
+        <view class="collect ib" wx:for="{{collects_Recommend}}">
+          <!-- 商品图片 -->
+          <image class="sp" src="{{iurl}}{{item.original_img}}" lazy-load="true" binderror="bind_bnerr2" data-url="../../../images/starsred" data-errorimg="../../../images/starsred"></image>
+          <view class="bottom">
+            <!-- 商品名称 -->
+            <view class="goods_name ellipsis-2 fs24">{{item.goods_name}}</view>
+            <!-- 商品价格 -->
+            <view class="money flex line">
+              <!-- 办卡价 -->
+              <view class="flex xc-wc line">
+                <view class="fs24">￥</view>
+                <view class="fs35">{{item.shop_price}}</view>
+              </view>
+              <!-- 原价 -->
+              <view class="price flex xc-ash">
+                <view class="fs24">￥</view>
+                <view class="fs24">{{item.market_price}}</view>
+              </view>
+
+            </view>
+
+          </view>
+
+        </view>
+     
+        <view wx:if="{{loadName!=null}}" class="load fs26 xc-ash flex-center">{{loadName}}</view>
+      </view>
+
+      <!-- 加载完毕提示 -->
+      <view class="nothing flex-center" wx:if="{{ismore!=0}}">
+        <view class="Foil"></view>
+        <view class="no_content fs24">没有更多内容了</view>
+        <view class="Foil"></view>
+      </view>
+
+
+
+    </view>
+
+  </view>
+
+
+</view>
+<!-- 全选收藏 -->
+<view class="abs flex-vertical" wx:if="{{editEd && collects.length>0}}">
+  <view class="left">
+    <!-- 全选收藏按钮 -->
+    <view class="flex-vertical fs28" bindtap="allClick">
+      <radio class="iconUn" color="rgb(214,1,33)" checked="{{isall}}"></radio>
+      <view>全选</view>
+    </view>
+
+    <view class="Number flex-vertical">
+      已选
+      <text class="co-red">{{sum>0?sum:'0'}}</text> 件
+    </view>
+  </view>
+  <view class="delete fs30 flex-center white" bindtap="alldelete">
+    删除
+  </view>
+
+
+</view>
+
+<warn id="warn"></warn>
 \ No newline at end of file
-.collect-ul {
+/* .collect-ul {
     width: 100%;
     background-color: #f0f2f5;
 }
@@ -46,4 +46,465 @@
     border-radius: 5rpx;
     color: #686868;
     font-size: 30rpx;
-}
 \ No newline at end of file
+} */
+
+page {
+  width: 100%;
+  background-color: rgb(245, 245, 245);
+  overflow-x: hidden;
+}
+
+.Collection {
+  overflow-x: hidden;
+}
+
+/* vip开卡框架 */
+
+.vip {
+  width: 100%;
+  height: 70rpx;
+  background-color: rgb(250, 242, 219);
+  font-size: 25rpx;
+  padding: 0rpx 31rpx;
+}
+
+.vip .vip_image {
+  width: 40rpx;
+  height: 40rpx;
+  background-color: rgb(55, 45, 13);
+  border-radius: 50%;
+  line-height: 70rpx;
+}
+
+.vip .vip_image image {
+  width: 25rpx;
+  height: 25rpx;
+  line-height: 70rpx;
+}
+
+.vip .vip_describe {
+  width: 502prx;
+  margin-left: 20rpx;
+  padding-right: 172rpx;
+  line-height: 70rpx;
+  border-right: 4rpx solid #000;
+  height: 25rpx;
+}
+
+.vip .vip_describe .vip_province_money {
+  color: rgb(254, 0, 0);
+}
+
+.vip .vip_card {
+  margin-left: 17rpx;
+  line-height: 70rpx;
+}
+
+.vip .vip_card .vip_go_image {
+  margin-left: 10rpx;
+}
+
+.vip .vip_card .vip_immediately {
+  color: rgb(56, 47, 14);
+}
+
+.vip .vip_card .vip_go_image image {
+  width: 35rpx;
+  height: 35rpx;
+}
+
+.commodity {
+  width: 100%;
+}
+
+/* 无收藏样式 */
+
+.noCollection image {
+  width: 329rpx;
+  height: 229rpx;
+  margin-top: 202rpx;
+}
+
+.noCollection .xc-ash {
+  margin-top: 41rpx;
+  font-weight: 600px;
+}
+
+.noCollection navigator {
+  margin-top: 73rpx;
+  border-radius: 40rpx;
+}
+
+.noCollection navigator view {
+  width: 247rpx;
+  height: 56rpx;
+  background-color: rgb(255, 72, 72);
+  border-radius: 40rpx;
+}
+
+/* 商品详情 */
+
+.commodity .sum {
+  font-size: 25rpx;
+  height: 70rpx;
+  background-color: rgb(245, 245, 245);
+  padding-left: 31rpx;
+  color: rgb(131, 131, 131);
+}
+
+.commodity .sum view {
+  height: 100%;
+  letter-spacing: 1rpx;
+}
+
+.commodity .sum .editEd {
+  width: 100rpx;
+  padding-right: 31rpx;
+}
+
+.colls_max {
+  padding-left: 30rpx;
+}
+
+.commodity .collects_max .collect {
+  width: 100%;
+  height: 244rpx;
+  border-bottom: 4rpx solid rgb(245, 245, 245);
+  background-color: rgb(255, 255, 255);
+  padding-right: 31rpx;
+}
+
+.commodity .collects_max .collect .collect_image {
+  height: 183rpx;
+  width: 183rpx;
+  margin-left: 31rpx;
+}
+
+.commodity .collects_max .collect .iconrp {
+  margin-left: 0rpx;
+}
+
+.commodity .collects_max .collect .collect_image image {
+  width: 100%;
+  height: 100%;
+}
+
+.commodity .collects_max .collect .attribute {
+  line-height: 68rpx;
+  height: 183rpx;
+  margin-left: 21rpx;
+}
+
+.commodity .collects_max .collect .attribute .attribute_name {
+  height: 68rpx;
+  align-items: center;
+  width: 474rpx;
+}
+
+.commodity .collects_max .collect .attribute .attribute_name .name {
+  line-height: 35rpx;
+}
+
+.commodity .collects_max .collect .attribute .attribute_money {
+  margin-top: 60rpx;
+  display: flex;
+  justify-content: space-between;
+  height: 50rpx;
+  align-items: flex-end;
+}
+
+.commodity .collects_max  .money_left {
+  height: 54rpx;
+}
+
+.commodity .collects_max .collect .attribute .attribute_money .money_left .price {
+  font-weight: 1000rpx;
+  color: rgb(212, 28, 52);
+  margin-right: 10rpx;
+  align-items: baseline;
+}
+
+.commodity .collects_max .collect .attribute .attribute_money .money_right {
+  align-items: flex-end;
+  padding-bottom: 1rpx;
+}
+
+.commodity .collects_max .collect .attribute .attribute_money .money_right .similar {
+  width: 90rpx;
+  height: 29rpx;
+  border-radius: 21rpx;
+  border: 1rpx solid rgb(147, 147, 147);
+  font-size: 18rpx;
+  margin-right: 22rpx;
+  color: rgb(89, 89, 89);
+  align-items: center;
+}
+
+.commodity .collects_max .collect .attribute .attribute_money .money_right view {
+  height: 27rpx;
+  line-height: 27rpx;
+}
+
+.commodity .collects_max .collect .attribute .attribute_money .money_right image {
+  width: 25rpx;
+  height: 29rpx;
+  margin-right: 10rpx;
+  margin-bottom: 1rpx;
+}
+
+.line {
+  align-items: baseline;
+}
+
+.title .collect {
+  background-color: rgb(255, 255, 255);
+}
+
+/* 热门好物 */
+
+/* .title .China {
+  width: 100%;
+  margin-top: 50rpx;
+  margin-bottom: 10rpx;
+  line-height: 0rpx;
+}
+
+.title .China .lin view {
+  width: 2rpx;
+}
+
+.title .China .le {
+  height: 40rpx;
+  color: rgb(51,51, 51);
+}
+
+.title .China .line .one {
+  height: 23rpx;
+  background-color: #000;
+  margin-left: 5rpx;
+}
+
+.title .China .line .two {
+  height: 15rpx;
+  background-color: #000;
+  margin-left: 5rpx;
+}
+
+.title .China .line .three {
+  height: 18rpx;
+  background-color: #000;
+  margin-left: 5rpx;
+}
+
+.title .China .Recommend {
+  margin: 0rpx 20rpx;
+  font-size: 28rpx;
+  line-height: 39rpx;
+  font-weight: bold;
+}
+
+.title .english .silk {
+  width: 214rpx;
+  height: 2rpx;
+  background-color: #000;
+}
+
+.title .english .esh {
+  margin: 0rpx 15rpx;
+} */
+
+/* .collects {
+  margin-top: 40rpx;
+} */
+
+.Recommend {
+  height: 95rpx;
+  padding-top: 7rpx;
+}
+
+.Recommend .lin {
+  width: 210rpx;
+  height: 2rpx;
+  background-color: rgb(167, 167, 167);
+}
+
+.Recommend .flex-center {
+  margin: 0 20rpx;
+  color: rgb(51, 51, 51);
+  font-weight: bold;
+}
+
+.Recommend .flex-center image {
+  margin-right: 5rpx;
+  width: 32rpx;
+  height: 29rpx;
+}
+
+.hang {
+  width: 100%;
+  margin: auto;
+  padding-left: 31rpx;
+}
+
+.hang .collect {
+  width: 335rpx;
+  height: 503rpx;
+  border-radius: 23rpx;
+  border: 1rpx solid rgb(214, 214, 214);
+  overflow: hidden;
+  margin-right: 14rpx;
+  margin-bottom: 10rpx;
+}
+
+.collect .bottom {
+  padding: 0rpx 16rpx;
+}
+
+.collect .bottom .goods_name {
+  height: 68rpx;
+}
+
+.collect .sp {
+  width: 100%;
+  height: 315rpx;
+}
+
+.collect .money {
+  margin-top: 40rpx;
+  line-height: 28rpx;
+  align-items: baseline;
+}
+
+.collect .money view {
+  display: flex;
+  align-items: baseline;
+  font-weight: 1000rpx;
+}
+
+.collect .Discount {
+  width: 156rpx;
+  height: 28rpx;
+  border-radius: 20rpx;
+  background-color: rgb(56, 56, 56);
+  font-size: 18rpx;
+  color: rgb(255, 255, 255);
+}
+
+.collect .Discount image {
+  height: 18rpx;
+  width: 18rpx;
+  line-height: 28rpx;
+  margin-right: 3rpx;
+}
+
+.collect.ml20 {
+  margin-left: 13rpx;
+}
+
+.fs24.dollar {
+  padding: 0rpx;
+}
+
+.through {
+  text-decoration: line-through;
+  color: rgb(155, 155, 155);
+  margin-left: 7rpx;
+}
+
+.money .price {
+  margin-left: 12rpx;
+  text-decoration: line-through;
+}
+
+.money .price view {
+  display: flex;
+  align-items: flex-end;
+}
+
+.province {
+  line-height: 28rpx;
+}
+
+.nothing {
+  height: 75rpx;
+  width: 100%;
+}
+
+.nothing .no_content {
+  margin: 0rpx 11rpx;
+  color: rgb(138, 138, 138);
+}
+
+.nothing .Foil {
+  width: 80rpx;
+  height: 2rpx;
+  background-color: rgb(138, 138, 138);
+}
+
+.iconUn {
+  margin-left: 15rpx;
+  margin-right: 21rpx;
+  transform: scale(1.0);
+}
+
+.Un {
+  margin-left: 0rpx;
+}
+
+.iconClick {
+  margin-left: 21rpx;
+  margin-right: 16rpx;
+}
+
+.radioCheck {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  width: 65rpx;
+  justify-content: center;
+}
+
+.scale {
+  transform: scale(0.8);
+}
+
+.load {
+  width: 100%;
+  height: 80rpx;
+  padding: 0rpx 31rpx;
+}
+
+.abs {
+  position: fixed;
+  left: 0rpx;
+  bottom: 0rpx;
+  height: 100rpx;
+  background-color: rgb(255, 255, 255);
+  width: 100%;
+}
+
+.abs .left {
+  display: flex;
+  justify-content: space-between;
+  width: 515rpx;
+  padding-left: 31rpx;
+}
+
+.abs .allClick {
+  margin-left: 31rpx;
+}
+
+.abs icon {
+  margin-right: 31rpx;
+}
+
+.abs .delete {
+  width: 235rpx;
+  height: 100%;
+  background-color: rgb(219, 27, 52);
+}
+
+.abs .Number {
+  margin-right: 18rpx;
+  letter-spacing: 0rpx;
+}