diff --git a/packageB/pages/evaluate/evaluate.js b/packageB/pages/evaluate/evaluate.js
index 5cb90b6..c04f7a1 100644
--- a/packageB/pages/evaluate/evaluate.js
+++ b/packageB/pages/evaluate/evaluate.js
@@ -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){
diff --git a/packageB/pages/evaluate/evaluate.wxml b/packageB/pages/evaluate/evaluate.wxml
index e2db52d..8cc0d3d 100644
--- a/packageB/pages/evaluate/evaluate.wxml
+++ b/packageB/pages/evaluate/evaluate.wxml
@@ -102,7 +102,9 @@
查看已评价的订单
-
+
+ 点击领取礼品
+
@@ -117,12 +119,13 @@
领券
+
+
+
-
- 点击领取礼品
-
+
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 2085de5..64c9015 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -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--
diff --git a/pages/giftpack/evaluategift/evaluategift.js b/pages/giftpack/evaluategift/evaluategift.js
index 60b0312..440ab7c 100644
--- a/pages/giftpack/evaluategift/evaluategift.js
+++ b/pages/giftpack/evaluategift/evaluategift.js
@@ -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;
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index a28d69e..f43e314 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -276,7 +276,7 @@
{{data.goods_name}}
- 销量：{{prom_act.buy_num}}件
+ 销量：{{prom_act.buy_num+prom_act.virtual}}件
折扣：{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折