我的教材-机构免费

src/components/Personalcenter/Mymessage.vue

@@ -115,7 +115,6 @@ export default {
           return item;
         });
         this.listObj = this.handleSortByDate(list);
-        console.log(this.listObj);
       }
     },
     //按日期分类
@@ -201,10 +200,8 @@ export default {
     month = month < 10 ? "0" + month : month;
     let day = day2.getDate();
     day = day < 10 ? "0" + day : day;
-    console.log(day2.getFullYear(), month, day);
     var s2 = day2.getFullYear() + "-" + month + "-" + day;
     this.currDate = s2;
-    console.log(this.currDate);
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前

src/components/Personalcenter/Mytextbook.vue

@@ -2,18 +2,43 @@
   <!-- 我的教材 -->
   <div class="Mytextbook personal-center">
     <EditTitle :title="title" />
+    <div class="menuBox">
+      <el-menu
+        :default-active="selectIndex"
+        class="el-menu-demo"
+        mode="horizontal"
+        @select="handleSelect"
+      >
+        <!-- 全部 机构免费 我购买的 -->
+        <el-menu-item index="-1">{{ $t("Key110") }}</el-menu-item>
+        <el-menu-item index="0">机构免费</el-menu-item>
+        <el-menu-item index="1">我购买的</el-menu-item>
+      </el-menu>
+    </div>
     <template v-if="!isEmpty">
       <div v-loading="loading" class="bookList">
         <div v-for="(item, i) in list" :key="i" @click="jump(item)">
           <div class="img-box" :class="item.checked ? 'active' : ''">
             <div class="fengmian">
-              <img :src="item.goods_picture_url" alt="" />
+              <img
+                :src="
+                  item.goods_picture_url
+                    ? item.goods_picture_url
+                    : item.book_picture_url
+                "
+                alt=""
+              />
             </div>
             <div class="checkout-box" v-if="isShowCheckBox">
               <img src="@/assets/Personalcenter/selected-icon.png" />
             </div>
           </div>
-          <p class="goods_name">{{ item.goods_name }}</p>
+          <p class="goods_name">
+            {{ item.goods_name ? item.goods_name : item.book_name }}
+          </p>
+          <p class="goods_name goods_license" v-if="item.free_license_end_date">
+            {{ item.free_license_end_date }}到期
+          </p>
         </div>
       </div>
       <div class="paging" :class="list.length < 11 ? 'paging1' : ''">
@@ -36,7 +61,7 @@
 <script>
 import EditTitle from "../common/EditTitle.vue";
 import Empty from "../common/Empty.vue";
-import { getLearnWebContent } from "@/api/ajax";
+import { getLearnWebContent, getBookWebContent } from "@/api/ajax";
 import { jumpPath } from "@/utils/jumpPath";
 export default {
   name: "Teachcourse",
@@ -55,6 +80,7 @@ export default {
       pageNum: 1,
       total: 0,
       activeIndex: "[101]",
+      selectIndex: "-1",
       loading: false,
       isEmpty: false,
       isShowCheckBox: false,
@@ -79,32 +105,54 @@ export default {
     getOrderList() {
       let _this = this;
       _this.loading = true;
-      let MethodName = "page_query-PageQueryMyGoodsList";
-      let data = {
-        goods_id_list: [], // 商品 ID 列表，空表示查询所有商品
-        goods_type_list: JSON.parse(_this.activeIndex), // 商品类型列表，具体参看数据字典 6.9，订单商品类型。空表示查询所有类型
-        goods_name: _this.goods_name, // 商品名称，模糊查询，空表示查询所有
-        pay_status: 1, //支付状态 -1全部0未支付1已支付
-        cancel_status: 0, //取消状态 -1 全部 0 未取消 1 已取消(只有未支付的订单才会有取消状态)
-        page_capacity: _this.pageSize, // 每页容量，最大不能超过 200
-        cur_page: _this.pageNum, // 当前查询第几页，页码序号从 1 开始
-      };
-      getLearnWebContent(MethodName, data).then((res) => {
-        _this.loading = false;
-        this.total = res.total_count;
-        if (res.goods_list && res.goods_list.length > 0) {
-          let list = res.goods_list;
-          list = list.map((item) => {
-            item.checked = false;
-            return item;
-          });
-          this.list = list;
-          console.log(this.list);
-          this.isEmpty = false;
-        } else {
-          this.isEmpty = true;
-        }
-      });
+      if (_this.selectIndex == 0) {
+        let MethodName = "page_query-PageQueryMyBookList_OrgFreeLicense";
+        let data = {
+          page_capacity: _this.pageSize, // 每页容量，最大不能超过 200
+          cur_page: _this.pageNum, // 当前查询第几页，页码序号从 1 开始
+        };
+        getBookWebContent(MethodName, data).then((res) => {
+          _this.loading = false;
+          this.total = res.total_count;
+          if (res.book_list && res.book_list.length > 0) {
+            let list = res.book_list;
+            list = list.map((item) => {
+              item.checked = false;
+              return item;
+            });
+            this.list = list;
+            this.isEmpty = false;
+          } else {
+            this.isEmpty = true;
+          }
+        });
+      } else {
+        let MethodName = "page_query-PageQueryMyGoodsList";
+        let data = {
+          goods_id_list: [], // 商品 ID 列表，空表示查询所有商品
+          goods_type_list: JSON.parse(_this.activeIndex), // 商品类型列表，具体参看数据字典 6.9，订单商品类型。空表示查询所有类型
+          goods_name: _this.goods_name, // 商品名称，模糊查询，空表示查询所有
+          pay_status: 1, //支付状态 -1全部0未支付1已支付
+          cancel_status: 0, //取消状态 -1 全部 0 未取消 1 已取消(只有未支付的订单才会有取消状态)
+          page_capacity: _this.pageSize, // 每页容量，最大不能超过 200
+          cur_page: _this.pageNum, // 当前查询第几页，页码序号从 1 开始
+        };
+        getLearnWebContent(MethodName, data).then((res) => {
+          _this.loading = false;
+          this.total = res.total_count;
+          if (res.goods_list && res.goods_list.length > 0) {
+            let list = res.goods_list;
+            list = list.map((item) => {
+              item.checked = false;
+              return item;
+            });
+            this.list = list;
+            this.isEmpty = false;
+          } else {
+            this.isEmpty = true;
+          }
+        });
+      }
     },
     handleGoodsType(type) {
       let imgUrl = "",
@@ -141,6 +189,17 @@ export default {
 
       return str;
     },
+    handleSelect(val) {
+      let _this = this;
+      _this.selectIndex = val;
+      _this.pageNum = 1;
+      this.getOrderList();
+      if (val == "0") {
+        _this.navType = "7";
+      } else {
+        _this.navType = "1";
+      }
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
@@ -233,6 +292,9 @@ export default {
         -webkit-line-clamp: 2;
         text-overflow: ellipsis;
         overflow: hidden;
+        &.goods_license{
+            opacity: 0.5;
+        }
       }
     }
   }

src/components/Personalcenter/OrderManage.vue

@@ -349,7 +349,6 @@ export default {
       this.getOrderList();
     },
     changeNav() {
-      console.log(this.navValue);
       this.getOrderList();
     },
     changecurrentPage(val) {
@@ -401,7 +400,6 @@ export default {
             return item;
           });
           this.list = list;
-          console.log(this.list);
           this.isEmpty = false;
         } else {
           this.isEmpty = true;

src/components/common/Empty.vue

@@ -82,6 +82,13 @@ export default {
             link: "",
           };
           break;
+        case "7":
+          obj = {
+            url: require("../../assets/Personalcenter/2.png"),
+            con: this.$t("Key464"), // "您还未购买任何教材",
+            link: ``,
+          };
+          break;
       }
 
       return obj;
@@ -186,7 +193,7 @@ export default {
   activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 //@import url(); 引入公共css类
 .empty-main {
   width: 100%;

src/utils/jumpPath.js

@@ -1,22 +1,28 @@
 //各个系统跳转商品详情页
 export function jumpPath(item) {
-  let system = "";
-  let curItem = JSON.parse(JSON.stringify(item));
-  curItem.goods_type = curItem.goods_type.toString();
-  if (curItem.goods_type.indexOf(10) > -1) {
-    system = "GCLS-Book";
-  }
-  if (curItem.goods_type.indexOf(20) > -1) {
-    system = "GCLS-Learn";
-  }
-  if (curItem.goods_type.indexOf(30) > -1) {
-    system = "GCLS-TRC";
-  }
-  if (curItem.goods_type.indexOf(40) > -1) {
-    system = "GCLS-TC";
-  }
-  if (system) {
-    let url = `/${system}/#/GoodsDetail?goods_id=${item.goods_id}&goods_type=${item.goods_type}&invok_module=GCLS-Personal`
-    window.open(url);
-  }
+    let system = "";
+    let curItem = JSON.parse(JSON.stringify(item));
+    if (!curItem.goods_type) {
+        system = "GCLS-Book";
+        let url = `/${system}/#/GoodsDetail?goods_id=${item.book_id}&goods_type=101&invok_module=GCLS-Personal`
+        window.open(url);
+        return;
+    }
+    curItem.goods_type = curItem.goods_type.toString();
+    if (curItem.goods_type.indexOf(10) > -1) {
+        system = "GCLS-Book";
+    }
+    if (curItem.goods_type.indexOf(20) > -1) {
+        system = "GCLS-Learn";
+    }
+    if (curItem.goods_type.indexOf(30) > -1) {
+        system = "GCLS-TRC";
+    }
+    if (curItem.goods_type.indexOf(40) > -1) {
+        system = "GCLS-TC";
+    }
+    if (system) {
+        let url = `/${system}/#/GoodsDetail?goods_id=${item.goods_id}&goods_type=${item.goods_type}&invok_module=GCLS-Personal`
+        window.open(url);
+    }
 }