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

yvan.ni
2 parents 60727c92 f0a6983c
Showing 5 changed files with 38 additions and 16 deletions
packageB/pages/evaluate/evaluate.js
packageB/pages/evaluate/evaluate.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
pages/giftpack/evaluategift/evaluategift.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -140,6 +140,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         number: th.data.number,
+        fromtype:th.data.ftype,
         storeId: a.stoid
       }
     }).then(res => {
@@ -239,7 +240,7 @@ Page({
  
     if(options.fromtype){
           this.setData({ftype:parseInt(options.fromtype)}) ;
-          if(options.fromtype==4) 	th.judge_act();
+          if(options.fromtype==4 || options.fromtype==1 ) 	th.judge_act();
     }
     //th.query_bea();
  
@@ -288,7 +289,7 @@ Page({
  
         var ty=this.data.ftype?this.data.ftype:2;
         wx.redirectTo({
-          url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType="+ty+"&orderNumber="+this.data.number
+          url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType="+ty+"&orderNumber="+this.data.number+"&isdg=1"
         });
  
   },
@@ -305,7 +306,8 @@ Page({
         orderNumber: th.data.number,
         orderType: ty,
         storeId: a.stoid,
-        userId: d.user_id
+        userId: d.user_id,
+        isdg:1//是否是导购评价        
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -329,7 +331,8 @@ Page({
 	   var th=this;
 	   var chekc_data={};
 	   chekc_data['storeId'] = a.stoid;
-	   chekc_data['number'] =this.data.number;
+     chekc_data['number'] =this.data.number;
+     chekc_data['fromtype'] =this.data.ftype;
 	   getApp().request.get("/api/weshop/evaluation/evaluate/check",{
 		    data:chekc_data,
 			success:function(res){
@@ -102,7 +102,9 @@
     <view>查看已评价的订单</view>
   </view>
 </block>
-  
+<view wx:if="{{is_act==1}}" style="margin: auto;margin-bottom: 30rpx;"  class="Submission flex-center yellow-b" bindtap="clike_lb">
+    <view>点击领取礼品</view>
+  </view>
   <!-- 显示来个图标 -->
   <view class="show_icon" style="margin-top: 60rpx;">
 	  <view class="icon_item" bindtap="goto" data-url="/pages/index/index/index">
@@ -117,12 +119,13 @@
 	  		   <view>领券</view>
 		   </view>	   
 	  </view>  
+
+
+ 
   </view>
  
   <view style="height: 60rpx;"></view>
-  <view wx:if="{{is_act==1}}" style="margin: auto;margin-bottom: 30rpx;"  class="Submission flex-center yellow-b" bindtap="clike_lb">
-    <view>点击领取礼品</view>
-  </view>
+
  </view>
 <warn id="warn"></warn>
 </block>
@@ -286,7 +286,7 @@ Page({
   //------初始化加载----------
   onLoad: function (t) {
  
-    		
+    // console.log('onload');		
 		if(t && t.group_id) {
 			this.data.group_id = t.group_id;
 		};
@@ -317,8 +317,9 @@ Page({
  
     //---获取手机地址坐标--
     //--如果tg_id是空的话，分享回来--
+		// console.log('扫描海报gid');
     if (gid == undefined || gid == null || gid == "") {
-      var gid_str = decodeURIComponent(t.scene);
+      var gid_str = decodeURIComponent(t.sceneValue);
       gid_str = gid_str.split("_");
       gid = gid_str[0];
       if(gid.indexOf('.')!=-1) {
@@ -326,6 +327,11 @@ Page({
           gid=fir_arr[0];
           prom_type=fir_arr[1];
           prom_id=fir_arr[2];
+					// this.setData({
+					// 	prom_type: prom_type,
+					// 	prom_id: prom_id,
+					// 	group_id: fir_arr[2],
+					// });
           this.data.prom_type=prom_type;
           this.data.prom_id=prom_id;
 					this.data.group_id = fir_arr[2];
@@ -745,7 +751,7 @@ Page({
  
   //---展示---
   onShow: async function () {
-
+		// console.log('onshow');
     var goods_list = null, th = this, that = this;
     var show_prew_img = this.data.show_prew_img
     if (show_prew_img) {
@@ -763,8 +769,9 @@ Page({
 				id: this.data.group_id,
 			}
 		}).then(res => {
+			// console.log()
+		    // console.log('判断活动是否暂停=======》', res.data.data);
 		  if (res.data.code == 0) {
-		    // console.log('成团信息=======》', res.data.data);
 				if(res.data.data.pageData && res.data.data.pageData.length == 0) {
 					let obj = {
 					  day: '00',
@@ -797,6 +804,7 @@ Page({
  
  
     });
+		
     // 活动暂停显示空白
     if (this.data.isTimeUp) {
       wx.showModal({
@@ -4658,7 +4666,7 @@ Page({
     // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
     //   os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
  
-    console.log('path3......',path3);
+    // console.log('path3......',path3);
  
  
     // 读取文件成功则OK--
@@ -31,6 +31,7 @@ Page({
     orderNumber: "", //订单号
     orderGoodsId: "", //商品id
     orderType:1,
+    isdg:0,
  
     weappurltitle:"进入商城购物",
     weappurl:"/pages/index/index/index",
@@ -52,7 +53,8 @@ Page({
         "orderNumber": th.data.orderNumber,
         "orderType": th.data.orderType,
         "orderGoodsId": th.data.orderGoodsId,
-        "gifbagid": th.data.giftBagId
+        "gifbagid": th.data.giftBagId,
+        "isdg": th.data.isdg
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -133,12 +135,18 @@ Page({
   },
   onLoad: function(options) {
  
+    var getisdg=0;
+    if (options.isdg)
+    {
+      getisdg=options.isdg;
+    }
     var th = this;
     th.setData({
       getActId: options.actId,
       orderNumber: options.orderNumber,
       orderGoodsId: options.orderGoodsId,
-      giftBagId: options.giftBagId
+      giftBagId: options.giftBagId,
+      isdg: getisdg
     })
  
     var orderType = options.orderType;
@@ -276,7 +276,7 @@
               <view class="goods-name elli">{{data.goods_name}}</view>
             </view>
             <view class="goods-num">
-              <view class="sales">销量：{{prom_act.buy_num}}件</view>
+              <view class="sales">销量：{{prom_act.buy_num+prom_act.virtual}}件</view>
               <view class="stock">
                 折扣：{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折
               </view>