diff --git a/README.md b/README.md index b0502b5..c3cd127 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,25 @@ ## 更新日志 +### v1.1.39 + +``` +优化:后台菜单超出显示滚动条 +优化:取消收集formid +优化:后台门店管理添加筛选条件 +优化:回退余额时判断用户是否存在 +优化:小程序端授权登录流程 +优化:超管后台新增商城ID错误 +修复:优惠券和积分叠加计算错误 +修复:后台选择门店未显示全部 +修复:数据统计权限问题报错 +修复:订单支付成功短信提醒 +修复:砍价商品列表价格排序报错 +修复:小程序端订单页未支付提示 + +注:本次更新须重新发布小程序 +``` + ### v1.1.38 ``` diff --git a/app.js b/app.js index b50609b..b549e98 100644 --- a/app.js +++ b/app.js @@ -320,16 +320,18 @@ App({ /** * 记录formId + * (因微信模板消息已下线,所以formId取消不再收集) */ saveFormId(formId) { - let _this = this; - console.log('saveFormId'); - if (formId === 'the formId is a mock one') { - return false; - } - _this._post_form('wxapp.formId/save', { - formId: formId - }, null, null, null, false); + return true; + // let _this = this; + // console.log('saveFormId'); + // if (formId === 'the formId is a mock one') { + // return false; + // } + // _this._post_form('wxapp.formId/save', { + // formId: formId + // }, null, null, null, false); }, /** diff --git a/components/actionsheet/index.wxml b/components/actionsheet/index.wxml index de6b80d..1825897 100644 --- a/components/actionsheet/index.wxml +++ b/components/actionsheet/index.wxml @@ -7,7 +7,7 @@ - + {{ item.text }} diff --git a/pages/category/list.wxss b/pages/category/list.wxss index 6e4be6a..0c28715 100644 --- a/pages/category/list.wxss +++ b/pages/category/list.wxss @@ -109,7 +109,7 @@ } .category-list .right .cont .title { - height: 76rpx; + height: 72rpx; line-height: 1.3; } diff --git a/pages/order/detail.js b/pages/order/detail.js index fd58f58..27a20f0 100644 --- a/pages/order/detail.js +++ b/pages/order/detail.js @@ -176,7 +176,7 @@ Page({ _this.getOrderDetail(orderId); }, fail() { - App.showError(result.msg.success); + App.showError(result.msg.error); }, }); } diff --git a/pages/sharing/order/detail/detail.js b/pages/sharing/order/detail/detail.js index 4f5aefe..8be30c9 100644 --- a/pages/sharing/order/detail/detail.js +++ b/pages/sharing/order/detail/detail.js @@ -175,7 +175,7 @@ Page({ _this.getOrderDetail(orderId); }, fail() { - App.showError(result.msg.success); + App.showError(result.msg.error); }, }); } diff --git a/pages/sharp/index/index.wxss b/pages/sharp/index/index.wxss index 103165b..1f08f47 100644 --- a/pages/sharp/index/index.wxss +++ b/pages/sharp/index/index.wxss @@ -139,7 +139,7 @@ page, .container { .goods-item .goods-info .goods-name { font-size: 28rpx; - min-height: 76rpx; + min-height: 72rpx; margin-bottom: 20rpx; } diff --git a/version.json b/version.json index c44071b..bca5dee 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "1.1.38" + "version": "1.1.39" }