chore: 更新版本号和依赖项
- 将manifest.json中的版本号更新至1.0.61 - 将edu-core依赖从本地路径更新至git仓库地址,版本为v1.0.13 - 优化wallet页面的布局和样式,增强可读性
This commit is contained in:
@@ -13,8 +13,8 @@
|
|||||||
"src" : "图片路径"
|
"src" : "图片路径"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"versionName" : "1.0.62",
|
"versionName" : "1.0.61",
|
||||||
"versionCode" : 1062,
|
"versionCode" : 1061,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"nvueCompiler" : "weex",
|
"nvueCompiler" : "weex",
|
||||||
"compatible" : {
|
"compatible" : {
|
||||||
|
|||||||
15
package-lock.json
generated
15
package-lock.json
generated
@@ -9,7 +9,7 @@
|
|||||||
"version": "3.4.5",
|
"version": "3.4.5",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"edu-core": "file:../edu-core",
|
"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13",
|
||||||
"jquery": "^3.7.1",
|
"jquery": "^3.7.1",
|
||||||
"tcplayer.js": "^5.1.0"
|
"tcplayer.js": "^5.1.0"
|
||||||
},
|
},
|
||||||
@@ -17,11 +17,6 @@
|
|||||||
"postcss-px-to-viewport": "^1.1.1"
|
"postcss-px-to-viewport": "^1.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"../edu-core": {
|
|
||||||
"version": "1.0.8",
|
|
||||||
"license": "ISC",
|
|
||||||
"devDependencies": {}
|
|
||||||
},
|
|
||||||
"node_modules/babel-runtime": {
|
"node_modules/babel-runtime": {
|
||||||
"version": "6.26.0",
|
"version": "6.26.0",
|
||||||
"resolved": "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz",
|
"resolved": "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz",
|
||||||
@@ -73,8 +68,9 @@
|
|||||||
"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
|
"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
|
||||||
},
|
},
|
||||||
"node_modules/edu-core": {
|
"node_modules/edu-core": {
|
||||||
"resolved": "../edu-core",
|
"version": "1.0.13",
|
||||||
"link": true
|
"resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f",
|
||||||
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/es5-shim": {
|
"node_modules/es5-shim": {
|
||||||
"version": "4.6.7",
|
"version": "4.6.7",
|
||||||
@@ -397,7 +393,8 @@
|
|||||||
"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
|
"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
|
||||||
},
|
},
|
||||||
"edu-core": {
|
"edu-core": {
|
||||||
"version": "file:../edu-core"
|
"version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f",
|
||||||
|
"from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13"
|
||||||
},
|
},
|
||||||
"es5-shim": {
|
"es5-shim": {
|
||||||
"version": "4.6.7",
|
"version": "4.6.7",
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/dcloudio/hello-uniapp#readme",
|
"homepage": "https://github.com/dcloudio/hello-uniapp#readme",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"edu-core": "file:../edu-core",
|
"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13",
|
||||||
"jquery": "^3.7.1",
|
"jquery": "^3.7.1",
|
||||||
"tcplayer.js": "^5.1.0"
|
"tcplayer.js": "^5.1.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -63,17 +63,19 @@
|
|||||||
>
|
>
|
||||||
<template slot="labelSlot" slot-scope="slotProps">
|
<template slot="labelSlot" slot-scope="slotProps">
|
||||||
<view class="label_content AC_List">
|
<view class="label_content AC_List">
|
||||||
<view class="left">
|
<view style=" display: flex; align-items: center; justify-content: space-between;">
|
||||||
<view class="title">{{ slotProps.row.orderType }}</view>
|
<view class="left">
|
||||||
</view>
|
<view class="title">{{ slotProps.row.productName || slotProps.row.orderType}}</view>
|
||||||
<view
|
</view>
|
||||||
:class="`right ${
|
<view
|
||||||
slotProps.row.changeAmount > 0 ? 'Hot' : ''
|
:class="`right ${
|
||||||
}`"
|
slotProps.row.changeAmount > 0 ? 'Hot' : ''
|
||||||
>
|
}`"
|
||||||
<text v-if="slotProps.row.changeAmount > 0">+</text>
|
>
|
||||||
<text>{{ slotProps.row.changeAmount }}</text>
|
<text v-if="slotProps.row.changeAmount > 0">+</text>
|
||||||
</view>
|
<text>{{ slotProps.row.changeAmount }}</text>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
<view class="AC_mark" v-if="slotProps.row.remark">{{slotProps.row.remark}}</view>
|
<view class="AC_mark" v-if="slotProps.row.remark">{{slotProps.row.remark}}</view>
|
||||||
<view class="AC_note" v-if="slotProps.row.note&&slotProps.row.note!='null'">说明:{{slotProps.row.note}}</view>
|
<view class="AC_note" v-if="slotProps.row.note&&slotProps.row.note!='null'">说明:{{slotProps.row.note}}</view>
|
||||||
<view class="AC_time">{{ slotProps.row.createTime }}</view>
|
<view class="AC_time">{{ slotProps.row.createTime }}</view>
|
||||||
@@ -348,6 +350,12 @@ export default {
|
|||||||
|
|
||||||
.AC_List {
|
.AC_List {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
.title,
|
||||||
|
.AC_note,
|
||||||
|
.AC_mark {
|
||||||
|
word-break: break-word;
|
||||||
|
overflow-wrap: break-word;
|
||||||
|
}
|
||||||
.left {
|
.left {
|
||||||
width: calc(100% - 220rpx) !important;
|
width: calc(100% - 220rpx) !important;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
@@ -365,6 +373,19 @@ export default {
|
|||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
color: #333;
|
color: #333;
|
||||||
}
|
}
|
||||||
|
> view:first-child {
|
||||||
|
.left {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
width: auto !important;
|
||||||
|
float: none;
|
||||||
|
}
|
||||||
|
.right {
|
||||||
|
flex-shrink: 0;
|
||||||
|
float: none;
|
||||||
|
width: auto !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// border-bottom: 1px solid #eee;
|
// border-bottom: 1px solid #eee;
|
||||||
// padding: 40rpx 10rpx;
|
// padding: 40rpx 10rpx;
|
||||||
|
|||||||
Reference in New Issue
Block a user