wanma-benteng
/
new-mshop-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：积分转换错误信息为提示，可能导致点击转换表单无效 

修复：当前积分变更记录标题过长时，当前记录样式错误。
This commit is contained in:
wuhui_zzw 2023-11-13 15:04:28 +08:00
parent e30a7de45d
commit af9da1d774
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.js
View File

@ -27,8 +27,8 @@ let cookieName = "VCONSOLE",
query = parseQuery(), query = parseQuery(),
urlSpread = query["spread"], urlSpread = query["spread"],
vconsole = query[cookieName.toLowerCase()], vconsole = query[cookieName.toLowerCase()],
md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式 md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //MD5 加密开启vconsole模式
md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式 md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //MD5 加密关闭vconsole模式
if (urlSpread !== undefined) { if (urlSpread !== undefined) {
var spread = Cache.get(SPREAD); var spread = Cache.get(SPREAD);

4
manifest.json
View File

@ -96,7 +96,7 @@
"share" : { "share" : {
"weixin" : { "weixin" : {
"appid" : "", "appid" : "",
"UniversalLinks" : "https://mer.crmeb.net/" "UniversalLinks" : ""
} }
}, },
"geolocation" : { "geolocation" : {
@ -112,7 +112,7 @@
"weixin" : { "weixin" : {
"appid" : "", "appid" : "",
"appsecret" : "", "appsecret" : "",
"UniversalLinks" : "https://mer.crmeb.net/" "UniversalLinks" : ""
} }
}, },
"ad" : {} "ad" : {}

9
pages/users/user_integral/index.vue
View File

@ -32,7 +32,7 @@
<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text> <text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
</view>--> </view>-->
<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index"> <view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
<view> <view class="item-title-and-time">
<view class='state'>{{item.mark}}</view> <view class='state'>{{item.mark}}</view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>
</view> </view>
@ -334,6 +334,10 @@ export default {
content: res.message, content: res.message,
}); });
}).catch(err => { }).catch(err => {
uni.showModal({
title: '提示',
content: err,
});
console.log("错误 catch：",err); console.log("错误 catch：",err);
}) })
} }
@ -569,6 +573,9 @@ page {
height: 756rpx; height: 756rpx;
overflow-y: scroll; overflow-y: scroll;
} }
.item-title-and-time{
width: calc(100% - 200rpx) !important;
}
.mer-integral-list{ .mer-integral-list{
width: 100vw; width: 100vw;