浏览代码

feat:修改一波看店的Bug

xzh 4 年之前
父节点
当前提交
cb1c75994a
共有 100 个文件被更改,包括 108 次插入153 次删除
  1. 5 1
      admins/fd-mall-backstage/WEB-INF/page/shop/broadcast.html
  2. 7 1
      admins/fd-mall-backstage/WEB-INF/page/shop/carousel.html
  3. 1 0
      admins/fd-mall-backstage/index.html
  4. 1 0
      admins/fd-mall-backstage/js/shop/adminuser.js
  5. 1 1
      admins/fd-mall-backstage/js/shop/adposition.js
  6. 1 1
      admins/fd-mall-backstage/js/shop/attribute.js
  7. 1 1
      admins/fd-mall-backstage/js/shop/attributecategory.js
  8. 1 1
      admins/fd-mall-backstage/js/shop/brand.js
  9. 1 0
      admins/fd-mall-backstage/js/shop/broadcast.js
  10. 1 0
      admins/fd-mall-backstage/js/shop/carousel.js
  11. 1 1
      admins/fd-mall-backstage/js/shop/cart.js
  12. 1 1
      admins/fd-mall-backstage/js/shop/category.js
  13. 1 1
      admins/fd-mall-backstage/js/shop/channel.js
  14. 1 0
      admins/fd-mall-backstage/js/shop/city.js
  15. 1 1
      admins/fd-mall-backstage/js/shop/collect.js
  16. 1 1
      admins/fd-mall-backstage/js/shop/comment.js
  17. 1 1
      admins/fd-mall-backstage/js/shop/coupon.js
  18. 1 0
      admins/fd-mall-backstage/js/shop/coupondetail.js
  19. 1 1
      admins/fd-mall-backstage/js/shop/feedback.js
  20. 1 1
      admins/fd-mall-backstage/js/shop/footprint.js
  21. 1 1
      admins/fd-mall-backstage/js/shop/goods.js
  22. 1 1
      admins/fd-mall-backstage/js/shop/goodshistory.js
  23. 1 1
      admins/fd-mall-backstage/js/shop/goodshotspot.js
  24. 1 1
      admins/fd-mall-backstage/js/shop/goodsissue.js
  25. 1 1
      admins/fd-mall-backstage/js/shop/goodsspecification.js
  26. 1 1
      admins/fd-mall-backstage/js/shop/helpissue.js
  27. 1 1
      admins/fd-mall-backstage/js/shop/helptype.js
  28. 1 1
      admins/fd-mall-backstage/js/shop/keywords.js
  29. 1 1
      admins/fd-mall-backstage/js/shop/linkhotspot.js
  30. 1 1
      admins/fd-mall-backstage/js/shop/order.js
  31. 1 1
      admins/fd-mall-backstage/js/shop/product.js
  32. 1 1
      admins/fd-mall-backstage/js/shop/searchhistory.js
  33. 1 1
      admins/fd-mall-backstage/js/shop/shopuser.js
  34. 1 1
      admins/fd-mall-backstage/js/shop/specification.js
  35. 1 1
      admins/fd-mall-backstage/js/shop/topic.js
  36. 1 1
      admins/fd-mall-backstage/js/shop/topiccategory.js
  37. 1 1
      admins/fd-mall-backstage/js/shop/usercoupon.js
  38. 1 1
      admins/fd-mall-backstage/js/shop/userlevel.js
  39. 1 1
      admins/fd-mall-backstage/js/sys/config.js
  40. 1 1
      admins/fd-mall-backstage/js/sys/dept.js
  41. 1 1
      admins/fd-mall-backstage/js/sys/generator.js
  42. 1 1
      admins/fd-mall-backstage/js/sys/log.js
  43. 1 1
      admins/fd-mall-backstage/js/sys/macro.js
  44. 1 1
      admins/fd-mall-backstage/js/sys/menu.js
  45. 1 1
      admins/fd-mall-backstage/js/sys/oss.js
  46. 1 1
      admins/fd-mall-backstage/js/sys/region.js
  47. 1 1
      admins/fd-mall-backstage/js/sys/role.js
  48. 1 1
      admins/fd-mall-backstage/js/sys/schedule.js
  49. 1 1
      admins/fd-mall-backstage/js/sys/schedule_log.js
  50. 1 1
      admins/fd-mall-backstage/js/sys/smslog.js
  51. 1 1
      admins/fd-mall-backstage/js/sys/user.js
  52. 1 1
      admins/fd-mall-backstage/js/test/iviewDemo.js
  53. 0 67
      admins/fd-mall-backstage/statics/css/main.css
  54. 1 0
      admins/zl-mall-backstage/index.html
  55. 1 0
      admins/zl-mall-backstage/js/shop/adminuser.js
  56. 1 1
      admins/zl-mall-backstage/js/shop/adposition.js
  57. 1 1
      admins/zl-mall-backstage/js/shop/attribute.js
  58. 1 1
      admins/zl-mall-backstage/js/shop/attributecategory.js
  59. 1 1
      admins/zl-mall-backstage/js/shop/brand.js
  60. 1 0
      admins/zl-mall-backstage/js/shop/broadcast.js
  61. 1 0
      admins/zl-mall-backstage/js/shop/carousel.js
  62. 1 1
      admins/zl-mall-backstage/js/shop/cart.js
  63. 1 1
      admins/zl-mall-backstage/js/shop/category.js
  64. 1 1
      admins/zl-mall-backstage/js/shop/channel.js
  65. 1 0
      admins/zl-mall-backstage/js/shop/city.js
  66. 1 1
      admins/zl-mall-backstage/js/shop/collect.js
  67. 1 1
      admins/zl-mall-backstage/js/shop/comment.js
  68. 1 1
      admins/zl-mall-backstage/js/shop/coupon.js
  69. 1 0
      admins/zl-mall-backstage/js/shop/coupondetail.js
  70. 1 1
      admins/zl-mall-backstage/js/shop/feedback.js
  71. 1 1
      admins/zl-mall-backstage/js/shop/footprint.js
  72. 1 1
      admins/zl-mall-backstage/js/shop/goods.js
  73. 1 1
      admins/zl-mall-backstage/js/shop/goodshistory.js
  74. 1 1
      admins/zl-mall-backstage/js/shop/goodshotspot.js
  75. 1 1
      admins/zl-mall-backstage/js/shop/goodsissue.js
  76. 1 1
      admins/zl-mall-backstage/js/shop/goodsspecification.js
  77. 1 1
      admins/zl-mall-backstage/js/shop/helpissue.js
  78. 1 1
      admins/zl-mall-backstage/js/shop/helptype.js
  79. 1 1
      admins/zl-mall-backstage/js/shop/keywords.js
  80. 1 1
      admins/zl-mall-backstage/js/shop/linkhotspot.js
  81. 1 1
      admins/zl-mall-backstage/js/shop/order.js
  82. 1 1
      admins/zl-mall-backstage/js/shop/product.js
  83. 1 1
      admins/zl-mall-backstage/js/shop/searchhistory.js
  84. 1 1
      admins/zl-mall-backstage/js/shop/shopuser.js
  85. 1 1
      admins/zl-mall-backstage/js/shop/specification.js
  86. 1 1
      admins/zl-mall-backstage/js/shop/topic.js
  87. 1 1
      admins/zl-mall-backstage/js/shop/topiccategory.js
  88. 1 1
      admins/zl-mall-backstage/js/shop/usercoupon.js
  89. 1 1
      admins/zl-mall-backstage/js/shop/userlevel.js
  90. 1 1
      admins/zl-mall-backstage/js/sys/config.js
  91. 1 1
      admins/zl-mall-backstage/js/sys/dept.js
  92. 1 1
      admins/zl-mall-backstage/js/sys/generator.js
  93. 1 1
      admins/zl-mall-backstage/js/sys/log.js
  94. 1 1
      admins/zl-mall-backstage/js/sys/macro.js
  95. 1 1
      admins/zl-mall-backstage/js/sys/menu.js
  96. 1 1
      admins/zl-mall-backstage/js/sys/oss.js
  97. 1 1
      admins/zl-mall-backstage/js/sys/region.js
  98. 1 1
      admins/zl-mall-backstage/js/sys/role.js
  99. 1 1
      admins/zl-mall-backstage/js/sys/schedule.js
  100. 0 0
      admins/zl-mall-backstage/js/sys/schedule_log.js

