init

package_sub/pages/BatchForm/BatchForm.vue

@@ -65,9 +65,7 @@
 
     <view class="wrap" v-if="step > 1 && step <= (1 + batches.length)">
       <view class="picked-data">
-        <view>{{ form.year }}年</view>
-        <view>{{ formArea }}</view>
-        <view>{{ currentBatch.name }}</view>
+        <view>{{ form.year }}年 {{ currentBatch.name || '-' }}</view>
       </view>
 
       <view class="card" v-for="item in currentBatchSub" :key="item.id">
@@ -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;

package_sub/pages/HistoryScore/HistoryScore.vue

@@ -13,7 +13,7 @@
       </view>
     </view>
     <u-dropdown ref="uDropdown" inactive-color="#333" :height="80" menu-icon="arrow-down-fill">
-      <u-dropdown-item v-model="select.year" title="年份">
+      <u-dropdown-item v-model="select.year" :title="select.year+'年'">
         <view class="slot-content">
           <u-picker
             :has-popup="false"
@@ -40,7 +40,7 @@
       </u-dropdown-item>
       <u-dropdown-item
         v-model="select.area_id"
-        title="区域"
+        :title="selectArea"
         :options="areaList"
         @change="getList(true)"
       ></u-dropdown-item>
@@ -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)

package_sub/pages/SchoolList/SchoolList.vue

@@ -15,19 +15,19 @@
     <u-dropdown ref="uDropdown" inactive-color="#333" :height="80">
       <u-dropdown-item
           v-model="select.type"
-          title="学段"
+          :title="select.type || '学段'"
           :options="typeList"
           @change="getList(true)">
       </u-dropdown-item>
       <u-dropdown-item
           v-model="select.area_id"
-          title="区域"
+          :title="selectArea"
           :options="areaList"
           @change="getList(true)"
       ></u-dropdown-item>
       <u-dropdown-item
           v-model="select.nature"
-          title="性质"
+          :title="selectNature"
           :options="natureList"
           @change="getList(true)"
       ></u-dropdown-item>
@@ -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)

package_sub/pages/TargetCount/TargetCount.vue

@@ -13,7 +13,7 @@
       </view>
     </view>
     <u-dropdown ref="uDropdown" inactive-color="#333" :height="80" menu-icon="arrow-down-fill">
-      <u-dropdown-item v-model="select.year" title="年份">
+      <u-dropdown-item v-model="select.year" :title="select.year+'年'">
         <view class="slot-content">
           <u-picker
               :has-popup="false"
@@ -40,7 +40,7 @@
       </u-dropdown-item>
       <u-dropdown-item
           v-model="select.area_id"
-          title="区域"
+          :title="selectArea"
           :options="areaList"
           @change="getList(true)"
       ></u-dropdown-item>
@@ -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')
   },

pages/index/index.vue

@@ -90,12 +90,12 @@
           <view>
             您需要联系我们的客服，获取授权
           </view>
-          <image mode="aspectFit" src="~@/static/logo.png"></image>
+          <image mode="aspectFit" show-menu-by-longpress src="~@/static/qrcode.png"></image>
           <view>
-            xx老师
+            卓老师
           </view>
           <view>
-            电话：xxxxxxxxxxx
+            电话：15006200900
           </view>
         </view>
       </view>
@@ -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;
     }
   }

pages/me/me.vue

@@ -52,7 +52,7 @@
 
     <u-popup mode="center" v-model="isShowQrcode" border-radius="14">
       <view class="qrcode">
-        <image mode="aspectFit" src="~@/static/logo.png"></image>
+        <image mode="aspectFit" show-menu-by-longpress src="~@/static/qrcode.png"></image>
       </view>
     </u-popup>
   </view>
@@ -157,8 +157,8 @@ export default {
   padding: 20rpx;
 
   & > image {
-    width: 420rpx;
-    height: 420rpx;
+    width: 540rpx;
+    height: 690rpx;
   }
 }
 </style>

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) {

uview-ui/libs/mixin/mpShare.js

@@ -4,7 +4,7 @@ module.exports = {
 		this.$u.mpShare = {
 			title: '', // 默认为小程序名称
 			path: '', // 默认为当前页面路径
-			imageUrl: '' // 默认为当前页面的截图
+			imageUrl: '/static/share-img.jpg' // 默认为当前页面的截图
 		}
 	},
 	onShareAppMessage() {