更新#的问题

platform-admin/src/main/webapp/js/shop/brand.js

@@ -116,9 +116,9 @@ $(function () {
                         sortable: false,
                         hidden: JSON.parse(localStorage.getItem('userInfo')).roleIdList[0] == 5,
                         formatter: function (value, col, row) {
-                           
+
                             let liveRoomUrl = row.liveRoomUrl
-                            liveRoomUrl = liveRoomUrl.replace('shop', 'epc') 
+                            liveRoomUrl = liveRoomUrl.replace('shop', 'epc')
                             let sceneNum = row.sceneNum
                             return `<a style="color: #2db7f5;"  onclick="open_4dkankan('${liveRoomUrl}','${sceneNum}')" target="_blank">打开编辑器</a>`;
                         }
@@ -156,7 +156,7 @@ function open_4dkankan(url, sceneNum) {
         successCallback: function (r) {
             console.log(r)
             // 获取start_url成功后执行
-            newTab.location.href = url  + '&token=' + r.data
+            newTab.location.href = url + '&token=' + r.data
             // window.open(url.toString())
         }
     });
@@ -10896,10 +10896,17 @@ var vm = new Vue({
             } else {
                 var data = getSelectedRowData("#jqGrid");
                 console.log(data)
+                var sceneName = encodeURIComponent(data.sceneName)
+                var name = encodeURIComponent(data.name)
+                // console.log(sceneName)
+                // console.log(name)
+                var params = encodeURIComponent(`name=${data.name}&sceneName=${data.sceneName}&id=${data.id}&userName=${data.bindShowerNameList}`)
                 openWindow({
                     type: 2,
                     title: '绑定主播',
-                    content: `../shop/selectUser.html?name=${data.name}&sceneName=${data.sceneName}&id=${data.id}&userName=${data.bindShowerNameList}`
+                    // content: `../shop/selectUser.html?name=${data.name}&sceneName=${data.sceneName}&id=${data.id}&userName=${data.bindShowerNameList}`
+                    content: `../shop/selectUser.html?name=${name}&sceneName=${sceneName}&id=${data.id}&userName=${data.bindShowerNameList}`
+                    // content: `../shop/selectUser.html?` + params
                 })
             }
 

platform-admin/src/main/webapp/js/shop/selectUser.js

@@ -1,6 +1,9 @@
 let cacheData = []
 let cacheItems = []
-$(function() {
+$(function () {
+   
+    // let query_params = decodeURIComponent(window.location.href.split('?')[1])
+    // console.log(query_params)
     let userInfo = window.localStorage && JSON.parse(localStorage.getItem('_userInfo'))
     let userName = getQueryString("userName");
     let brandId = getQueryString("id");
@@ -17,7 +20,7 @@ $(function() {
             rows: "pageSize",
             order: "order"
         },
-        onSelectAll: function() {
+        onSelectAll: function () {
             var grid = $('#jqGrid');
             var rowKey = grid.getGridParam("selarrrow");
             $('#selctedNum').html(rowKey.length)
@@ -46,7 +49,7 @@ $(function() {
 
             // cacheItems.indexOf(item)<=-1 && cacheItems.push(rowid)
         },
-        onSelectRow: function() {
+        onSelectRow: function () {
             var grid = $('#jqGrid');
             var rowKey = grid.getGridParam("selarrrow");
             $('#selctedNum').html(rowKey.length)
@@ -58,7 +61,7 @@ $(function() {
                 $('#' + item.userId).children('input').attr("disabled", false)
             })
         },
-        loadComplete: function() {
+        loadComplete: function () {
             let arr = userName ? userName.split(';') : []
             arr.forEach(item => {
                 $('#jqGrid').jqGrid('setSelection', item);
@@ -71,17 +74,37 @@ $(function() {
             total: "totalPageNum",
             records: "totalNum"
         },
-        colModel: [
-            { label: 'userId', name: 'userId', index: 'userId', key: true, hidden: true },
-            { label: '员工名称', name: 'username', index: "nickname", key: true },
-            { label: '角色', name: 'roleName', index: 'roleName', width: 75 },
-            { label: '手机号', name: 'mobile', index: 'mobile', width: 75 },
+        colModel: [{
+                label: 'userId',
+                name: 'userId',
+                index: 'userId',
+                key: true,
+                hidden: true
+            },
+            {
+                label: '员工名称',
+                name: 'username',
+                index: "nickname",
+                key: true
+            },
+            {
+                label: '角色',
+                name: 'roleName',
+                index: 'roleName',
+                width: 75
+            },
+            {
+                label: '手机号',
+                name: 'mobile',
+                index: 'mobile',
+                width: 75
+            },
             {
                 label: '绑定时间',
                 name: 'createTime',
                 index: 'create_time',
                 width: 100,
-                formatter: function(value) {
+                formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd');
                 }
             },
@@ -91,7 +114,7 @@ $(function() {
                 index: 'canShow',
                 width: 100,
                 sortable: false,
-                formatter: function(value, col, row) {
+                formatter: function (value, col, row) {
                     cacheData.push(row)
                     return `<div  id="${row.userId}" style="display: flex;align-items: center;justify-content: center;">
                 <input style="width:20px;height:20px;" name="${row.userId}" disabled id="${row.userId}" type="radio" value="1" ${value?'checked':''}  >
@@ -121,10 +144,11 @@ var setting = {
 var ztree;
 
 let id = getQueryString("id");
-let sceneName = getQueryString("sceneName");
-let name = getQueryString("name");
-
-const validatePhoneCheck = function(rule, value, callback) {
+let sceneName = decodeURIComponent(getQueryString("sceneName"));
+console.log(sceneName)
+let name = decodeURIComponent(getQueryString("name"));
+console.log(name)
+const validatePhoneCheck = function (rule, value, callback) {
     if (value === '' || !value) {
         callback(new Error('手机号不能为空'));
     } else if (!(/^1[3456789]\d{9}$/.test(value))) {
@@ -155,16 +179,27 @@ var vm = new Vue({
             brandList: []
         },
         ruleValidate: {
-            username: [
-                { required: true, message: '姓名不能为空', trigger: 'blur' }
-            ],
-            email: [
-                { required: true, message: '邮箱不能为空', trigger: 'blur' },
-                { type: 'email', message: '邮箱格式不正确', trigger: 'blur' }
+            username: [{
+                required: true,
+                message: '姓名不能为空',
+                trigger: 'blur'
+            }],
+            email: [{
+                    required: true,
+                    message: '邮箱不能为空',
+                    trigger: 'blur'
+                },
+                {
+                    type: 'email',
+                    message: '邮箱格式不正确',
+                    trigger: 'blur'
+                }
             ],
-            mobile: [
-                { required: true, validator: validatePhoneCheck, trigger: 'blur' }
-            ]
+            mobile: [{
+                required: true,
+                validator: validatePhoneCheck,
+                trigger: 'blur'
+            }]
         },
         brandsList: [],
         brandPage: 1,
@@ -202,7 +237,7 @@ var vm = new Vue({
             })
 
             if (parmas.length <= 0) {
-                return alert('操作成功', function(index) {
+                return alert('操作成功', function (index) {
                     vm.close(1)
                 });
             }
@@ -213,8 +248,8 @@ var vm = new Vue({
                 params: JSON.stringify(parmas),
                 contentType: "application/json",
                 type: 'POST',
-                successCallback: function() {
-                    alert('操作成功', function(index) {
+                successCallback: function () {
+                    alert('操作成功', function (index) {
                         vm.close(1)
                     });
                 }
@@ -225,16 +260,16 @@ var vm = new Vue({
             let name = isReload ? 'closeReload' : 'close'
             window.parent.postMessage(name, '*');
         },
-        clickCheck: function(item, idx) {
+        clickCheck: function (item, idx) {
             item['checked'] = !item['checked']
             this.$set(this.brandsList, idx, item)
         },
-        ok: function() {
+        ok: function () {
             let temp = []
             let tempid = []
             var that = this
-            Object.keys(vm.cacheData).forEach(function(item) {
-                that.cacheData[item].page.list.forEach(function(sub) {
+            Object.keys(vm.cacheData).forEach(function (item) {
+                that.cacheData[item].page.list.forEach(function (sub) {
                     if (sub['checked']) {
                         temp.push(sub)
                         tempid.push(sub.id)
@@ -244,29 +279,35 @@ var vm = new Vue({
             vm.user.brandList = temp
             vm.user.brandIdList = tempid
         },
-        cancel: function() {
+        cancel: function () {
             this.cacheData = {}
             this.modal1 = false
         },
-        query: function() {
+        query: function () {
             vm.reload(1);
         },
-        add: function() {
+        add: function () {
             vm.showList = false;
             vm.title = "新增";
             vm.roleList = {};
-            vm.user = { status: 1, roleIdList: [], brandIdList: [], deptId: '', deptName: '' };
+            vm.user = {
+                status: 1,
+                roleIdList: [],
+                brandIdList: [],
+                deptId: '',
+                deptName: ''
+            };
 
             //获取角色信息
             this.getRoleList();
             vm.getDept();
         },
-        getDept: function() {
+        getDept: function () {
             //加载部门树
             Ajax.request({
                 url: '../sys/dept/list?name=',
                 async: true,
-                successCallback: function(r) {
+                successCallback: function (r) {
                     ztree = $.fn.zTree.init($("#deptTree"), setting, r.list);
                     var node = ztree.getNodeByParam("deptId", vm.user.deptId);
                     if (node != null) {
@@ -277,11 +318,11 @@ var vm = new Vue({
                 }
             });
         },
-        pageChange: function(page) {
+        pageChange: function (page) {
             this.brandPage = page
         },
 
-        update: function() {
+        update: function () {
             var userId = getSelectedRow("#jqGrid");
             if (userId == null) {
                 return;
@@ -293,7 +334,7 @@ var vm = new Vue({
             Ajax.request({
                 url: "../sys/user/info/" + userId,
                 async: true,
-                successCallback: function(r) {
+                successCallback: function (r) {
                     vm.user = r.user;
                     //获取角色信息
                     vm.getRoleList();
@@ -302,27 +343,27 @@ var vm = new Vue({
             });
 
         },
-        del: function() {
+        del: function () {
             var userIds = getSelectedRows("#jqGrid");
             if (userIds == null) {
                 return;
             }
 
-            confirm('确定要删除选中的记录？', function() {
+            confirm('确定要删除选中的记录？', function () {
                 Ajax.request({
                     url: "../sys/user/delete",
                     params: JSON.stringify(userIds),
                     contentType: "application/json",
                     type: 'POST',
-                    successCallback: function() {
-                        alert('操作成功', function(index) {
+                    successCallback: function () {
+                        alert('操作成功', function (index) {
                             vm.reload();
                         });
                     }
                 });
             });
         },
-        saveOrUpdate: function(event) {
+        saveOrUpdate: function (event) {
             if ($('#isSign').css("display") == 'block') {
                 return alert('手机号未在指房宝APP中进行注册')
             }
@@ -332,38 +373,40 @@ var vm = new Vue({
                 params: JSON.stringify(vm.user),
                 contentType: "application/json",
                 type: 'POST',
-                successCallback: function() {
-                    alert('操作成功', function(index) {
+                successCallback: function () {
+                    alert('操作成功', function (index) {
                         vm.reload();
                     });
                 }
             });
         },
-        getRoleList: function() {
+        getRoleList: function () {
             Ajax.request({
                 url: '../sys/role/select',
                 async: true,
-                successCallback: function(r) {
+                successCallback: function (r) {
                     vm.roleList = r.list;
                 }
             });
         },
-        reload: function(p = '') {
+        reload: function (p = '') {
             vm.showList = true;
             var page = $("#jqGrid").jqGrid('getGridParam', 'page');
             $("#jqGrid").jqGrid('setGridParam', {
-                postData: { key: vm.q.key },
+                postData: {
+                    key: vm.q.key
+                },
                 page: p || page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');
         },
-        deptTree: function() {
+        deptTree: function () {
             openWindow({
                 title: "选择部门",
                 area: ['300px', '450px'],
                 content: jQuery("#deptLayer"),
                 btn: ['确定', '取消'],
-                btn1: function(index) {
+                btn1: function (index) {
                     var node = ztree.getSelectedNodes();
                     //选择上级部门
                     vm.user.deptId = node[0].deptId;
@@ -373,12 +416,12 @@ var vm = new Vue({
                 }
             });
         },
-        handleSubmit: function(name) {
-            handleSubmitValidate(this, name, function() {
+        handleSubmit: function (name) {
+            handleSubmitValidate(this, name, function () {
                 vm.saveOrUpdate()
             });
         },
-        handleReset: function(name) {
+        handleReset: function (name) {
             handleResetForm(this, name);
             this.cacheData = {}
             this.user = {