update

admins/fd-mall-backstage/WEB-INF/page/shop/brand.html

@@ -211,7 +211,7 @@
 
                 <Form-item label="店铺管理员：" prop="newSortOrder">
                     <div class="c-winput">
-                        <div v-if="brand.nickname">{{brand.nickname}}</div>
+                        <div v-if="brand.adminName">{{brand.adminName}}</div>
                         <i-button @click="openAdmin">选择店铺管理员</i-button>
                     </div>
                 </Form-item>

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

@@ -23,6 +23,10 @@
                 #if($shiro.hasPermission("brand:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 #end
+                <!-- <Icon type="share"></Icon> -->
+                #if($shiro.hasPermission("brand:update"))
+                <i-button type="warning" @click="share"><i class="ivu-icon ivu-icon-share"></i>&nbsp;分享</i-button>
+                #end
                 #if($shiro.hasPermission("brand:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end

js/shop/brand.js

@@ -5059,7 +5059,7 @@ $(function () {
          showList: true,
          title: null,
          defaultList:[],
-         brand: {listPicUrl: '',nickname:'',adminId:'',sortOrder:1,longitude:'',latitude:'',address:'',picList:[],introduceVideoCover:'', introduceVideo:'',type:0, picUrl: '', appListPicUrl: '', newPicUrl: '', isShow: 1, isNew: 0},
+         brand: {listPicUrl: '',adminName:'',adminId:'',sortOrder:1,longitude:'',latitude:'',address:'',picList:[],introduceVideoCover:'', introduceVideo:'',type:0, picUrl: '', appListPicUrl: '', newPicUrl: '', isShow: 1, isNew: 0},
          ruleValidate: {
             name: [
                 {required: true, message: '店铺名称不能为空', trigger: 'blur'}
@@ -5140,7 +5140,7 @@ $(function () {
              vm.showList = false;
              vm.title = "新增";
              vm.defaultList = []
-             vm.brand = {listPicUrl: '',nickname:'',adminId:'',sortOrder:1,longitude:'',latitude:'',address:'',picList:[],introduceVideoCover:'', introduceVideo:'',type:0,sceneUrl:'',sceneName:'', picUrl: '', appListPicUrl: '', newPicUrl: '', isShow: 1, isNew: 0};
+             vm.brand = {listPicUrl: '',adminName:'',adminId:'',sortOrder:1,longitude:'',latitude:'',address:'',picList:[],introduceVideoCover:'', introduceVideo:'',type:0,sceneUrl:'',sceneName:'', picUrl: '', appListPicUrl: '', newPicUrl: '', isShow: 1, isNew: 0};
          },
          update: function (event) {
              var id = getSelectedRow("#jqGrid");
@@ -5323,7 +5323,7 @@ $(function () {
           
           if (data.userId) {
             vm.brand.adminId = data.userId || ''
-            vm.brand.nickname = data.nickname || ''
+            vm.brand.adminName = data.nickname || ''
             layer.closeAll()
           }
       }, false);

js/shop/broadcast.js

@@ -122,15 +122,8 @@ $(function () {
              vm.title = "新增";
              vm.broadcast =   {name: '',coverImg:'',startTime:'',endTime:'',anchorName:'',anchorWechat:'', shareImg: '',feedsImg: '',screenType:0,isFeedsPublic: 0,type: 1,closeLike:0, closeGoods: 0,closeKf:0, closeComment: 0,closeReplay: 0,closeShare: 0}
          },
-         update: function (event) {
-             var data = getSelectedRowData("#jqGrid");
-             if (data.id == null) {
-                 return;
-             }
-             vm.showList = false;
-             vm.title = "修改";
-  
-             vm.getInfo(data.slideId)
+         share: function (event) {
+             eyeImage('https://res.wx.qq.com/op_res/BbVNeczA1XudfjVqCVoKgfuWe7e3aUhokktRVOqf_F0IqS6kYR--atCpVNUUC3zr');
          },
          saveOrUpdate: function (event) {
              var url = vm.broadcast.slideId == null ? "../liveRoom/add" : "../liveRoom/update";
@@ -157,11 +150,6 @@ $(function () {
             let date = new Date(val)
             this.endTime = parseInt(date.getTime()/1000)
          },
-         funChange(val){
-            console.log(this.func)
-            console.log(val)
-            
-         },
          del: function (event) {
              
             let rowId = getSelectedRow("#jqGrid");