Commit 6898e916841c48db6f32f7f4f4529ca73c535199

Authored by yvan.ni
2 parents 60727c92 f0a6983c

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

packageB/pages/evaluate/evaluate.js
@@ -140,6 +140,7 @@ Page({ @@ -140,6 +140,7 @@ Page({
140 getApp().request.promiseGet(url, { 140 getApp().request.promiseGet(url, {
141 data: { 141 data: {
142 number: th.data.number, 142 number: th.data.number,
  143 + fromtype:th.data.ftype,
143 storeId: a.stoid 144 storeId: a.stoid
144 } 145 }
145 }).then(res => { 146 }).then(res => {
@@ -239,7 +240,7 @@ Page({ @@ -239,7 +240,7 @@ Page({
239 240
240 if(options.fromtype){ 241 if(options.fromtype){
241 this.setData({ftype:parseInt(options.fromtype)}) ; 242 this.setData({ftype:parseInt(options.fromtype)}) ;
242 - if(options.fromtype==4) th.judge_act(); 243 + if(options.fromtype==4 || options.fromtype==1 ) th.judge_act();
243 } 244 }
244 //th.query_bea(); 245 //th.query_bea();
245 246
@@ -288,7 +289,7 @@ Page({ @@ -288,7 +289,7 @@ Page({
288 289
289 var ty=this.data.ftype?this.data.ftype:2; 290 var ty=this.data.ftype?this.data.ftype:2;
290 wx.redirectTo({ 291 wx.redirectTo({
291 - url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType="+ty+"&orderNumber="+this.data.number 292 + url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType="+ty+"&orderNumber="+this.data.number+"&isdg=1"
292 }); 293 });
293 294
294 }, 295 },
@@ -305,7 +306,8 @@ Page({ @@ -305,7 +306,8 @@ Page({
305 orderNumber: th.data.number, 306 orderNumber: th.data.number,
306 orderType: ty, 307 orderType: ty,
307 storeId: a.stoid, 308 storeId: a.stoid,
308 - userId: d.user_id 309 + userId: d.user_id,
  310 + isdg:1//是否是导购评价
309 } 311 }
310 }).then(res => { 312 }).then(res => {
311 if (res.data.code == 0) { 313 if (res.data.code == 0) {
@@ -329,7 +331,8 @@ Page({ @@ -329,7 +331,8 @@ Page({
329 var th=this; 331 var th=this;
330 var chekc_data={}; 332 var chekc_data={};
331 chekc_data['storeId'] = a.stoid; 333 chekc_data['storeId'] = a.stoid;
332 - chekc_data['number'] =this.data.number; 334 + chekc_data['number'] =this.data.number;
  335 + chekc_data['fromtype'] =this.data.ftype;
333 getApp().request.get("/api/weshop/evaluation/evaluate/check",{ 336 getApp().request.get("/api/weshop/evaluation/evaluate/check",{
334 data:chekc_data, 337 data:chekc_data,
335 success:function(res){ 338 success:function(res){
packageB/pages/evaluate/evaluate.wxml
@@ -102,7 +102,9 @@ @@ -102,7 +102,9 @@
102 <view>查看已评价的订单</view> 102 <view>查看已评价的订单</view>
103 </view> 103 </view>
104 </block> 104 </block>
105 - 105 +<view wx:if="{{is_act==1}}" style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center yellow-b" bindtap="clike_lb">
  106 + <view>点击领取礼品</view>
  107 + </view>
106 <!-- 显示来个图标 --> 108 <!-- 显示来个图标 -->
107 <view class="show_icon" style="margin-top: 60rpx;"> 109 <view class="show_icon" style="margin-top: 60rpx;">
108 <view class="icon_item" bindtap="goto" data-url="/pages/index/index/index"> 110 <view class="icon_item" bindtap="goto" data-url="/pages/index/index/index">
@@ -117,12 +119,13 @@ @@ -117,12 +119,13 @@
117 <view>领券</view> 119 <view>领券</view>
118 </view> 120 </view>
119 </view> 121 </view>
  122 +
  123 +
  124 +
120 </view> 125 </view>
121 126
122 <view style="height: 60rpx;"></view> 127 <view style="height: 60rpx;"></view>
123 - <view wx:if="{{is_act==1}}" style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center yellow-b" bindtap="clike_lb">  
124 - <view>点击领取礼品</view>  
125 - </view> 128 +
126 </view> 129 </view>
127 <warn id="warn"></warn> 130 <warn id="warn"></warn>
128 </block> 131 </block>
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -286,7 +286,7 @@ Page({ @@ -286,7 +286,7 @@ Page({
286 //------初始化加载---------- 286 //------初始化加载----------
287 onLoad: function (t) { 287 onLoad: function (t) {
288 288
289 - 289 + // console.log('onload');
290 if(t && t.group_id) { 290 if(t && t.group_id) {
291 this.data.group_id = t.group_id; 291 this.data.group_id = t.group_id;
292 }; 292 };
@@ -317,8 +317,9 @@ Page({ @@ -317,8 +317,9 @@ Page({
317 317
318 //---获取手机地址坐标-- 318 //---获取手机地址坐标--
319 //--如果tg_id是空的话,分享回来-- 319 //--如果tg_id是空的话,分享回来--
  320 + // console.log('扫描海报gid');
320 if (gid == undefined || gid == null || gid == "") { 321 if (gid == undefined || gid == null || gid == "") {
321 - var gid_str = decodeURIComponent(t.scene); 322 + var gid_str = decodeURIComponent(t.sceneValue);
322 gid_str = gid_str.split("_"); 323 gid_str = gid_str.split("_");
323 gid = gid_str[0]; 324 gid = gid_str[0];
324 if(gid.indexOf('.')!=-1) { 325 if(gid.indexOf('.')!=-1) {
@@ -326,6 +327,11 @@ Page({ @@ -326,6 +327,11 @@ Page({
326 gid=fir_arr[0]; 327 gid=fir_arr[0];
327 prom_type=fir_arr[1]; 328 prom_type=fir_arr[1];
328 prom_id=fir_arr[2]; 329 prom_id=fir_arr[2];
  330 + // this.setData({
  331 + // prom_type: prom_type,
  332 + // prom_id: prom_id,
  333 + // group_id: fir_arr[2],
  334 + // });
329 this.data.prom_type=prom_type; 335 this.data.prom_type=prom_type;
330 this.data.prom_id=prom_id; 336 this.data.prom_id=prom_id;
331 this.data.group_id = fir_arr[2]; 337 this.data.group_id = fir_arr[2];
@@ -745,7 +751,7 @@ Page({ @@ -745,7 +751,7 @@ Page({
745 751
746 //---展示--- 752 //---展示---
747 onShow: async function () { 753 onShow: async function () {
748 - 754 + // console.log('onshow');
749 var goods_list = null, th = this, that = this; 755 var goods_list = null, th = this, that = this;
750 var show_prew_img = this.data.show_prew_img 756 var show_prew_img = this.data.show_prew_img
751 if (show_prew_img) { 757 if (show_prew_img) {
@@ -763,8 +769,9 @@ Page({ @@ -763,8 +769,9 @@ Page({
763 id: this.data.group_id, 769 id: this.data.group_id,
764 } 770 }
765 }).then(res => { 771 }).then(res => {
  772 + // console.log()
  773 + // console.log('判断活动是否暂停=======》', res.data.data);
766 if (res.data.code == 0) { 774 if (res.data.code == 0) {
767 - // console.log('成团信息=======》', res.data.data);  
768 if(res.data.data.pageData && res.data.data.pageData.length == 0) { 775 if(res.data.data.pageData && res.data.data.pageData.length == 0) {
769 let obj = { 776 let obj = {
770 day: '00', 777 day: '00',
@@ -797,6 +804,7 @@ Page({ @@ -797,6 +804,7 @@ Page({
797 804
798 805
799 }); 806 });
  807 +
800 // 活动暂停显示空白 808 // 活动暂停显示空白
801 if (this.data.isTimeUp) { 809 if (this.data.isTimeUp) {
802 wx.showModal({ 810 wx.showModal({
@@ -4658,7 +4666,7 @@ Page({ @@ -4658,7 +4666,7 @@ Page({
4658 // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + 4666 // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
4659 // os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; 4667 // os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
4660 4668
4661 - console.log('path3......',path3); 4669 + // console.log('path3......',path3);
4662 4670
4663 4671
4664 // 读取文件成功则OK-- 4672 // 读取文件成功则OK--
pages/giftpack/evaluategift/evaluategift.js
@@ -31,6 +31,7 @@ Page({ @@ -31,6 +31,7 @@ Page({
31 orderNumber: "", //订单号 31 orderNumber: "", //订单号
32 orderGoodsId: "", //商品id 32 orderGoodsId: "", //商品id
33 orderType:1, 33 orderType:1,
  34 + isdg:0,
34 35
35 weappurltitle:"进入商城购物", 36 weappurltitle:"进入商城购物",
36 weappurl:"/pages/index/index/index", 37 weappurl:"/pages/index/index/index",
@@ -52,7 +53,8 @@ Page({ @@ -52,7 +53,8 @@ Page({
52 "orderNumber": th.data.orderNumber, 53 "orderNumber": th.data.orderNumber,
53 "orderType": th.data.orderType, 54 "orderType": th.data.orderType,
54 "orderGoodsId": th.data.orderGoodsId, 55 "orderGoodsId": th.data.orderGoodsId,
55 - "gifbagid": th.data.giftBagId 56 + "gifbagid": th.data.giftBagId,
  57 + "isdg": th.data.isdg
56 } 58 }
57 }).then(res => { 59 }).then(res => {
58 if (res.data.code == 0) { 60 if (res.data.code == 0) {
@@ -133,12 +135,18 @@ Page({ @@ -133,12 +135,18 @@ Page({
133 }, 135 },
134 onLoad: function(options) { 136 onLoad: function(options) {
135 137
  138 + var getisdg=0;
  139 + if (options.isdg)
  140 + {
  141 + getisdg=options.isdg;
  142 + }
136 var th = this; 143 var th = this;
137 th.setData({ 144 th.setData({
138 getActId: options.actId, 145 getActId: options.actId,
139 orderNumber: options.orderNumber, 146 orderNumber: options.orderNumber,
140 orderGoodsId: options.orderGoodsId, 147 orderGoodsId: options.orderGoodsId,
141 - giftBagId: options.giftBagId 148 + giftBagId: options.giftBagId,
  149 + isdg: getisdg
142 }) 150 })
143 151
144 var orderType = options.orderType; 152 var orderType = options.orderType;
pages/goods/goodsInfo/goodsInfo.wxml
@@ -276,7 +276,7 @@ @@ -276,7 +276,7 @@
276 <view class="goods-name elli">{{data.goods_name}}</view> 276 <view class="goods-name elli">{{data.goods_name}}</view>
277 </view> 277 </view>
278 <view class="goods-num"> 278 <view class="goods-num">
279 - <view class="sales">销量:{{prom_act.buy_num}}件</view> 279 + <view class="sales">销量:{{prom_act.buy_num+prom_act.virtual}}件</view>
280 <view class="stock"> 280 <view class="stock">
281 折扣:{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折 281 折扣:{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折
282 </view> 282 </view>