新增pc官网轮播图管理

platform-admin/src/main/resources/com/platform/dao/TbCfHomePageDao.xml

@@ -49,12 +49,13 @@
         <if test="name != null and name.trim() != ''">
             AND name LIKE concat('%',#{name},'%')
         </if>
+
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
             </when>
             <otherwise>
-                order by page_id desc
+                order by img_version asc
             </otherwise>
         </choose>
         <if test="offset != null and limit != null">
@@ -98,14 +99,14 @@
     <update id="update" parameterType="com.platform.entity.TbCfHomePageEntity">
         update tb_cf_home_page
         <set>
-			<if test="imgName != null">`img_name` = #{imgName}, </if>
-			<if test="imgType != null">`img_type` = #{imgType}, </if>
-			<if test="imgVersion != null">`img_version` = #{imgVersion}, </if>
-			<if test="sort != null">`sort` = #{sort}, </if>
-			<if test="linkUrl != null">`link_url` = #{linkUrl}, </if>
-			<if test="imgUrl != null">`img_url` = #{imgUrl}, </if>
-			<if test="scanFlag != null">`scan_flag` = #{scanFlag}, </if>
-			<if test="redirectFlag != null">`redirect_flag` = #{redirectFlag}, </if>
+            <if test="imgName != null">`img_name` = #{imgName},</if>
+            <if test="imgType != null">`img_type` = #{imgType},</if>
+            <if test="imgVersion != null">`img_version` = #{imgVersion},</if>
+            <if test="sort != null">`sort` = #{sort},</if>
+            <if test="linkUrl != null">`link_url` = #{linkUrl},</if>
+            <if test="imgUrl != null">`img_url` = #{imgUrl},</if>
+            <if test="scanFlag != null">`scan_flag` = #{scanFlag},</if>
+            <if test="redirectFlag != null">`redirect_flag` = #{redirectFlag},</if>
             <if test="enableFlag != null">`enable_flag` = #{enableFlag}</if>
         </set>
         where page_id = #{pageId}

platform-admin/src/main/webapp/js/common.js

@@ -522,9 +522,11 @@ sexFormat = function (cellvalue) {
 versionFormat = function (cellvalue) {
     let returnStr = "未知";
     if (cellvalue == '0') {
-        returnStr = "旧版";
+        returnStr = "APP旧版";
     } else if (cellvalue == '1') {
-        returnStr = "新版";
+        returnStr = "APP新版";
+    } else if (cellvalue == '2') {
+        returnStr = "PC官网";
     }
     return returnStr;
 };

platform-admin/src/main/webapp/js/sys/tbcfhomepage.js

@@ -29,7 +29,7 @@ $(function () {
 let vm = new Vue({
     el: '#rrapp',
     data: {
-        chooseOptions:null,
+        chooseOptions: null,
         typeActive: 0, //显示索引
         items: [
             {
@@ -156,11 +156,15 @@ let vm = new Vue({
         versionOptions: [
             {
                 value: 0,
-                label: '旧版'
+                label: 'APP旧版'
             },
             {
                 value: 1,
-                label: '新版'
+                label: 'APP新版'
+            },
+            {
+                value: 2,
+                label: 'PC官网'
             }
         ],
         chooseOptions: [
@@ -242,39 +246,39 @@ let vm = new Vue({
                     vm.tbCfHomePage = r.tbCfHomePage;
                     //数据回显
                     vm.typeActive = vm.tbCfHomePage.imgType;
-                    vm.vHandleChange(null,vm.typeActive)
-                    if(vm.typeActive===0){
-                        vm.link=vm.tbCfHomePage.linkUrl;
-                    }else if(vm.typeActive===1){
+                    vm.vHandleChange(null, vm.typeActive)
+                    if (vm.typeActive === 0) {
+                        vm.link = vm.tbCfHomePage.linkUrl;
+                    } else if (vm.typeActive === 1) {
                         let ARR_ids = vm.tbCfHomePage.linkUrl.split(',');
-                        vm.CategoryLists1.forEach(item=>{
-                            if(item.value===ARR_ids[0]) {
+                        vm.CategoryLists1.forEach(item => {
+                            if (item.value === ARR_ids[0]) {
                                 vm.categoryListsActive1 = item.value
                             }
                         })
-                        if(ARR_ids[1]!='null'){
-                            vm.changeSubCateType(()=>{
-                                vm.CategoryLists2.forEach(item=>{
-                                    if(item.value===ARR_ids[1]){
+                        if (ARR_ids[1] != 'null') {
+                            vm.changeSubCateType(() => {
+                                vm.CategoryLists2.forEach(item => {
+                                    if (item.value === ARR_ids[1]) {
                                         vm.categoryListsActive2 = item.value
                                     }
                                 })
                             });
                         }
-                        if(ARR_ids[2]!='null'){
-                            vm.queryMiniCatagory(2,()=>{
-                                vm.CategoryLists3.forEach(item=>{
-                                    if(item.value===ARR_ids[2]){
+                        if (ARR_ids[2] != 'null') {
+                            vm.queryMiniCatagory(2, () => {
+                                vm.CategoryLists3.forEach(item => {
+                                    if (item.value === ARR_ids[2]) {
                                         vm.categoryListsActive3 = item.value
                                     }
                                 })
                             });
                         }
-                    }else if(vm.typeActive===2){
-                        setTimeout(()=>{
+                    } else if (vm.typeActive === 2) {
+                        setTimeout(() => {
                             vm.handleSearch(vm.tbCfHomePage.linkUrl);
-                        },500)
-                    }else if(vm.typeActive===3){
+                        }, 500)
+                    } else if (vm.typeActive === 3) {
                         vm.tagListsActive = vm.tbCfHomePage.linkUrl;
                     }
                 }
@@ -301,23 +305,23 @@ let vm = new Vue({
             switch (this.typeActive) {
                 case 0:
                     linkUrl = this.link;
-                    linkUrl?vm.saveOrUpdate(linkUrl):this.$Message.info('请输入链接')
+                    linkUrl ? vm.saveOrUpdate(linkUrl) : this.$Message.info('请输入链接')
                     break;
                 case 1:
-                    this.categoryListsActive1?(()=>{
+                    this.categoryListsActive1 ? (() => {
                         linkUrl = `${this.categoryListsActive1},${this.categoryListsActive2},${this.categoryListsActive3}`;
                         vm.saveOrUpdate(linkUrl)
-                    })():this.$Message.info('至少选择一种分类')
+                    })() : this.$Message.info('至少选择一种分类')
                     break;
                 case 2:
                     linkUrl = getSelectedRows("#searchjqGrid")[0];
-                    if(linkUrl){
+                    if (linkUrl) {
                         vm.saveOrUpdate(linkUrl)
                     }
                     break;
                 case 3:
                     linkUrl = this.tagListsActive;
-                    if(linkUrl){
+                    if (linkUrl) {
                         vm.saveOrUpdate(linkUrl)
                     }
                     break;