diff --git a/config/baseUrl.js b/config/baseUrl.js index a51de4f..15585ba 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -4,11 +4,11 @@ if (process.env.NODE_ENV === 'development') { // 开发环境 // baseUrl = "http://localhost:7001/"; // socketUrl = "ws://localhost:6001/"; - baseUrl = "http://q.sjqqzc.top"; + baseUrl = "http://api.dxmt.io"; //socketUrl = "ws://8.129.186.35:6001/"; } else if (process.env.NODE_ENV === 'production') { // 生产环境 - baseUrl = "http://q.sjqqzc.top"; + baseUrl = "http://api.dxmt.io"; //socketUrl = "ws://8.129.186.35:6001/"; } const courtConfig = { diff --git a/main.js b/main.js index 741de88..0395694 100644 --- a/main.js +++ b/main.js @@ -18,10 +18,7 @@ Vue.prototype.wxShare = wxShare; import { judgeLogin } from '@/config/login'; Vue.prototype.judgeLogin = judgeLogin; Vue.config.productionTip = false; -// #ifdef H5 -//微信SDK -import '@/plugins/wxJsSDK.js'; -// #endif + import VueI18n from 'vue-i18n'; import en from './locales/en.json'; // 引入英文语言包 import zh from './locales/zh.json'; // 引入中文语言包 diff --git a/package-lock.json b/package-lock.json index 1ad0fff..b5424c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "uni-app-demo-master", + "name": "unapp", "lockfileVersion": 3, "requires": true, "packages": { @@ -51,8 +51,9 @@ }, "node_modules/tki-qrcode": { "version": "0.1.6", - "resolved": "https://registry.npmmirror.com/tki-qrcode/-/tki-qrcode-0.1.6.tgz", - "integrity": "sha512-EnnlS8psowC7PsW3MDYcxvJYkuklX3WAZ/BYanR4TdBHTu74GfjTBX8Y16REP+AeDENiVtBPh4jtTRL2P736hQ==" + "resolved": "https://registry.npmjs.org/tki-qrcode/-/tki-qrcode-0.1.6.tgz", + "integrity": "sha512-EnnlS8psowC7PsW3MDYcxvJYkuklX3WAZ/BYanR4TdBHTu74GfjTBX8Y16REP+AeDENiVtBPh4jtTRL2P736hQ==", + "license": "MIT" }, "node_modules/vue-clipboard2": { "version": "0.3.3", diff --git a/pages.json b/pages.json index 58734e7..96fdf33 100644 --- a/pages.json +++ b/pages.json @@ -564,6 +564,12 @@ "enablePullDownRefresh": false } + },{ + "path" : "pages/questionnaire/select", + "style" : + { + "navigationBarTitleText": "select" + } } ], "globalStyle": { @@ -582,7 +588,7 @@ "pagePath": "pages/index/index", "iconPath": "static/images/home.png", "selectedIconPath": "static/images/home1.png", - "text": "Home Page", + "text": "Home", "iconSize": 48 }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index b09159d..e4780a2 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,13 +1,152 @@ \ No newline at end of file diff --git a/pages/questionnaire/details.vue b/pages/questionnaire/details.vue index 56b04b2..ba0c792 100644 --- a/pages/questionnaire/details.vue +++ b/pages/questionnaire/details.vue @@ -98,7 +98,7 @@ import detailsVue from './details.vue'; //第一次加载 onLoad(e) { uni.showLoading({ - title:'Array loading...' + title:'Data Loading...' }) if(e.id){ getUserInfo(this.$i18n.locale).then(res => { diff --git a/pages/questionnaire/index.vue b/pages/questionnaire/index.vue index 61e36b0..5d1684a 100644 --- a/pages/questionnaire/index.vue +++ b/pages/questionnaire/index.vue @@ -51,19 +51,19 @@ - + No data available - + {{item.questionnaire.title}} Answer time: {{item.created_at.slice(0, 19)}} - + - + No data available @@ -106,7 +106,7 @@ //页面显示 onShow() { uni.showLoading({ - title:'Array loading...' + title:'Data Loading...' }) let data = { page: this.par.page, @@ -129,6 +129,18 @@ } }).catch(err => { }); + let data1 = { + page: this.par.page, + limit: this.par.limit, + lang: this.$i18n.locale, + type: 'done' + }; + this.$http.post('/api/server/list', data1).then(res => { + if(res.code == 0){ + this.list2 = res.data.data; + } + }).catch(err => { + }); } }, @@ -172,7 +184,8 @@ ::v-deep .uni-slider-thumb{display: none;} ::v-deep uni-slider{margin: 16rpx 0px !important;} ::v-deep uni-slider .uni-slider-tap-area{padding: 4rpx 0rpx !important;} - + ::v-deep .uni-slider-handle-wrapper{height: 12px;} + ::v-deep uni-slider{padding: 0px;margin: 0px} .v1{border-bottom: 1px solid #ddd; background-color: #fff; padding: 10px;} .v1 .row{margin-top: 15px; border-radius: 20px;} .v1 .row .i{width: 80px; height: 80px; margin: auto;} diff --git a/pages/questionnaire/select.vue b/pages/questionnaire/select.vue new file mode 100644 index 0000000..1fa66c0 --- /dev/null +++ b/pages/questionnaire/select.vue @@ -0,0 +1,169 @@ + + + + \ No newline at end of file diff --git a/static/images/index1.png b/static/images/index1.png new file mode 100644 index 0000000..9e85fcc Binary files /dev/null and b/static/images/index1.png differ diff --git a/static/images/index2.png b/static/images/index2.png new file mode 100644 index 0000000..7c881e0 Binary files /dev/null and b/static/images/index2.png differ diff --git a/static/images/index3.png b/static/images/index3.png new file mode 100644 index 0000000..c365f42 Binary files /dev/null and b/static/images/index3.png differ diff --git a/static/images/index4.png b/static/images/index4.png new file mode 100644 index 0000000..ea6e346 Binary files /dev/null and b/static/images/index4.png differ diff --git a/static/images/index5.png b/static/images/index5.png new file mode 100644 index 0000000..031906b Binary files /dev/null and b/static/images/index5.png differ diff --git a/static/images/index6.png b/static/images/index6.png new file mode 100644 index 0000000..53ca0ef Binary files /dev/null and b/static/images/index6.png differ diff --git a/static/images/index7.png b/static/images/index7.png new file mode 100644 index 0000000..64c04e2 Binary files /dev/null and b/static/images/index7.png differ diff --git a/static/images/index8.png b/static/images/index8.png new file mode 100644 index 0000000..4074379 Binary files /dev/null and b/static/images/index8.png differ diff --git a/static/images/logo.png b/static/images/logo.png new file mode 100644 index 0000000..a8a3922 Binary files /dev/null and b/static/images/logo.png differ diff --git a/项目资料.txt b/项目资料.txt deleted file mode 100644 index a6ea9cc..0000000 --- a/项目资料.txt +++ /dev/null @@ -1 +0,0 @@ -1. 包名：com.km.uniProject