Browse Source

fix

dev_delivery
jiazhipeng 4 weeks ago
parent
commit
b921258ea5
  1. 8
      static/js/CommonFunction.js
  2. 2
      subPackages/pointsMall/index.vue
  3. 9
      subPackages/techan/order.vue
  4. 2
      subPackages/user/coupon.vue

8
static/js/CommonFunction.js

@ -10,6 +10,14 @@ Vue.prototype.envPropObj = {
score_daily_recommend: 679, score_daily_recommend: 679,
// 积分商城-分类-全部 // 积分商城-分类-全部
score_type_all: 680, score_type_all: 680,
// 积分商城-活动规则
score_rule_id: 2,
// 正式环境
// use_recommend_tag_id: 674,
// score_daily_recommend: 673,
// score_type_all: 672,
// score_rule_id: 7,
} }
// 格式化富文本 // 格式化富文本

2
subPackages/pointsMall/index.vue

@ -177,7 +177,7 @@
this.getJXList() this.getJXList()
this.getTypeList() this.getTypeList()
this.getProdListByType() this.getProdListByType()
this.getRule(2) this.getRule(this.envPropObj.score_rule_id)
}, },
methods: { methods: {
// //

9
subPackages/techan/order.vue

@ -312,6 +312,8 @@ export default {
isShoppingCart: false, isShoppingCart: false,
isInDeliveryTime: true, isInDeliveryTime: true,
firstInit: null,
}; };
}, },
@ -321,6 +323,10 @@ export default {
} }
this.$store.commit("choseCoupon", ""); this.$store.commit("choseCoupon", "");
this.handleOrderGoods() this.handleOrderGoods()
setTimeout(()=>{
this.firstInit = true
},2000)
}, },
onShow() { onShow() {
if (!this.isShoppingCart) { if (!this.isShoppingCart) {
@ -328,6 +334,9 @@ export default {
} }
// //
uni.$on("updateDataByConnect",this.getDataByConnect) uni.$on("updateDataByConnect",this.getDataByConnect)
if (this.firstInit) {
this.getDelivery()
}
}, },
onUnload(){ onUnload(){
uni.$off("updateDataByConnect",this.getDataByConnect) uni.$off("updateDataByConnect",this.getDataByConnect)

2
subPackages/user/coupon.vue

@ -199,7 +199,7 @@
key: that.password key: that.password
}, "/api/coupon/get_coupon").then((res) => { }, "/api/coupon/get_coupon").then((res) => {
console.log(res.code); console.log(res.code);
if (res.code == 200) { if (res.code == 200 || res.code == 1) {
that.coupon = [] that.coupon = []
that.navActive = 0 that.navActive = 0
this.getList(this.navList[0]) this.getList(this.navList[0])

Loading…
Cancel
Save