Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents ac0abe7d a0d489d7
Showing 2 changed files with 40 additions and 32 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -431,7 +431,7 @@ Page({
  
     //更新点击量
     getApp().request.put("/api/weshop/goods/updateClick", {
-      data: { store_id: os.stoid, goods_id: gid,user_id:getApp().globalData.user_id?getApp().globalData.user_id:0  }
+      data: { store_id: os.stoid, goods_id: gid }
     })
   },
  
@@ -580,6 +580,8 @@ Page({
       }
     })
  
+    this.getHistoryBuy(); //获取历史购买
+
     ee.setData({
       gallery: gallery,
       is_collect: is_collect,
@@ -3183,6 +3185,27 @@ Page({
     this.setData(ob);
   },
  
+  //历史购买
+  getHistoryBuy() {
+    let _this = this;
+    let req_data = {
+        store_id: os.stoid,
+        goods_id: this.data.gid,
+        pay_status: 1,
+        rndid: 1
+    };
+    getApp().request.promiseGet('/api/weshop/ordergoods/list', {
+        data: req_data,
+    })
+        .then(res => {
+            if (t.ajax_ok(res)) {
+                _this.setData({
+                    historyBuyInfo: res.data.data.pageData,
+                })
+            }
+        })
+},
+
   //--调用更新阶梯团的接口--
   update_jiti: function (id) {
     var th = this;
@@ -3832,33 +3855,17 @@ Page({
     getApp().pre_img(this.data.shareImgPath);
   },
  
-    onShareTimeline() {
-        getApp().globalData.no_clear=1;
-
-        var th=this;
-        var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
-        if (!store_name)
-            store_name = getApp().globalData.setting.appName;
-
-        var url = "goods_id=" + th.data.gid+"&pre_id="+th.data.pre_arr.id;
-        if (getApp().globalData.user_id) {
-            url += "&first_leader=" + getApp().globalData.user_id;
-        }
-
-        //-- 如果房间分享，且不是会员分享的 --
-        if (getApp().globalData.room_id &&
-            th.data.data.goods_id == getApp().globalData.room_goods_id &&
-            !getApp().globalData.room_user_share
-        ) {
-            url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
-        }
  
-        return {
-            title: this.data.data.goods_name + '-' + store_name,
-            imageUrl: this.data.gallery[0].image_url,
-            query: url
-        }
-    },
+  onShareTimeline() {
+      getApp().globalData.no_clear=1;
+    var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
+    if (!store_name)
+      store_name = getApp().globalData.setting.appName;
+    return {
+      title: this.data.data.goods_name + '-' + store_name,
+      imageUrl: this.data.gallery[0].image_url,
+    }
+  },
  
   clickCollapse() {
     this.setData({ flag: !this.data.flag, })
@@ -17,21 +17,22 @@
   <view class="goods-detail">
     <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">
  
-    <!-- 历史购买记录 -->
-    <view class="swiper-container">
+   	<!-- 左上角轮播 历史购买记录 -->
+     <view class="swiper-container" wx:if="{{historyBuyInfo.length}}">
 					<swiper class="swiper" autoplay="true" circular="true" vertical="true" interval="3000">
-						<swiper-item class="swiper-item" wx:for="">
+						<swiper-item class="swiper-item" wx:for="{{historyBuyInfo}}" wx:key="order_id">
 							<view class="item">
                 <view class="avatar-container">
-                  <image src=""></image>
+                  <image src="{{item.head_pic}}"></image>
                 </view>
 								<view class="flex ai_c pd10">
-									<view class="nickname ellipsis-1x">abson下单成功</view>
+									<view class="nickname ellipsis-1x">{{item.nickname}}下单成功</view>
 								</view>
 							</view>
 						</swiper-item>
 					</swiper>
 				</view>
+
       <!-- 视频 -->
       <!-- <swiper bindchange="swiperChange"class="xc-pictures  swiperContainer rel" current="{{swiperCurrent}}"
 	  indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> -->