diff --git a/package_sub/pages/BatchForm/BatchForm.vue b/package_sub/pages/BatchForm/BatchForm.vue
index e62f9a4..5a648a5 100644
--- a/package_sub/pages/BatchForm/BatchForm.vue
+++ b/package_sub/pages/BatchForm/BatchForm.vue
@@ -65,9 +65,7 @@
- {{ form.year }}年
- {{ formArea }}
- {{ currentBatch.name }}
+ {{ form.year }}年 {{ currentBatch.name || '-' }}
@@ -791,22 +789,21 @@ export default {
}
}
.picked-data {
- display: flex;
- align-items: center;
border-radius: 20rpx;
filter: drop-shadow(-2.179rpx 3.355rpx 2.5rpx rgba(208,209,209,0.3));
background-color: rgba(255, 255, 255, 0.5);
margin: 20rpx 24rpx 0;
- padding: 26rpx 160rpx;
+ padding: 26rpx;
& > view {
+ word-break: break-word;
flex: 1;
text-align: center;
font-size: 32rpx;
text-transform: uppercase;
color: #333333;
font-weight: bold;
- white-space: nowrap;
+ // white-space: nowrap;
}
& > view + view {
margin-left: 10rpx;
diff --git a/package_sub/pages/HistoryScore/HistoryScore.vue b/package_sub/pages/HistoryScore/HistoryScore.vue
index 6ba402c..b1ee75d 100644
--- a/package_sub/pages/HistoryScore/HistoryScore.vue
+++ b/package_sub/pages/HistoryScore/HistoryScore.vue
@@ -13,7 +13,7 @@
-
+
@@ -95,7 +95,7 @@ export default {
try {
const res = await this.$u.api.area()
this.areaList = [{
- label: '全部',
+ label: '全部区域',
value: ''
},...res.list.map(i => ({
label: i.name,
@@ -137,6 +137,11 @@ export default {
}
}
},
+ computed: {
+ selectArea() {
+ return this.areaList.find(i => i.value === this.select.area_id)?.label ?? ''
+ }
+ },
created() {
this.getArea()
this.getList(true)
diff --git a/package_sub/pages/SchoolList/SchoolList.vue b/package_sub/pages/SchoolList/SchoolList.vue
index d93814c..1f3351c 100644
--- a/package_sub/pages/SchoolList/SchoolList.vue
+++ b/package_sub/pages/SchoolList/SchoolList.vue
@@ -15,19 +15,19 @@
@@ -119,7 +119,7 @@ export default {
try {
const res = await this.$u.api.area()
this.areaList = [{
- label: '全部',
+ label: '全部区域',
value: ''
},...res.list.map(i => ({
label: i.name,
@@ -159,7 +159,12 @@ export default {
}
},
computed: {
-
+ selectArea() {
+ return this.areaList.find(i => i.value === this.select.area_id)?.label ?? ''
+ },
+ selectNature() {
+ return this.natureList.find(i => i.value === this.select.nature)?.label ?? '性质'
+ }
},
onPullDownRefresh() {
this.getList(true)
diff --git a/package_sub/pages/TargetCount/TargetCount.vue b/package_sub/pages/TargetCount/TargetCount.vue
index 8fcc4c3..378fe5a 100644
--- a/package_sub/pages/TargetCount/TargetCount.vue
+++ b/package_sub/pages/TargetCount/TargetCount.vue
@@ -13,7 +13,7 @@
-
+
@@ -103,7 +103,7 @@ export default {
try {
const res = await this.$u.api.area()
this.areaList = [{
- label: '全部',
+ label: '全部区域',
value: ''
},...res.list.map(i => ({
label: i.name,
@@ -142,6 +142,11 @@ export default {
}
}
},
+ computed: {
+ selectArea() {
+ return this.areaList.find(i => i.value === this.select.area_id)?.label ?? ''
+ }
+ },
onReady() {
this.defaultTime = this.$moment().format('YYYY-MM-DD HH:mm:ss')
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b62fe6e..c351b2b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -90,12 +90,12 @@
您需要联系我们的客服，获取授权
-
+
- xx老师
+ 卓老师
- 电话：xxxxxxxxxxx
+ 电话：15006200900
@@ -124,6 +124,9 @@ export default {
},
bannerJump2(i) {
console.log(i)
+ if (i.jump_url === '#') {
+ return
+ }
if (i.jump_type === 1) {
uni.navigateToMiniProgram({
appId: i.jump_url
@@ -135,6 +138,13 @@ export default {
src: i.jump_url
}
})
+ } else if (i.jump_type === 3) {
+ this.$u.route({
+ url: '/package_sub/pages/LoadImage/LoadImage',
+ params: {
+ src: i.jump_url
+ }
+ })
}
}
},
@@ -329,8 +339,8 @@ export default {
padding: 10rpx 20rpx;
& > image {
- width: 340rpx;
- height: 340rpx;
+ width: 360rpx;
+ height: 440rpx;
margin: 10rpx 0;
}
}
diff --git a/pages/me/me.vue b/pages/me/me.vue
index 7657531..7ac8884 100644
--- a/pages/me/me.vue
+++ b/pages/me/me.vue
@@ -52,7 +52,7 @@
-
+
@@ -157,8 +157,8 @@ export default {
padding: 20rpx;
& > image {
- width: 420rpx;
- height: 420rpx;
+ width: 540rpx;
+ height: 690rpx;
}
}
diff --git a/static/default-icon.png b/static/default-icon.png
new file mode 100644
index 0000000..6f6e91e
Binary files /dev/null and b/static/default-icon.png differ
diff --git a/static/qrcode.png b/static/qrcode.png
new file mode 100644
index 0000000..a0f98a1
Binary files /dev/null and b/static/qrcode.png differ
diff --git a/static/share-img.jpg b/static/share-img.jpg
new file mode 100644
index 0000000..be4743a
Binary files /dev/null and b/static/share-img.jpg differ
diff --git a/store/index.js b/store/index.js
index e5156bc..8ad7c68 100644
--- a/store/index.js
+++ b/store/index.js
@@ -36,7 +36,7 @@ const store = new Vuex.Store({
vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '123',
// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
vuex_version: '1.0.1',
- vuex_default_icon: '/static/logo.png'
+ vuex_default_icon: '/static/default-icon.png'
},
mutations: {
$uStore(state, payload) {
diff --git a/uview-ui/libs/mixin/mpShare.js b/uview-ui/libs/mixin/mpShare.js
index 057d369..42220ba 100644
--- a/uview-ui/libs/mixin/mpShare.js
+++ b/uview-ui/libs/mixin/mpShare.js
@@ -4,7 +4,7 @@ module.exports = {
this.$u.mpShare = {
title: '', // 默认为小程序名称
path: '', // 默认为当前页面路径
- imageUrl: '' // 默认为当前页面的截图
+ imageUrl: '/static/share-img.jpg' // 默认为当前页面的截图
}
},
onShareAppMessage() {