From 367c2ab4b5cc082eea0194968153ec953813461e Mon Sep 17 00:00:00 2001
From: YWQ HK IX <568170040@qq.com>
Date: Fri, 23 Dec 2022 00:56:52 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.js | 6 +-
components/shop/shop.wxml | 4 +-
ext.json | 41 +++--
pages/coupon/detail/index.js | 3 +-
pages/couponorder/detail/index.js | 70 +++++---
pages/couponorder/detail/index.json | 5 +-
pages/couponorder/detail/index.wxml | 23 +--
pages/joinFrDpell/index.js | 109 ++++++++-----
pages/joinFrDpell/index.json | 3 +-
pages/joinFrDpell/index.wxml | 56 ++++---
pages/order/detail/index.js | 218 +++++++++++++------------
pages/order/detail/index.json | 11 +-
pages/order/detail/index.wxml | 22 +--
pages/spellGroup/mySpellGroup/index.js | 11 +-
pages/theme/index1/index.js | 8 +-
project.config.json | 2 +-
project.private.config.json | 6 +-
17 files changed, 344 insertions(+), 254 deletions(-)
diff --git a/app.js b/app.js
index 8ea8cc9..9c5b074 100644
--- a/app.js
+++ b/app.js
@@ -2,14 +2,14 @@ let config = require("./config/config.js");
const { defaultObj, huanLeChengObj } = require("./utils/mouldStyle.js")
const Http = require("./utils/HttpBasics");
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
+//无商圈注释
+var myPluginInterface = requirePlugin('auto-points-plugin')
-var myPluginInterface = extConfig.attr.businessSwitch ? requirePlugin('auto-points-plugin') : null;
let businessSwitch = extConfig.attr.businessSwitch ? extConfig.attr.businessSwitch : false
-
App({
data: {
newArr: [], //存放分享二维进入消息信息
- businessSwitch: businessSwitch, //判断是否开启商圈自助积分
+ businessSwitch: businessSwitch || null, //判断是否开启商圈自助积分
},
onLaunch: function (options) {
diff --git a/components/shop/shop.wxml b/components/shop/shop.wxml
index 37e1127..c1d5431 100644
--- a/components/shop/shop.wxml
+++ b/components/shop/shop.wxml
@@ -25,11 +25,9 @@
-
-
-
+
diff --git a/ext.json b/ext.json
index 34dfe10..af9aa49 100644
--- a/ext.json
+++ b/ext.json
@@ -2,35 +2,45 @@
"ext": {
"attr": {
"car": {
+ "tjd": {
+ "payPath": "",
+ "tjdAppId": "wx6945d1bda68d7993"
+ },
"etcp": {
- "etcpAppId": "wx192b7d2e8dcbefd0",
- "etcpVersion": "release",
- "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"
- }
+ "payPath": "pages/pay/order-pay-open/main",
+ "etcpAppId": "wxc07f9d67923d676d",
+ "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"
+ },
+ "bolink": {
+ "payPath": "pages/park/park",
+ "bolinkAppId": "wxbd08b4baa10fcc1d"
+ },
+ "version": "release"
},
"mchId": "1604439800",
"imgProxy": [
{
- "newUrl": "https://ctest.malls.iformall.com/img",
+ "newUrl": "https://c.malls.iformall.com/img",
"orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
},
{
- "newUrl": "https://ctest.malls.iformall.com/img1",
+ "newUrl": "https://c.malls.iformall.com/img1",
"orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
},
{
- "newUrl": "https://ctest.malls.iformall.com/img2",
+ "newUrl": "https://c.malls.iformall.com/img2",
"orgUrl": "https://wx.qlogo.cn"
}
],
- "configUrl": "https://ctest.malls.iformall.com/C/api",
+ "configUrl": "https://c.malls.iformall.com/C/api",
+ "ifStoreApp": "0",
"businessSwitch": "1",
"ifHaveWebSocket": "0",
- "ifHaveCarModular": "1"
+ "ifHaveCarModular": "0"
},
- "name": "金泸商务",
- "weappId": "wx649b3be73c1afe47",
- "appVersion": "C.test.5.2.0"
+ "name": "富茂链客生产版",
+ "weappId": "wx6a2524a8286d687f",
+ "appVersion": "C.5.1.1"
},
"debug": false,
"tabBar": {
@@ -66,8 +76,7 @@
"selectedIconPath": "assets/images/user-a.png"
}
],
- "color": "#abb1be",
- "selectedColor": "#b2743d"
+ "custom": true
},
"window": {
"backgroundTextStyle": "dark",
@@ -81,11 +90,11 @@
"provider": "wxfab2bf944bfc4da6"
},
"live-player-plugin": {
- "version": "1.3.4",
+ "version": "1.3.5",
"provider": "wx2b03c6e691cd7370"
}
},
- "extAppid": "wx649b3be73c1afe47",
+ "extAppid": "wx6a2524a8286d687f",
"extEnable": true,
"permission": {
"scope.userLocation": {
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 32bb0f2..266ab77 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -571,7 +571,8 @@ Page({
console.log(res)
if (res.code == 200 && res.data.html) {
this.setData({
- curHtml: decodeURI(res.data.html)
+ curHtml: decodeURI(res.data.html),
+ type: res.data.type
})
app.globalData.curHtml = this.data.curHtml;
console.log(app.globalData.curHtml)
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index c98763d..e47aaf2 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -29,25 +29,26 @@ Page({
},
createDate: "",
expiredTime: "",
- validStartDate:"",
- validEndDate:"",
+ validStartDate: "",
+ validEndDate: "",
updateDate: "",
//存储计时器
setInter: "",
staticGamedata: {},
showIf: false,
curHtml: '',
- showhieRq:false,
- dynamicRq:"",
- expiredSeconds:0,
- templTiem:""
+ showhieRq: false,
+ dynamicRq: "",
+ expiredSeconds: 0,
+ templTiem: "",
+ mallList: []
},
- onUnload:function(){
+ onUnload: function () {
let that = this;
clearInterval(that.data.setInter);
clearInterval(that.data.templTiem);
},
- onHide:function(){
+ onHide: function () {
let that = this;
clearInterval(that.data.setInter);
clearInterval(that.data.templTiem);
@@ -92,7 +93,7 @@ Page({
// })
// }, 200)
// },
- setRq(){
+ setRq() {
let _this = this
_this.setData({
showhieRq: false,
@@ -113,10 +114,10 @@ Page({
TYPE: "couponorder",
ID: _this.data.dynamicRq
})
- if (res.data.expiredSeconds==0){
+ if (res.data.expiredSeconds == 0) {
+
+ } else {
- }else{
-
let inre = setInterval(() => {
if (_this.data.expiredSeconds > 1) {
_this.setData({
@@ -137,7 +138,7 @@ Page({
}
// util.qrcode("qrcode", url, 350, 350);
_this.createQrCode(url, "qrcode", 350, 350);
- }).catch(err=>{
+ }).catch(err => {
wx.showToast({
title: err.message,
icon: 'none',
@@ -170,13 +171,14 @@ Page({
},
onLoad: function (options) {
+ console.log(options, 'options');
let that = this;
that.setData({
code: options.quancode,
codeS: options.quancode.slice(0, 4) + `******` + options.quancode.slice(14),
couponorderstatus: options.couponorderstatus
});
-
+
if (
options.quancode &&
that.data.couponorderstatus == 0
@@ -184,6 +186,29 @@ Page({
//aaa
that.setRq()//动态二维码 //这个方法必须在拿到 options.quancode 后调用
that.getHtml(options.quancode);
+ // Http.get({
+ // url: config.api.couponMerchant,
+ // data: {
+ // couponChannelId: options.quancode
+ // }
+ // }).then(res => {
+ // const keys = Object.keys(res.data)
+ // const mallList = []
+ // keys.forEach(item => {
+ // const arr = item.split('|')
+ // const obj = {
+ // tenantId: arr[0],
+ // mallName: arr[1],
+ // merchantVoList: res.data[item],
+ // expand: true
+ // }
+ // mallList.push(obj)
+ // })
+ // this.setData({
+ // mallList: mallList
+ // })
+ // console.log(this.data.mallList, 'mallList');
+ // })
}
//获得优惠券的详情
that.data.setInter = setInterval(function () {
@@ -191,7 +216,7 @@ Page({
options.quancode &&
that.data.couponorderstatus == 0
) {
-
+
Http.get({
url: config.api.couponOrderDetail,
data: {
@@ -228,7 +253,7 @@ Page({
pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd hh:mm:ss"),
})
}
-
+
})
.catch(err => {
wx.showToast({
@@ -240,7 +265,7 @@ Page({
})
}
}, 2000);
-
+
/**
* 页面需要初始渲染的效果
*/
@@ -248,7 +273,7 @@ Page({
url: config.api.couponOrderDetail,
data: {
couponOrderId: options.quancode
- }
+ }
}).then(res => {
that.setData({
couponorderstatus: res.data.couponOrderStatus,
@@ -259,13 +284,13 @@ Page({
updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dd hh:mm:ss"),
createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dd hh:mm:ss")
});
- if (that.data.data.validStartDate && that.data.data.validEndDate){
+ if (that.data.data.validStartDate && that.data.data.validEndDate) {
that.setData({
validStartDate: util.formatTime(that.data.data.validStartDate, "yyyy-MM-dd hh:mm:ss"),
validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss")
})
}
-
+
})
.catch(err => {
wx.showToast({
@@ -288,16 +313,17 @@ Page({
this.setData({
curHtml: decodeURI(res.data.html)
})
+ console.log(this.data.curHtml, 'curhtml');
}
})
},
- upDataRq(){
+ upDataRq() {
console.log(1123)
},
createQrCode: function (url, canvasId, cavW, cavH) {
//调用插件中的draw方法,绘制二维码图片
let that = this;
- QR.api.draw(url, canvasId, cavW, cavH, function (res) {
+ QR.api.draw(url, canvasId, cavW, cavH, function (res) {
that.setData({
tempFilePath: res
})
diff --git a/pages/couponorder/detail/index.json b/pages/couponorder/detail/index.json
index bd9dfaf..5dffcc2 100644
--- a/pages/couponorder/detail/index.json
+++ b/pages/couponorder/detail/index.json
@@ -1,6 +1,7 @@
{
"usingComponents": {
"navbar": "../../../components/navbar/navbar",
- "store": "../../../components/store/index"
+ "store": "../../../components/store/index",
+ "shop": "../../../components/shop/shop"
}
-}
+}
\ No newline at end of file
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index 83d119e..aec0534 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -1,6 +1,6 @@
-
+
@@ -51,20 +51,21 @@
点一点刷新二维码
-
- 二维码在
- {{expiredSeconds}}s
- 后失效
-
-
+
+ 二维码在
+ {{expiredSeconds}}s
+ 后失效
+
+
- {{showIdFalg?code:codeS}}
-
+ {{showIdFalg?code:codeS}}
+
-
+
+
-
+
+
购买须知:
{{data.remark}}
-
+
+
+
+
diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js
index 3bda81e..93d5640 100644
--- a/pages/order/detail/index.js
+++ b/pages/order/detail/index.js
@@ -7,7 +7,7 @@ const imgurl = require("../../../utils/imgurl");
Page({
/**
* 页面的初始数据
- */
+ */
data: {
showIdFalg: false,
showFlag: false,
@@ -34,6 +34,7 @@ Page({
cardIf: false,
contentType: 0,
orderFlag: false, //判断是不是线上配送
+ mallList: []
},
showId() {
let this_ = this;
@@ -61,7 +62,7 @@ Page({
let code = e.currentTarget.dataset.text
wx.setClipboardData({
data: code,
- success: function() {
+ success: function () {
wx.showToast({
title: '复制成功',
icon: "none"
@@ -105,58 +106,81 @@ Page({
// }
Http.get({
- url: url,
+ url: url,
+ data: {
+ orderId: this.data.orderId
+ }
+ }).then(res => {
+ wx.hideLoading();
+ // if (res.data.level == 0) { //单券
+ // if (res.code == 200) {
+ // that.getUserInfo()
+ // that.setData({
+ // showPage: true,
+ // composeOrderType: res.data.composeOrderType
+ // })
+ // }
+ // let tempData = res.data
+ // if (tempData.deliveryInfo) tempData.deliveryInfo = JSON.parse(tempData.deliveryInfo)
+
+ // that.setData({
+ // order: res.data,
+ // supportTransfer: res.data.supportTransfer
+ // });
+ // that.getStaticGame()
+ // //createDate 创建时间
+ // var createDate = util.formatTime(res.data.createDate, "yyyy-MM-dd hh:mm:ss");
+ // that.setData({
+ // createDate: createDate
+ // });
+ // } else {
+
+ // if (that.data.orderFlag) {
+ that.getStaticGame()
+ var createDate = util.formatTime(res.data.orders[0].createDate, "yyyy-MM-dd hh:mm:ss");
+ let tempData = res.data.orders[0]
+ tempData.deliveryInfo = tempData.deliveryInfo ? JSON.parse(tempData.deliveryInfo) : "";
+ tempData.couponOrderIdS = tempData.couponOrderIdS ? tempData.couponOrderId.slice(0, 4) + `******` + tempData.couponOrderId.slice(14) : ''
+ that.setData({
+ order: tempData,
+ showPage: true,
+ createDate: createDate,
+ composeOrderType: tempData.composeOrderType
+ })
+ console.log(that.data.order)
+ Http.get({
+ url: config.api.couponMerchant,
data: {
- orderId: this.data.orderId
+ couponChannelId: that.data.order.couponChannelId
}
}).then(res => {
- wx.hideLoading();
- // if (res.data.level == 0) { //单券
- // if (res.code == 200) {
- // that.getUserInfo()
- // that.setData({
- // showPage: true,
- // composeOrderType: res.data.composeOrderType
- // })
- // }
- // let tempData = res.data
- // if (tempData.deliveryInfo) tempData.deliveryInfo = JSON.parse(tempData.deliveryInfo)
-
- // that.setData({
- // order: res.data,
- // supportTransfer: res.data.supportTransfer
- // });
- // that.getStaticGame()
- // //createDate 创建时间
- // var createDate = util.formatTime(res.data.createDate, "yyyy-MM-dd hh:mm:ss");
- // that.setData({
- // createDate: createDate
- // });
- // } else {
-
- // if (that.data.orderFlag) {
- that.getStaticGame()
- var createDate = util.formatTime(res.data.orders[0].createDate, "yyyy-MM-dd hh:mm:ss");
- let tempData = res.data.orders[0]
- tempData.deliveryInfo = tempData.deliveryInfo ? JSON.parse(tempData.deliveryInfo) : "";
- tempData.couponOrderIdS = tempData.couponOrderIdS? tempData.couponOrderId.slice(0, 4) + `******` + tempData.couponOrderId.slice(14):''
- that.setData({
- order: tempData,
- showPage: true,
- createDate: createDate,
- composeOrderType: tempData.composeOrderType
- })
- console.log(that.data.order)
- // }
- // }
+ const keys = Object.keys(res.data)
+ const mallList = []
+ keys.forEach(item => {
+ const arr = item.split('|')
+ const obj = {
+ tenantId: arr[0],
+ mallName: arr[1],
+ merchantVoList: res.data[item],
+ expand: true
+ }
+ mallList.push(obj)
+ })
+ this.setData({
+ mallList: mallList
+ })
+ console.log(this.data.mallList, 'mallList');
+ })
+ // }
+ // }
- })
+ })
.catch(error => {
wx.hideLoading();
wx.showModal({
title: '提示',
- content: error.message ? error.message:error.data,
+ content: error.message ? error.message : error.data,
showCancel: false
})
})
@@ -182,7 +206,7 @@ Page({
})
})
},
- phone: function(e) {
+ phone: function (e) {
let that = this;
console.log(e);
wx.makePhoneCall({
@@ -197,13 +221,13 @@ Page({
url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
})
},
- getUserInfo: function() {
+ getUserInfo: function () {
let that = this;
// 获取用户信息
Http.get({
- url: config.api.getScore,
- data: {}
- })
+ url: config.api.getScore,
+ data: {}
+ })
.then(res => {
console.log(res)
that.setData({
@@ -212,7 +236,7 @@ Page({
})
})
},
- onShareAppMessage: function(res) {
+ onShareAppMessage: function (res) {
app.globalData.previewFlag = true
if (res.from === 'button') {
console.log(res, 3333333333333333333333)
@@ -222,10 +246,10 @@ Page({
title: _this.data.userName + '赠送您一张' + _this.data.order.title,
path: '/pages/index/index?couponChannelId=' + this.data.order.couponChannelId + '&cuserId=' + this.data.order.cuserId + '&couponId=' + this.data.order.productId + '&coverImg=' + this.data.order.coverImg + '&userName=' + this.data.userName + '&avatarUrl=' + this.data.avatarUrl + '&couponOrderId=' + this.data.order.couponOrderId + '&updateDate=' + this.data.order.updateDate,
imageUrl: this.data.order.coverImg,
- success: function(res) {
+ success: function (res) {
// 转发成功
},
- fail: function(res) {
+ fail: function (res) {
// 转发失败
}
}
@@ -235,7 +259,7 @@ Page({
},
- powerDrawer: function(e) {
+ powerDrawer: function (e) {
let that = this;
console.log(e)
// couponOrderStatus
@@ -245,34 +269,28 @@ Page({
// 3 已经退款
if (that.data.mystatus == "" || that.data.mystatus == undefined) {
wx.navigateTo({
- url: `/pages/orderquanma/index?quancode=${
- e.currentTarget.dataset.quancode
- }&title=${e.currentTarget.dataset.title}&subtitle=${
- e.currentTarget.dataset.subtitle
- }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${
- e.currentTarget.dataset.couponorderstatus}&validstatus=${e.currentTarget.dataset.validstatus}
+ url: `/pages/orderquanma/index?quancode=${e.currentTarget.dataset.quancode
+ }&title=${e.currentTarget.dataset.title}&subtitle=${e.currentTarget.dataset.subtitle
+ }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${e.currentTarget.dataset.couponorderstatus}&validstatus=${e.currentTarget.dataset.validstatus}
&contentType=${that.data.contentType}`
});
} else {
wx.navigateTo({
- url: `/pages/orderquanma/index?quancode=${
- e.currentTarget.dataset.quancode
- }&title=${e.currentTarget.dataset.title}&subtitle=${
- e.currentTarget.dataset.subtitle
- }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${
- that.data.mystatus}&validstatus=${e.currentTarget.dataset.validstatus}
+ url: `/pages/orderquanma/index?quancode=${e.currentTarget.dataset.quancode
+ }&title=${e.currentTarget.dataset.title}&subtitle=${e.currentTarget.dataset.subtitle
+ }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${that.data.mystatus}&validstatus=${e.currentTarget.dataset.validstatus}
&contentType=${that.data.contentType}`
});
}
},
- gotogame: function() {
+ gotogame: function () {
let that = this;
wx.redirectTo({
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId,
})
},
// 买完卡跳转到立即使用页面
- gotoUse: function() {
+ gotoUse: function () {
wx.navigateTo({
url: '/pages/cardorder/index/index'
})
@@ -281,20 +299,20 @@ Page({
getStaticGame(token) {
let _this = this;
Http.get({
- url: config.api.getGame,
- data: {
- triggleAction: 3 // 购买触发
- }
- }).then(res => {
- if (res.data.id) {
- _this.setData({
- showIf: true
- })
- }
+ url: config.api.getGame,
+ data: {
+ triggleAction: 3 // 购买触发
+ }
+ }).then(res => {
+ if (res.data.id) {
_this.setData({
- staticGamedata: res.data
+ showIf: true
})
+ }
+ _this.setData({
+ staticGamedata: res.data
})
+ })
.catch(err => {
console.log(err);
})
@@ -306,7 +324,7 @@ Page({
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function(options) {
+ onLoad: function (options) {
let that = this;
if (options.dingdan && options.dingdan == "order") {
@@ -332,7 +350,7 @@ Page({
that.updetail()
},
- onShow: function() {
+ onShow: function () {
let that = this;
that.setData({
showButton: false
@@ -345,13 +363,13 @@ Page({
let that = this;
// 支付成功
Http.post({
- url: config.api.toOrderGroup,
- data: {
- id: orderGroupId,
- orderId,
- couponId: _this.data.order.productId
- }
- })
+ url: config.api.toOrderGroup,
+ data: {
+ id: orderGroupId,
+ orderId,
+ couponId: _this.data.order.productId
+ }
+ })
.then(res => {
wx.redirectTo({
url: `/pages/spellDetail/index?orderId=${orderId}&couponId=${_this.data.order.productId}&orderGroupId=${res.data.orderGroupId}`
@@ -396,7 +414,7 @@ Page({
wx.showLoading({
title: '订单正在处理中...',
})
- setTimeout(function() {
+ setTimeout(function () {
wx.hideLoading()
}, 5000)
that.payOrderUpdate(that.data.orderId, payOrderId, 1, '', '', that); // 支付成功
@@ -460,14 +478,14 @@ Page({
payOrderUpdate: (orderId, payOrderId, status, reason, type, _this) => {
// 支付成功
Http.post({
- url: config.api.payOrderUpdate,
- data: {
- payOrderId: payOrderId,
- composeOrderId: orderId,
- status: status,
- reason: reason
- }
- })
+ url: config.api.payOrderUpdate,
+ data: {
+ payOrderId: payOrderId,
+ composeOrderId: orderId,
+ status: status,
+ reason: reason
+ }
+ })
.then(res => {
wx.hideLoading();
_this.setData({
@@ -479,11 +497,11 @@ Page({
duration: 2000,
image: imgurl.success.url,
mask: false,
- success: function() {
+ success: function () {
wx.showLoading({
title: "加载中..."
});
- setTimeout(function() {
+ setTimeout(function () {
wx.hideLoading();
}, 1600);
setTimeout(() => {
@@ -510,7 +528,7 @@ Page({
.catch(err => {
console.log(err)
if (!type) {
- setTimeout(function() {
+ setTimeout(function () {
_this.payOrderUpdate(orderId, payOrderId, status, reason, type, _this);
}, 1500)
}
diff --git a/pages/order/detail/index.json b/pages/order/detail/index.json
index 616741a..5dffcc2 100644
--- a/pages/order/detail/index.json
+++ b/pages/order/detail/index.json
@@ -1,6 +1,7 @@
{
- "usingComponents": {
- "navbar": "../../../components/navbar/navbar",
- "store": "../../../components/store/index"
- }
- }
\ No newline at end of file
+ "usingComponents": {
+ "navbar": "../../../components/navbar/navbar",
+ "store": "../../../components/store/index",
+ "shop": "../../../components/shop/shop"
+ }
+}
\ No newline at end of file
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 6a2b43d..4627ea8 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -25,7 +25,8 @@
{{order.subTitle}}
- 下单时间:{{createDate}}
+ 下单时间:{{createDate}}
+
@@ -43,8 +44,7 @@
只有支付完成的时
才显示兑换码
-->
-
+
兑换码:
{{showIdFalg?order.couponOrderId:order.couponOrderIdS}}
@@ -73,9 +73,9 @@
快递单号:
-
+
{{order.deliveryInfo.expressageIdInput}}
-
+
复制
查询物流
@@ -95,14 +95,15 @@
-
+
+
礼券:
-
+
-
+
{{item.title}}
面额:{{item.priceStr}}元
@@ -120,11 +121,12 @@
- 转赠给微信好友
+ 转赠给微信好友
+
签收
-
+
是否确认收到商品?
签收后将完成订单
diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js
index ee0dcff..04f9e1d 100644
--- a/pages/spellGroup/mySpellGroup/index.js
+++ b/pages/spellGroup/mySpellGroup/index.js
@@ -408,8 +408,9 @@ Page({
//参与别人的拼团
gotoPartner() {
+ console.log(this.data.spellData.nickName, 'nickname');
wx.navigateTo({
- url: `/pages/joinFrDpell/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}&couponChannelId=${this.data.couponChannelId}&avatarUrl=${this.data.spellData.avatarUrl}&nickName=${this.data.spellData.nickName}`
+ url: `/pages/joinFrDpell/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}&nickName=${this.data.spellData.nickName}&couponChannelId=${this.data.couponChannelId}&avatarUrl=${this.data.spellData.avatarUrl}`
});
},
/**
@@ -474,10 +475,10 @@ Page({
data.salePrice = (data.salePrice / 100).toFixed(2);
data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd')
data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd')
- // that.setData({
- // data,
- // merchantVoList: data.merchantVoList
- // });
+ that.setData({
+ data,
+ // merchantVoList: data.merchantVoList
+ });
Http.get({
url: config.api.couponMerchant,
data: {
diff --git a/pages/theme/index1/index.js b/pages/theme/index1/index.js
index 8557992..f616e3a 100644
--- a/pages/theme/index1/index.js
+++ b/pages/theme/index1/index.js
@@ -1,9 +1,12 @@
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
console.log(extConfig, 'extConfig');
let ifStoreApp = extConfig.attr.ifStoreApp;
-let businessSwitch = 1 * extConfig.attr.businessSwitch ? extConfig.attr.businessSwitch : false
-console.log(businessSwitch, 'businessSwitch');
+
+// 无商圈注释
+const myPluginInterface = requirePlugin('auto-points-plugin')
let businessVersion = 1 * extConfig.attr.businessVersion
+
+let businessSwitch = 1 * extConfig.attr.businessSwitch ? extConfig.attr.businessSwitch : false
let mch_id = extConfig.attr.mchId
const navigationBarHeight = (getApp().statusBarHeight + 44) + "px"
const Http = require("../../../utils/HttpBasics");
@@ -12,7 +15,6 @@ const config = require("../../../config/config");
const QR = require("../../../utils/memberqrcode.js");
const util = require("../../../utils/util");
const bgColor = require("../../../utils/bgColor.js")
-const myPluginInterface = requirePlugin('auto-points-plugin') || ''
let app = getApp();
Page({
data: {
diff --git a/project.config.json b/project.config.json
index 0a33f27..79c196c 100644
--- a/project.config.json
+++ b/project.config.json
@@ -34,7 +34,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.11.2",
- "appid": "wxfa336cad86ed598d",
+ "appid": "wx453ae0d37f3550d0",
"projectname": "C",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
diff --git a/project.private.config.json b/project.private.config.json
index 9dec4b6..5bcf610 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -3,7 +3,9 @@
"projectname": "C",
"setting": {
"compileHotReLoad": true,
- "urlCheck": true
+ "urlCheck": true,
+ "preloadBackgroundData": false,
+ "useIsolateContext": true
},
- "libVersion": "2.27.1"
+ "libVersion": "2.28.1"
}
\ No newline at end of file