+ 5 - 1
admins/fd-mall-backstage/WEB-INF/page/shop/broadcast.html

@@ -25,7 +25,7 @@
                 #end
                 #end
                 <!-- <Icon type="share"></Icon> -->
                 <!-- <Icon type="share"></Icon> -->
                 #if($shiro.hasPermission("brand:update"))
                 #if($shiro.hasPermission("brand:update"))
-                <i-button type="warning" @click="share"><i class="ivu-icon ivu-icon-share"></i>&nbsp;分享</i-button>
+                <i-button type="warning" @click="share"><i class="ivu-icon ivu-icon-share"></i>&nbsp;开播码</i-button>
                 #end
                 #end
                 #if($shiro.hasPermission("brand:delete"))
                 #if($shiro.hasPermission("brand:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
@@ -74,6 +74,10 @@
                     <div class="c-winput">
                     <div class="c-winput">
                         <i-input v-model="broadcast.anchorWechat" placeholder="填写微信账号"/>
                         <i-input v-model="broadcast.anchorWechat" placeholder="填写微信账号"/>
                     </div>
                     </div>
+                    <div class="qr-renzheng" v-if="valiImg">
+                        <p style="color: red;">主播未进行验证,请扫描下方二维码进行身份验证</p>
+                        <img :src="valiImg" alt="">
+                    </div>
                 </Form-item>
                 </Form-item>
 
 
                 <div style="font-size: 16px;font-weight: bold;margin-bottom: 10px;">直播间配置</div>
                 <div style="font-size: 16px;font-weight: bold;margin-bottom: 10px;">直播间配置</div>

