diff --git a/ant-design-vue-jeecg/src/config/router.config.js b/ant-design-vue-jeecg/src/config/router.config.js index 3b149bb7..6f23714e 100644 --- a/ant-design-vue-jeecg/src/config/router.config.js +++ b/ant-design-vue-jeecg/src/config/router.config.js @@ -652,4 +652,12 @@ export const constantRouterMap = [ path: '/shopping/order',//这里是你需要设置新窗口打开的页面的路径s component: () => import('@/views/shopping/pages/orderDetails'), }, + { + path: '/shopping/chengyi',//这里是你需要设置新窗口打开的页面的路径s + component: () => import('@/views/shopping/pages/chengyi'), + }, + { + path: '/shopping/news',//这里是你需要设置新窗口打开的页面的路径s + component: () => import('@/views/shopping/pages/news'), + }, ] diff --git a/ant-design-vue-jeecg/src/permission.js b/ant-design-vue-jeecg/src/permission.js index 11fee8c4..84cfc773 100644 --- a/ant-design-vue-jeecg/src/permission.js +++ b/ant-design-vue-jeecg/src/permission.js @@ -19,7 +19,7 @@ const whiteList = ['/user/login','/userequip/loginequip','/user/sgin', '/sckz/sckzzxt','/sbjm/sbjmsjkzxt','/jxgl/jxglsjkzxt','/szls/szlssjkzxt','/jxdsj/jxdsjzszxt', '/ybgl/ybglsjkzxt','/mflgl/mflglsjkzxt','/ddcl/ddclzxt','/ddgl/ddglzxt','/dyhsc/dyhsczxt','/znyy/znyysczhgkzzrj', '/znyyjc/znyycjrjxt','/gdgz/gdgzzxt','/shopping/shopHome','/shopping/clothType','/shopping/sirendingzhi', - '/shopping/ClothDetail','/shopping/person','/shopping/person','/shopping/order'] // no redirect whitelist + '/shopping/ClothDetail','/shopping/person','/shopping/person','/shopping/order','/shopping/chengyi','/shopping/news'] // no redirect whitelist router.beforeEach((to, from, next) => { NProgress.start() // start progress bar diff --git a/ant-design-vue-jeecg/src/views/collecttype/admin/CollectTypeList.vue b/ant-design-vue-jeecg/src/views/collecttype/admin/CollectTypeList.vue index 730ad332..e34d3b5c 100644 --- a/ant-design-vue-jeecg/src/views/collecttype/admin/CollectTypeList.vue +++ b/ant-design-vue-jeecg/src/views/collecttype/admin/CollectTypeList.vue @@ -84,19 +84,20 @@ 编辑 - + 添加下级 - - + + 删除 - + diff --git a/ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue b/ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue index 71068dc8..856829d8 100644 --- a/ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue +++ b/ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue @@ -3,7 +3,7 @@ - + - + - + @@ -76,6 +76,10 @@ }, confirmLoading: false, validatorRules: { + goodsname: [ + { required: true, message: '请输入商品!'}, + ], + }, url: { add: "/customercollectgoods/customercollectgoods/add", @@ -127,7 +131,7 @@ that.confirmLoading = false; }) } - + }) }, popupCallback(value,row){ diff --git a/ant-design-vue-jeecg/src/views/customershoppingcart/admin/CustomerShoppingCartList.vue b/ant-design-vue-jeecg/src/views/customershoppingcart/admin/CustomerShoppingCartList.vue index 6d3df2ad..075e8d8c 100644 --- a/ant-design-vue-jeecg/src/views/customershoppingcart/admin/CustomerShoppingCartList.vue +++ b/ant-design-vue-jeecg/src/views/customershoppingcart/admin/CustomerShoppingCartList.vue @@ -94,8 +94,8 @@ - 购买 - + 详情 商品详情 diff --git a/ant-design-vue-jeecg/src/views/customershoppingcart/admin/modules/CustomerShoppingCartForm.vue b/ant-design-vue-jeecg/src/views/customershoppingcart/admin/modules/CustomerShoppingCartForm.vue index 9e8d055d..2d022f26 100644 --- a/ant-design-vue-jeecg/src/views/customershoppingcart/admin/modules/CustomerShoppingCartForm.vue +++ b/ant-design-vue-jeecg/src/views/customershoppingcart/admin/modules/CustomerShoppingCartForm.vue @@ -21,7 +21,7 @@ /> - + @@ -41,17 +41,17 @@ - + - + - + @@ -61,12 +61,12 @@ - + - + @@ -74,6 +74,7 @@ + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/maker/ZyMakerList.vue b/ant-design-vue-jeecg/src/views/maker/ZyMakerList.vue index 69932155..d0bc67d8 100644 --- a/ant-design-vue-jeecg/src/views/maker/ZyMakerList.vue +++ b/ant-design-vue-jeecg/src/views/maker/ZyMakerList.vue @@ -214,9 +214,15 @@ export default { }else{ this.$message.warning(res.message); } + this.loading = true; + setTimeout(()=>{ + this.loading = false; + }, 2000); // this.$emit('valueChange',1) // this.close() }) + + }, initDictConfig() { }, diff --git a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.css b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.css index 3439648d..a944f9ee 100644 --- a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.css +++ b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3854415 */ - src: url('iconfont.woff2?t=1673860163583') format('woff2'), - url('iconfont.woff?t=1673860163583') format('woff'), - url('iconfont.ttf?t=1673860163583') format('truetype'); + src: url('iconfont.woff2?t=1675756284306') format('woff2'), + url('iconfont.woff?t=1675756284306') format('woff'), + url('iconfont.ttf?t=1675756284306') format('truetype'); } .iconfont { @@ -13,6 +13,26 @@ -moz-osx-font-smoothing: grayscale; } +.icon-biaoqian1:before { + content: "\e60e"; +} + +.icon-xizhuang1:before { + content: "\e607"; +} + +.icon-dingzhi:before { + content: "\e651"; +} + +.icon-bijijilu:before { + content: "\e6f3"; +} + +.icon-jilu:before { + content: "\e69f"; +} + .icon-weishoucang:before { content: "\e603"; } diff --git a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.js b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.js index 8490ccc6..ecb3dfc4 100644 --- a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.js +++ b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_3854415='',function(c){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var i,o,n,l,a,s=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}i=function(){var t,e=document.createElement("div");e.innerHTML=c._iconfont_svg_string_3854415,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?s(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),i()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(n=i,l=c.document,a=!1,h(),l.onreadystatechange=function(){"complete"==l.readyState&&(l.onreadystatechange=null,d())})}function d(){a||(a=!0,n())}function h(){try{l.documentElement.doScroll("left")}catch(t){return void setTimeout(h,50)}d()}}(window); \ No newline at end of file +window._iconfont_svg_string_3854415='',function(t){var c=(c=document.getElementsByTagName("script"))[c.length-1],l=c.getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var i,a,e,o,n,h=function(c,l){l.parentNode.insertBefore(c,l)};if(l&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}i=function(){var c,l=document.createElement("div");l.innerHTML=t._iconfont_svg_string_3854415,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?h(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),i()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(e=i,o=t.document,n=!1,d(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,s())})}function s(){n||(n=!0,e())}function d(){try{o.documentElement.doScroll("left")}catch(c){return void setTimeout(d,50)}s()}}(window); \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.json b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.json index 622d2a89..669c426d 100644 --- a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.json +++ b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.json @@ -5,6 +5,41 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "7556872", + "name": "标签", + "font_class": "biaoqian1", + "unicode": "e60e", + "unicode_decimal": 58894 + }, + { + "icon_id": "7767642", + "name": "西装", + "font_class": "xizhuang1", + "unicode": "e607", + "unicode_decimal": 58887 + }, + { + "icon_id": "12975225", + "name": "定制", + "font_class": "dingzhi", + "unicode": "e651", + "unicode_decimal": 58961 + }, + { + "icon_id": "18406367", + "name": "笔记，记录", + "font_class": "bijijilu", + "unicode": "e6f3", + "unicode_decimal": 59123 + }, + { + "icon_id": "20710441", + "name": "记录", + "font_class": "jilu", + "unicode": "e69f", + "unicode_decimal": 59039 + }, { "icon_id": "9526741", "name": "未收藏", diff --git a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.ttf b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.ttf index 45e4eccf..4a1f4656 100644 Binary files a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.ttf and b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.ttf differ diff --git a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.woff b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.woff index 6fea7e63..2a17bc46 100644 Binary files a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.woff and b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.woff differ diff --git a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.woff2 b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.woff2 index 57a48c17..65a934ff 100644 Binary files a/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.woff2 and b/ant-design-vue-jeecg/src/views/shopping/assets/iconfont/iconfont.woff2 differ diff --git a/ant-design-vue-jeecg/src/views/shopping/components/Header/HeaderView.vue b/ant-design-vue-jeecg/src/views/shopping/components/Header/HeaderView.vue index 50b7937d..b18320cb 100644 --- a/ant-design-vue-jeecg/src/views/shopping/components/Header/HeaderView.vue +++ b/ant-design-vue-jeecg/src/views/shopping/components/Header/HeaderView.vue @@ -12,10 +12,10 @@ 私人定制 - 成衣推荐 - 关于我们 diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue b/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue new file mode 100644 index 00000000..d880218c --- /dev/null +++ b/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue @@ -0,0 +1,518 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue index 056dae28..cdfad00a 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue @@ -13,24 +13,27 @@ 我的账户 我的收藏 地址管理 - + 发票管理 - + Option 1 - + Option 2 - + Option 3 - + Option 4 全部订单 + + 全部订单 + 待支付 @@ -46,7 +49,7 @@ -
+
订单编号：{{item.orderNum}} @@ -91,7 +94,7 @@ data() { return { current: ['mail'], - allOrders:[ + allOrders1:[ { id:1, orderNum:'CN172839729', @@ -119,6 +122,7 @@ total:5912 } ], + allOrders:[], }; }, @@ -127,8 +131,14 @@ console.log(key); }, menuChange(key){ - if(key == daizhifu){ - // this.allOrders.forEach() + this.current.shift() + this.current.push(key.key) + console.log(this.allOrders) + + if(key.key == 'allorders'){ + console.log('----') + this.allOrders = this.allOrders1 + console.log(this.allOrders) } } }, diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/news.vue b/ant-design-vue-jeecg/src/views/shopping/pages/news.vue new file mode 100644 index 00000000..1f9b77ba --- /dev/null +++ b/ant-design-vue-jeecg/src/views/shopping/pages/news.vue @@ -0,0 +1,34 @@ + + + + + + + + + diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue index b35197b3..0c42dc13 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue @@ -234,7 +234,7 @@ } .info{ width: 43.33%; - padding-right: 10px; + padding-right: 15px; .headline{ font-weight: 500; } @@ -242,7 +242,7 @@ span{ margin-left: 10px; display: inline-block; - width: 80%; + width: 75%; } } } diff --git a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue index e51da067..720362f6 100644 --- a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue +++ b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue @@ -1,5 +1,5 @@ @@ -805,9 +758,30 @@ .section2 .itemDiv { justify-content: space-around; } - .section2 .itemDiv .item { + .section2 .itemDiv .item a{ flex-direction: column; align-items: center; + justify-content: center; + width: 336px; + height: 336px; + color: #333; + transition: all 0.2s; + } + .section2 .itemDiv .item a i{ + font-size: 100px; + color: #746957; + + } + .section2 .itemDiv .item a:hover i{ + color: #fff; + } + .section2 .itemDiv .item a:hover .title_3,.section2 .itemDiv .item a:hover .title_4{ + color: #746957; + + } + .section2 .itemDiv .item a:hover{ + background: #EEE6D9; + border: 1px dashed #919190; } .section2 .itemDiv .item .title_3 { margin: 20px 0; @@ -843,6 +817,9 @@ } .section3 .itemDiv .item .titleDiv { font-size: 30px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .section3 .itemDiv .item .titleDiv span { margin-left: 10px; @@ -877,7 +854,7 @@ } .section5 .more { margin-bottom: 50px; - margin-top: 50px; + /*margin-top: 50px;*/ } .section5 .tabs >>> .el-tabs__item.is-top { font-size: 26px; @@ -887,6 +864,7 @@ } .section5 .tabs .jz { justify-content: space-between; + flex-wrap: wrap; } .section5 .tabs .jz .item { background-color: #fff; @@ -894,15 +872,20 @@ flex-direction: column; align-items: center; padding-bottom: 30px; + margin-bottom: 30px; } .section5 .tabs .jz .item img { width: 80%; } .section5 .tabs .jz .item p { width: 100%; + box-sizing: border-box; + text-overflow: ellipsis; padding-left: 28px; padding-right: 28px; - box-sizing: border-box; + overflow: hidden; + text-align: left; + white-space: nowrap; } .section5 .tabs .jz .item p .line { margin-left: 8px; @@ -927,4 +910,4 @@ color: rgba(116, 105, 87, 0.6); } /* -----------------------第五部分完成----------------------------------------------------------------------------------------- */ - \ No newline at end of file + diff --git a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/controller/ZyUserController.java b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/controller/ZyUserController.java index 330accb7..25726d78 100644 --- a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/controller/ZyUserController.java +++ b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/controller/ZyUserController.java @@ -30,6 +30,17 @@ public class ZyUserController { + + @AutoLog(value = "查询所有流水线员工基本信息") + @ApiOperation(value = "查询所有流水线员工基本信息", notes = "查询所有流水线员工基本信息") + @GetMapping(value = "/allgk") + public Result getAllgk() { + List allUsergk = iZyUserService.getAllUsergk(); + System.out.println(allUsergk); + return Result.OK(allUsergk); + } + + @AutoLog(value = "查询所有流水线员工基本信息") @ApiOperation(value = "查询所有流水线员工基本信息", notes = "查询所有流水线员工基本信息") @GetMapping(value = "/allUserOnLine") diff --git a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/ZyUserMapper.java b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/ZyUserMapper.java index 47c783bb..8fd1091d 100644 --- a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/ZyUserMapper.java +++ b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/ZyUserMapper.java @@ -2,6 +2,7 @@ package org.jeecg.modules.person.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.person.vo.*; import org.jeecg.modules.person.entity.SysUser; import org.jeecg.modules.person.vo.*; @@ -23,4 +24,10 @@ public interface ZyUserMapper extends BaseMapper { List getWorkIdentityByMachine(String id); List getWorkByIdentityId(List ids); + + @Select("select id,username,realname,avatar,sex,email,phone,status from sys_user") + List getAllUsergk(); + + @Select("select count(1) from sys_user_role where user_id=#{id} and role_id='1601135568301318146'") + Boolean isboolc(String id); } diff --git a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/xml/ZyUserMapper.xml b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/xml/ZyUserMapper.xml index b6e649e3..0040225a 100644 --- a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/xml/ZyUserMapper.xml +++ b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/xml/ZyUserMapper.xml @@ -1,7 +1,11 @@ - + + + + +