diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 738a610..cf996ad 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -303,7 +303,7 @@ Page({
})
},
order: function () {
- app.globalData.postProduct = null
+ app.globalData.postProduct = []
app.globalData.list = []
commonApi.user_post("/product/checkStock", {
sku_id: this.data.info.sku[this.data.skuIndex].id,
@@ -669,6 +669,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
+ app.globalData.postProduct = []
if (!wx.getStorageSync('jstrip_token')) {
return;
}
diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js
index 4f0d59a..aa11408 100644
--- a/pages/list/museum/index.js
+++ b/pages/list/museum/index.js
@@ -20,6 +20,15 @@ Page({
},
gotoDetail:function(e){
let item = e.currentTarget.dataset.item;
+ console.log(item);
+ if (item.id==5461) {
+ wx.navigateToMiniProgram({
+ appId: 'wxfef80ee1ab7e58a2',
+ path: 'pages/inners/main'
+ })
+ return;
+ }
+
util.gotoDetail(item,1);
},
gotoDetailOther: function(e) {
diff --git a/pages/order/card/index.js b/pages/order/card/index.js
index daa974d..dbe8f82 100644
--- a/pages/order/card/index.js
+++ b/pages/order/card/index.js
@@ -76,7 +76,7 @@ Page({
setLinkman:function(e){
let linkmanList = e.detail;
this.setData({
- productNum:linkmanList.length==0?1:linkmanList.length,
+ // productNum:linkmanList.length==0?1:linkmanList.length,
linkmanList:linkmanList
})
},
@@ -196,6 +196,12 @@ Page({
console.log(res)
})
},
+ //获取最高优惠券
+ getNewCoupon(e){
+ this.setData({
+ coupon:e.detail
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
diff --git a/pages/order/card/index.wxml b/pages/order/card/index.wxml
index dc5a550..638aeb7 100644
--- a/pages/order/card/index.wxml
+++ b/pages/order/card/index.wxml
@@ -32,7 +32,7 @@
邮寄
-
+
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 265207d..f48f637 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -315,8 +315,6 @@ Page({
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
- console.log(12312312321);
-
},
/**
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 6e3dbd9..bb104c2 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -36,6 +36,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+
this.setData({
product: app.globalData.product,
type: options.type,
@@ -47,7 +48,7 @@ Page({
ticket_type:app.globalData.product.sku.ticket_type || 1,
isCar:options.isCar
})
- console.log(app.globalData);
+
if (!app.globalData.product) {
util.back();
return;
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 0dac30d..efebf2e 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -35,7 +35,7 @@
-
diff --git a/pages/user/user.js b/pages/user/user.js
index ab9607c..7fcff9d 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -16,7 +16,8 @@ Page({
orderList: [],//订单列表
timeList: [],//倒计时
timerOut: null,//定时器
- formatTime:[]
+ formatTime:[],
+ showModel:false
},
/**
@@ -60,6 +61,11 @@ Page({
}
})
},
+ closeModel(){
+ this.setData({
+ showModel:false
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -85,19 +91,9 @@ Page({
util.pagePoint(e)
},
phoneCall:function(){
- wx.showModal({
- title:'呼叫人工客服',
- content:'0512-66555111\n客服服务时间：08:30-17:30',
- success:function(res){
- if (res.cancel) {
- return
- }else{
- wx.makePhoneCall({
- phoneNumber:'0512-66555111',
- })
- }
- }
- })
+ this.setData({
+ showModel:true
+ })
},
getList:function(){
commonApi.user_post("order/list",{
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 3702040..27baf57 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -73,7 +73,7 @@
在线客服
-->
- 呼叫人工客服
+ 人工客服
我的卡券
@@ -121,4 +121,21 @@
+
+
+
+
+ 即将跳转人工客服
+ 客服服务时间：08：30-17：30
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/user.wxss b/pages/user/user.wxss
index d503b9e..34d22ba 100644
--- a/pages/user/user.wxss
+++ b/pages/user/user.wxss
@@ -144,4 +144,82 @@ font-family: PingFang SC;
font-weight: 400;
color: #666666;
margin-top: 10rpx;
-}
\ No newline at end of file
+}
+.mask {
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ background-color: rgba(0, 0, 0, 0.5);
+ z-index: 999;
+ }
+ .model{
+ width: 561rpx;
+ min-height: 449rpx;
+ background: #FFFFFF;
+ border-radius: 13rpx;
+ position: absolute;
+ box-sizing: border-box;
+
+ }
+ .model-title{
+ text-align: center;
+ font-size: 34rpx;
+ font-family: PingFang SC;
+ font-weight: bold;
+ color: #333333;
+ margin-top: 32rpx;
+ box-sizing: border-box;
+
+ }
+ .model-content{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ flex-wrap: wrap;
+ margin-top: 100rpx;
+ font-size: 34rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ color: #333333;
+ }
+ .btn-list{
+ height: 106rpx;
+ width: 100%;
+ position: absolute;
+ bottom: 0;
+ border-top: 1rpx solid rgba(216, 216, 216, .99);
+ padding: 10rpx;
+ box-sizing: border-box;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ }
+ .model-btn{
+ width: 50%;
+ text-align: center;
+ height: 86rpx;
+ line-height: 86rpx;
+
+ font-size: 34rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ color: #333333;
+ }
+
+ button{
+ margin:0;
+ padding:0;
+ border-radius:0;
+ border:none;
+ background-color:transparent;
+ }
+
+ button::after{
+ border: none;
+ }
+
+
\ No newline at end of file