Browse Source

Merge branch 'test' into develop

develop
JinxChen 1 month ago
parent
commit
f209459fb9
3 changed files with 14 additions and 1 deletions
  1. +1
    -1
      src/config/models.js
  2. +6
    -0
      src/views/psychological-scale/index.vue
  3. +7
    -0
      src/views/psychological-scale/list.vue

+ 1
- 1
src/config/models.js View File

@@ -8,7 +8,7 @@
import store from "@/store";
// 情绪模型
const appTypeList = ['1'];
export const VERSION_MODEL = '1.0.131F'; //版本号
export const VERSION_MODEL = '1.0.132F'; //版本号
export const IMAGE_URL = {
production: 'http://zfb.ssjlai.com/web/',
test: 'http://zfb.ssjlai.com/web/',


+ 6
- 0
src/views/psychological-scale/index.vue View File

@@ -421,6 +421,12 @@ export default {
</script>

<style lang="scss">
.van-toast--html, .van-toast--text{
padding: 2vw !important;
}
.van-toast--html .van-toast__text, .van-toast--text .van-toast__text{
font-size: 3.6vw !important;
}
.psychologicalScale-index {
width: 100vw;
min-height: 100vh;


+ 7
- 0
src/views/psychological-scale/list.vue View File

@@ -34,6 +34,7 @@
<div class="button">查看结果</div>
</div>
</div>
<div class="over">-- 没有更多了 --</div>
</div>
<div class="blank" v-else>暂无测评记录</div>
</div>
@@ -341,6 +342,12 @@ export default {
}
}
}
.over{
margin-top: 3vw;
width: 100%;
color: gray;
text-align: center;
}
}

.blank {


Loading…
Cancel
Save