+ 7 - 1
admins/fd-mall-backstage/WEB-INF/page/shop/carousel.html

@@ -77,7 +77,13 @@
 
 
                 <Form-item label="排序">
                 <Form-item label="排序">
                     <div class="c-winput">
                     <div class="c-winput">
-                        <Input-number :min="0" :step="1" v-model="carousel.order" placeholder="排序" style="width: 188px;"/>
+                        <Input-number :min="0" :step="1" v-model="carousel.sortOrder" placeholder="排序" style="width: 188px;"/>
+                    </div>
+                </Form-item>
+
+                <Form-item label="是否显示">
+                    <div class="c-winput">
+                        <i-switch v-model="carousel.isShow" :false-value="0" :true-value="1"  />
                     </div>
                     </div>
                 </Form-item>
                 </Form-item>
 
 

+ 1 - 0
admins/fd-mall-backstage/index.html

@@ -62,6 +62,7 @@
             getUser: function () {
             getUser: function () {
                 $.getJSON("sys/user/info?_" + $.now(), function (r) {
                 $.getJSON("sys/user/info?_" + $.now(), function (r) {
                     vm.user = r.user;
                     vm.user = r.user;
+                    window.localStorage && localStorage.setItem('_userInfo', JSON.stringify(r.user))
                 });
                 });
             },
             },
             updatePassword: function () {
             updatePassword: function () {

文件差异内容过多而无法显示
+ 1 - 0
admins/fd-mall-backstage/js/shop/adminuser.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/adposition.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/attribute.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/attributecategory.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/brand.js


文件差异内容过多而无法显示
+ 1 - 0
admins/fd-mall-backstage/js/shop/broadcast.js


文件差异内容过多而无法显示
+ 1 - 0
admins/fd-mall-backstage/js/shop/carousel.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/cart.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/category.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/channel.js


文件差异内容过多而无法显示
+ 1 - 0
admins/fd-mall-backstage/js/shop/city.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/collect.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/comment.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/coupon.js


文件差异内容过多而无法显示
+ 1 - 0
admins/fd-mall-backstage/js/shop/coupondetail.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/feedback.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/footprint.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/goods.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/goodshistory.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/goodshotspot.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/goodsissue.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/goodsspecification.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/helpissue.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/helptype.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/keywords.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/linkhotspot.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/order.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/product.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/searchhistory.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/shopuser.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/specification.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/topic.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/topiccategory.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/usercoupon.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/shop/userlevel.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/config.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/dept.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/generator.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/log.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/macro.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/menu.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/oss.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/region.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/role.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/schedule.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/schedule_log.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/smslog.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/sys/user.js


文件差异内容过多而无法显示
+ 1 - 1
admins/fd-mall-backstage/js/test/iviewDemo.js


+ 0 - 67
admins/fd-mall-backstage/statics/css/main.css

@@ -370,70 +370,3 @@ tbody > tr > th {
     width: 90%;
     width: 90%;
 }
 }
 
 
-.norecords {
-    border-width: 2px !important;
-	display:none;
-    font-weight: bold;
-    left: 45%;
-    margin: 5px;
-    padding: 6px;
-    position: absolute;
-    text-align: center;
-    top: 45%;
-    width: auto;
-    z-index: 102;
-}
-
-.demo-upload-list{
-    display: inline-block;
-    width: 160px;
-    height: auto;
-    text-align: center;
-    line-height: 160px;
-    border: 1px solid transparent;
-    border-radius: 4px;
-    overflow: hidden;
-    background: #fff;
-    position: relative;
-    box-shadow: 0 1px 1px rgba(0,0,0,.2);
-    margin-right: 4px;
-}
-.demo-upload-list img{
-    width: 100%;
-    height: 100%;
-}
-.demo-upload-list-cover{
-    position: absolute;
-    opacity: 0;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    background: rgba(0,0,0,.6);
-}
-.demo-upload-list:hover .demo-upload-list-cover{
-    opacity: 1;
-}
-.demo-upload-list-cover i{
-    color: #fff;
-    font-size: 20px;
-    cursor: pointer;
-    margin: 0 2px;
-}
-
-.demo-spin-icon-load{
-    animation: ani-demo-spin 1s linear infinite;
-}
-@keyframes ani-demo-spin {
-    from { transform: rotate(0deg);}
-    50%  { transform: rotate(180deg);}
-    to   { transform: rotate(360deg);}
-}
-.demo-spin-col{
-    height: 100px;
-    position: relative;
-    border: 1px solid #eee;
-}
-.ivu-spin-fix{
-    z-index:500!important;
-}

+ 1 - 0
admins/zl-mall-backstage/index.html

@@ -62,6 +62,7 @@
             getUser: function () {
             getUser: function () {
                 $.getJSON("sys/user/info?_" + $.now(), function (r) {
                 $.getJSON("sys/user/info?_" + $.now(), function (r) {
                     vm.user = r.user;
                     vm.user = r.user;
+                    window.localStorage && localStorage.setItem('_userInfo', JSON.stringify(r.user))
                 });
                 });
             },
             },
             updatePassword: function () {
             updatePassword: function () {

文件差异内容过多而无法显示
+ 1 - 0
admins/zl-mall-backstage/js/shop/adminuser.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/adposition.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/attribute.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/attributecategory.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/brand.js


文件差异内容过多而无法显示
+ 1 - 0
admins/zl-mall-backstage/js/shop/broadcast.js


文件差异内容过多而无法显示
+ 1 - 0
admins/zl-mall-backstage/js/shop/carousel.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/cart.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/category.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/channel.js


文件差异内容过多而无法显示
+ 1 - 0
admins/zl-mall-backstage/js/shop/city.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/collect.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/comment.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/coupon.js


文件差异内容过多而无法显示
+ 1 - 0
admins/zl-mall-backstage/js/shop/coupondetail.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/feedback.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/footprint.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/goods.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/goodshistory.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/goodshotspot.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/goodsissue.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/goodsspecification.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/helpissue.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/helptype.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/keywords.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/linkhotspot.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/order.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/product.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/searchhistory.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/shopuser.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/specification.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/topic.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/topiccategory.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/usercoupon.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/shop/userlevel.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/sys/config.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/sys/dept.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/sys/generator.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/sys/log.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/sys/macro.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/sys/menu.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/sys/oss.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/sys/region.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/sys/role.js


文件差异内容过多而无法显示
+ 1 - 1
admins/zl-mall-backstage/js/sys/schedule.js


+ 0 - 0
admins/zl-mall-backstage/js/sys/schedule_log.js


部分文件因为文件数量过多而无法显示