diff --git a/src/utils/utils.js b/src/utils/utils.js index 92d0032..685f82e 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -209,7 +209,7 @@ export default { deviceInfo: this.myDeviceInfo, salt: salt, sign_type: "md5", - token: sessionStorage.getItem("wx_Token"), //c23849735f3442f3b95f7bec816317ae sessionStorage.getItem("wx_Token") + token: sessionStorage.getItem("wx_Token"), //c23849735f3442f3b95f7bec816317ae sessionStorage.getItem("wx_Token") orgId: this.myOrgId }; return reqData; diff --git a/src/views/binding/binDing.vue b/src/views/binding/binDing.vue index 26f4b92..d180ab7 100644 --- a/src/views/binding/binDing.vue +++ b/src/views/binding/binDing.vue @@ -4,12 +4,12 @@ -
- 绑定 + 绑定
@@ -148,7 +148,7 @@ export default { width: 120px; height: 48px; line-height: 48px; - background: #ef4f4f; + background: #26a2ff; color: #fff; text-align: center; border: 0; diff --git a/src/views/cards/Cards.vue b/src/views/cards/Cards.vue index 459cff8..963eba5 100644 --- a/src/views/cards/Cards.vue +++ b/src/views/cards/Cards.vue @@ -44,7 +44,8 @@ - 购买会员卡 + + 购买会员卡 diff --git a/src/views/cards/buyCard.vue b/src/views/cards/buyCard.vue index 1f24aad..3817170 100644 --- a/src/views/cards/buyCard.vue +++ b/src/views/cards/buyCard.vue @@ -45,9 +45,9 @@
  • 购买数量
    - + - {{cardNum}} - + {{cardNum}} + +
    • @@ -87,7 +87,7 @@
    - 确定购买 + 确定购买
    @@ -196,11 +196,11 @@ export default { carNumberVisible: false, parkMoreVisible: false, cardNum: 1, // 卡数量 - unitPrice: 10, // 单价 - disPrice: 9, // 优惠金额 - needPay: 1, // 应付 + unitPrice: 0, // 单价 + disPrice: 0, // 优惠金额 + needPay: 0, // 应付 agreement: false, - typeNum: 1, // 卡类型判断 + typeNum: 0, // 卡类型判断 showHideOnBlur: false, // 购买协议 createVipCardOrder: {}, // 创建订单对象 orderId: "" // 订单号 @@ -274,7 +274,7 @@ export default { }, // 打开时间选择器 selectData() { - // this.dateVal = this.startData + this.dateVal = this.startData this.$refs["datePicker"].open(); // console.log(this.startData) // this.endDate = this.startData.setMonth(this.startData.getMonth()+1) @@ -302,6 +302,7 @@ export default { }); }, handleConfirm() { + console.log('11111'); console.log(this.dateVal); this.startData = this.$utils.timestampToTime(this.dateVal); // this.endDate = this.dateVal.setMonth(this.dateVal.getMonth() + 1); diff --git a/src/views/cards/renew.vue b/src/views/cards/renew.vue index 8479fa8..8c16a59 100644 --- a/src/views/cards/renew.vue +++ b/src/views/cards/renew.vue @@ -45,9 +45,9 @@
  • 购买数量
    - + - {{cardNum}} - + {{cardNum}} + +
    • @@ -79,7 +79,7 @@
    - 确定购买 + 确定购买
    @@ -268,7 +268,7 @@ export default { jsondata.terminalSource = "3"; // 请求端来源 1： 任你停 2：pda 3：微信公共号 jsondata.paySource = "3"; jsondata.couponPersonId = ""; - jsondata.openId = 'o0Moh6eQhTm5bZVqT6wjdSUsZonM'; // o0Moh6eQhTm5bZVqT6wjdSUsZonM sessionStorage.getItem("wx_openId") + jsondata.openId = sessionStorage.getItem("wx_openId"); // o0Moh6eQhTm5bZVqT6wjdSUsZonM sessionStorage.getItem("wx_openId") jsondata.sign = this.$utils.signObject(jsondata); weixinpay(jsondata).then(res => { console.log(data); diff --git a/src/views/mySelf/feedback/suggestionBack.vue b/src/views/mySelf/feedback/suggestionBack.vue index 64d132a..b3994fe 100644 --- a/src/views/mySelf/feedback/suggestionBack.vue +++ b/src/views/mySelf/feedback/suggestionBack.vue @@ -17,7 +17,7 @@
    - 提交 + 提交
    diff --git a/src/views/mySelf/selfNav.vue b/src/views/mySelf/selfNav.vue index 89cbed7..7707fd2 100644 --- a/src/views/mySelf/selfNav.vue +++ b/src/views/mySelf/selfNav.vue @@ -1,12 +1,41 @@