历史测试列表编辑

src/api/editor.js

@@ -7,7 +7,7 @@ const getUserThemeList = (type = 'h5') => {
   return http.get('/api/pages?type=' + type)
 }
 const getPageByThemeId = (id) => {
-  return http.get('/api/pages/' + id)
+  return http.post('/testTheme/queryTestTheme', { id: id })
 }
 const saveTheme = (theme) => {
   return http.post('/api/pages', theme)
@@ -30,23 +30,23 @@ const getPicListByThemeId = (_id) => {
   return http.get('/api/upload/theme/' + _id)
 }
 
-const cncTestcaseList = (data)=>{
+const cncTestcaseList = (data) => {
   return http.post('/cncTest/cncTestcaseList', data)
 }
 
-const houseList = ()=>{
+const houseList = () => {
   return http.post('/cncTest/houseList')
 }
 
-const cncTestDetail = (data)=>{
-  return http.post('/cncTest/cncTestDetail',data) 
+const cncTestDetail = (data) => {
+  return http.post('/cncTest/cncTestDetail', data)
 }
 
-const createTest = (data)=>{
-  return http.post('/testTheme/createTest',data) 
+const createTest = (data) => {
+  return http.post('/testTheme/createTest', data)
 }
 
 module.exports = {
-  houseList,cncTestDetail,createTest,
-  getUserThemeList, saveTheme, updateTheme, uploadPic,uploadPsd, getPageByThemeId, getPicListByThemeId, delTheme ,cncTestcaseList
+  houseList, cncTestDetail, createTest,
+  getUserThemeList, saveTheme, updateTheme, uploadPic, uploadPsd, getPageByThemeId, getPicListByThemeId, delTheme, cncTestcaseList
 }

src/api/test.js

@@ -13,8 +13,11 @@ const deleteTest = (param) => {
 const copyTest = (param) => {
   return http.post('/testTheme/copyTest', param)
 }
-
+// 查询测试数据
+const queryTestTheme = (param) => {
+  return http.post('/testTheme/queryTestTheme', param)
+}
 
 module.exports = {
-  testList, deleteTest, copyTest
+  testList, deleteTest, copyTest, queryTestTheme
 }

src/util/time.js

@@ -0,0 +1,36 @@
+/**
+ * 毫秒转换友好的显示格式
+ * 输出格式：21小时前
+ * @param  {[type]} time [description]
+ * @return {[type]}      [description]
+ */
+const dateStr = (date) => {
+  //获取js 时间戳
+  var time = new Date().getTime();
+  //去掉 js 时间戳后三位，与php 时间戳保持一致
+  time = parseInt((time - date * 1000) / 1000);
+  //存储转换值 
+  var s;
+  if (time < 60 * 10) {//十分钟内
+    return '刚刚';
+  } else if ((time < 60 * 60) && (time >= 60 * 10)) {
+    //超过十分钟少于1小时
+    s = Math.floor(time / 60);
+    return s + "分钟前";
+  } else if ((time < 60 * 60 * 24) && (time >= 60 * 60)) {
+    //超过1小时少于24小时
+    s = Math.floor(time / 60 / 60);
+    return s + "小时前";
+  } else if ((time < 60 * 60 * 24 * 3) && (time >= 60 * 60 * 24)) {
+    //超过1天少于3天内
+    s = Math.floor(time / 60 / 60 / 24);
+    return s + "天前";
+  } else {
+    //超过3天
+    var date = new Date(parseInt(date) * 1000);
+    return date.getFullYear() + "/" + (date.getMonth() + 1) + "/" + date.getDate();
+  }
+}
+export default {
+  dateStr
+}

src/views/myHistoryTest/myHistoryTest.html

@@ -41,13 +41,13 @@
         <img v-if="item.canDelete" class="item-img delete" src="" alt="" @click="deleteTest(item)">
         <img class="item-img copy" src="" alt="" @click="copyTest(item)">
         <img class="item-img share" src="" alt="" @click="shareTest()">
-        <img class="item-img edit" src="" alt="" @click="editTest" style="float:right;margin-right:10px;">
+        <img class="item-img edit" src="" alt="" @click="editTest(item)" style="float:right;margin-right:10px;">
       </div>
       <div class="title">{{item.title}}</div>
       <div class="desc">{{item.ownHouseName}}</div>
       <div class="bottom">
         <span>共{{item.questionCount}}题</span>
-        <span>{{item.created}}</span>
+        <span>{{dataformat(item.created)}}</span>
       </div>
     </div>
     <div class="item add" @click="createTest">

src/views/myHistoryTest/myHistoryTest.js

@@ -2,7 +2,7 @@ import HeaderMain from "../../components/HeaderMain";
 import ShareSetting from "../../components/ShareSetting";
 import api from '../../api/test'
 import editorApi from '../../api/editor'
-
+import timeFormat from '../../util/time'
 export default {
   components: {
     HeaderMain, ShareSetting
@@ -69,6 +69,9 @@ export default {
     this.getTestList(true);
   },
   methods: {
+    dataformat(val) {
+      return timeFormat.dateStr(val);
+    },
     load() {
       this.getTestList(false);
     },
@@ -164,8 +167,8 @@ export default {
       })
 
     },
-    editTest() {
-      this.$router.replace({ path: '/h5editor', query: { itemId: 0 } })
+    editTest(item) {
+      this.$router.replace({ path: '/h5editor', query: { itemId: item._id } })
     },
     shareTest() {
       this.isShareSetting = true;

src/vuex/editor/actions.js

@@ -140,16 +140,17 @@ export const getPageByThemeId = ({ dispatch, commit }, id) => {
     background: 'rgba(0, 0, 0, 0.7)'
   });
   api.getPageByThemeId(id).then((res) => {
-    res.pages = res.pages || [];
-    res.backgroundAudio = res.backgroundAudio || '';
-    res.pages.forEach((page) => {
-      page.elements.forEach((element) => {
-        element.animatedFont = element.animatedFont || ''
-        element.eleCanvas = element.eleCanvas || ''
-      })
-    })
-    commit(types.SET_CUR_EDITOR_THEME, res)
-    commit(types.SET_CUR_EDITOR_PAGE, res.pages[0])
+    console.log("XXXXXXXXXXXXXXX", res);
+    // res.pages = res.pages || [];
+    // res.backgroundAudio = res.backgroundAudio || '';
+    // res.pages.forEach((page) => {
+    //   page.elements.forEach((element) => {
+    //     element.animatedFont = element.animatedFont || ''
+    //     element.eleCanvas = element.eleCanvas || ''
+    //   })
+    // })
+    // commit(types.SET_CUR_EDITOR_THEME, res)
+    // commit(types.SET_CUR_EDITOR_PAGE, res.pages[0])
     loading.close()
     setTimeout(function () {