Showing
2 changed files
with
17 additions
and
29 deletions
| 1 | import { createApp } from 'vue'; | 1 | import { createApp } from 'vue'; |
| 2 | -import { Button, Image as VanImage, Col, Row, Icon, Form, Field, CellGroup, ConfigProvider, Toast, Uploader, Empty, Tab, Tabs, Overlay, NumberKeyboard, Lazyload, List, PullRefresh, Popup, Picker, Sticky, Stepper, Tag, Swipe, SwipeItem, Dialog } from 'vant'; | 2 | +import { Button, Image as VanImage, Col, Row, Icon, Form, Field, CellGroup, ConfigProvider, Toast, Uploader, Empty, Tab, Tabs, Overlay, NumberKeyboard, Lazyload, List, PullRefresh, Popup, Picker, Sticky, Stepper, Tag, Swipe, SwipeItem, Dialog, ActionSheet } from 'vant'; |
| 3 | import router from './router'; | 3 | import router from './router'; |
| 4 | import App from './App.vue'; | 4 | import App from './App.vue'; |
| 5 | // import axios from './utils/axios'; | 5 | // import axios from './utils/axios'; |
| ... | @@ -39,6 +39,7 @@ app.use(Tag); | ... | @@ -39,6 +39,7 @@ app.use(Tag); |
| 39 | app.use(Swipe); | 39 | app.use(Swipe); |
| 40 | app.use(SwipeItem); | 40 | app.use(SwipeItem); |
| 41 | app.use(Dialog); | 41 | app.use(Dialog); |
| 42 | +app.use(ActionSheet); | ||
| 42 | 43 | ||
| 43 | app.use(ConfigProvider); | 44 | app.use(ConfigProvider); |
| 44 | 45 | ... | ... |
| ... | @@ -32,9 +32,9 @@ import { v4 as uuidv4 } from 'uuid'; | ... | @@ -32,9 +32,9 @@ import { v4 as uuidv4 } from 'uuid'; |
| 32 | import { ref, reactive, onMounted } from 'vue' | 32 | import { ref, reactive, onMounted } from 'vue' |
| 33 | import { useRoute, useRouter } from 'vue-router' | 33 | import { useRoute, useRouter } from 'vue-router' |
| 34 | import axios from '@/utils/axios'; | 34 | import axios from '@/utils/axios'; |
| 35 | -import qs from 'Qs' | ||
| 36 | import $ from 'jquery' | 35 | import $ from 'jquery' |
| 37 | import { Toast } from 'vant'; | 36 | import { Toast } from 'vant'; |
| 37 | + | ||
| 38 | const $route = useRoute(); | 38 | const $route = useRoute(); |
| 39 | const $router = useRouter(); | 39 | const $router = useRouter(); |
| 40 | 40 | ||
| ... | @@ -48,20 +48,6 @@ const onSubmit = (values) => { | ... | @@ -48,20 +48,6 @@ const onSubmit = (values) => { |
| 48 | // console.log('submit', values); | 48 | // console.log('submit', values); |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 51 | -// const uuid = () => { | ||
| 52 | -// let s = []; | ||
| 53 | -// let hexDigits = '0123456789abcdef'; | ||
| 54 | -// for (var i = 0; i < 36; i++) { | ||
| 55 | -// s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); | ||
| 56 | -// } | ||
| 57 | -// s[14] = '4'; // bits 12-15 of the time_hi_and_version field to 0010 | ||
| 58 | -// s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01 | ||
| 59 | -// s[8] = s[13] = s[18] = s[23] = '-'; | ||
| 60 | - | ||
| 61 | -// var uuid = s.join(''); | ||
| 62 | -// return uuid; | ||
| 63 | -// } | ||
| 64 | - | ||
| 65 | // 图片模块 | 51 | // 图片模块 |
| 66 | let lock_btn = ref(false); // 保存按钮锁 | 52 | let lock_btn = ref(false); // 保存按钮锁 |
| 67 | let fileList = ref([]); | 53 | let fileList = ref([]); |
| ... | @@ -73,12 +59,11 @@ const afterRead = (res) => { | ... | @@ -73,12 +59,11 @@ const afterRead = (res) => { |
| 73 | // 此时可以自行将文件上传至服务器 | 59 | // 此时可以自行将文件上传至服务器 |
| 74 | let dataURL = res.content; | 60 | let dataURL = res.content; |
| 75 | let base64url = dataURL.slice(dataURL.indexOf(',') + 1); // 截取前缀的base64 data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAnoAAAJeCAYAA....... | 61 | let base64url = dataURL.slice(dataURL.indexOf(',') + 1); // 截取前缀的base64 data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAnoAAAJeCAYAA....... |
| 76 | - // 获取七牛token | 62 | + //TODO: 获取七牛token |
| 77 | - axios.post('/srv/?f=shzl_comment&a=upload', | 63 | + axios.post('/srv/?f=shzl_comment&a=upload', { |
| 78 | - qs.stringify({ | ||
| 79 | filename: `${affix}_${res.file.name}`, | 64 | filename: `${affix}_${res.file.name}`, |
| 80 | file: base64url | 65 | file: base64url |
| 81 | - })) | 66 | + }) |
| 82 | .then(res => { | 67 | .then(res => { |
| 83 | if (res.statusText === 'OK') { | 68 | if (res.statusText === 'OK') { |
| 84 | let config = { | 69 | let config = { |
| ... | @@ -92,14 +77,14 @@ const afterRead = (res) => { | ... | @@ -92,14 +77,14 @@ const afterRead = (res) => { |
| 92 | .then(res => { | 77 | .then(res => { |
| 93 | if (res.data.filekey) { | 78 | if (res.data.filekey) { |
| 94 | let info = res.data; | 79 | let info = res.data; |
| 95 | - axios.post('/srv/?f=shzl_comment&a=upload&t=save_file', | 80 | + // TODO: 保存图片返回ID |
| 96 | - qs.stringify({ | 81 | + axios.post('/srv/?f=shzl_comment&a=upload&t=save_file', { |
| 97 | format: info.image_info.format, | 82 | format: info.image_info.format, |
| 98 | hash: info.hash, | 83 | hash: info.hash, |
| 99 | height: info.image_info.height, | 84 | height: info.image_info.height, |
| 100 | width: info.image_info.width, | 85 | width: info.image_info.width, |
| 101 | filekey: info.filekey, | 86 | filekey: info.filekey, |
| 102 | - })) | 87 | + }) |
| 103 | .then(res => { | 88 | .then(res => { |
| 104 | upload_image.meta_id = res.data.data.meta_id; | 89 | upload_image.meta_id = res.data.data.meta_id; |
| 105 | lock_btn.value = false; // 头像上传完成, 打开锁 | 90 | lock_btn.value = false; // 头像上传完成, 打开锁 |
| ... | @@ -137,7 +122,8 @@ const beforeDelete = () => { // 删除图片回调 | ... | @@ -137,7 +122,8 @@ const beforeDelete = () => { // 删除图片回调 |
| 137 | } | 122 | } |
| 138 | 123 | ||
| 139 | let user_info = reactive({ | 124 | let user_info = reactive({ |
| 140 | - kindergarten: '杨浦民办科技幼稚园', | 125 | + kg_id: $route.query.kg_id, |
| 126 | + kindergarten: $route.query.kg_name, | ||
| 141 | name: '', | 127 | name: '', |
| 142 | meta_id: '' | 128 | meta_id: '' |
| 143 | }); | 129 | }); |
| ... | @@ -149,12 +135,13 @@ onMounted(() => { | ... | @@ -149,12 +135,13 @@ onMounted(() => { |
| 149 | 135 | ||
| 150 | // 保存用户信息 | 136 | // 保存用户信息 |
| 151 | const saveInfo = () => { | 137 | const saveInfo = () => { |
| 152 | - axios.post('/srv/?f=shzl_comment&a=user&t=edit', | 138 | + // TODO: 以前接口保存的是一个ID,看后端怎么处理, perf_avatar看样子是一个图片地址 |
| 153 | - qs.stringify({ | 139 | + axios.post('/srv/?f=shzl_comment&a=user&t=edit', { |
| 154 | - kindergarten: user_info.kindergarten, | 140 | + kg_id: user_info.kg_id, |
| 155 | - name: user_info.name, | 141 | + perf_name: user_info.name, |
| 142 | + // perf_avatar: upload_image.meta_id ? upload_image.meta_id : user_info.meta_id, | ||
| 156 | meta_id: upload_image.meta_id ? upload_image.meta_id : user_info.meta_id, | 143 | meta_id: upload_image.meta_id ? upload_image.meta_id : user_info.meta_id, |
| 157 | - })) | 144 | + }) |
| 158 | .then(res => { | 145 | .then(res => { |
| 159 | if (res.data.code === 1) { | 146 | if (res.data.code === 1) { |
| 160 | Toast.success({ | 147 | Toast.success({ | ... | ... |
-
Please register or login to post a comment