Merge branch 'obt'

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

@@ -4,138 +4,141 @@ let _userInfo =
 $(function () {
   var types = []
 
-    Ajax.request({
-        url: "../brand/brandTypeList/",
-        async: true,
-        successCallback: function (r) {
-            types = r.list
-            $("#jqGrid").Grid({
-                // url: '../brand/list',
-                url: '../brand/brandBindList',
-                postData: {
-                    deptId: _userInfo.deptId,
-                    bindStatus: ''
-                },
-                rownumWidth: 60,
-                multiboxonly: true,
-                jsonReader: {
-                    root: "list",
-                    page: "curPage",
-                    total: "totalPageNum",
-                    records: "totalNum"
-                },
-                colModel: [{
-                        label: 'id',
-                        name: 'id',
-                        index: 'id',
-                        key: true,
-                        hidden: true
-                    },
-                    // {
-                    //     label: '场景码',
-                    //     name: 'sceneNum',
-                    //     index: 'sceneNum',
-                    //     hidden: true
-                    // },
-                    {
-                        label: '直播间名称',
-                        name: 'name',
-                        index: 'name',
-                        width: 60
-                    },
-                    {
-                        label: '类型',
-                        name: 'type',
-                        index: 'type',
-                        width: 20,
-                        formatter: function (value) {
-                            let tmp = types.filter(item => item.brandType == value) || ''
-                            return tmp.length > 0 ? tmp[0].name : '-'
-                        }
-                    },
-                    {
-                        label: '场景名称',
-                        name: 'sceneName',
-                        index: 'scene_name',
-                        width: 40
-                    },
-                    {
-                        label: '场景地址',
-                        name: 'liveRoomUrl',
-                        index: 'scene_url',
-                        width: 160,
-                        formatter: function (value) {
-                            if (value) {
-                                return value
-                            }
-                            return ''
-                        }
-                    },
-                    {
-                        label: '直播间封面',
-                        align: 'center',
-                        name: 'appListPicUrl',
-                        index: 'list_pic_url',
-                        width: 60,
-                        // formatter: function(value) {
-                        //     return transImg(value, 100, 'auto');
-                        // }
-                        formatter: function (value) {
-
-                            if (value == '' || !value) {
-                                value = '../statics/img/pic_bg@2x.png'
-                            }
-                            return transImg(value, 100, 'auto');
-                        }
-                    },
-                    {
-                        label: '已绑定主播',
-                        name: 'bindShowerNameList',
-                        width: 100,
-                        sortable: false
-                    },
-                    {
-                        label: '排序',
-                        align: 'center',
-                        name: 'sortOrder',
-                        index: 'sort_order',
-                        width: 40
-                    },
-                    {
-                        label: '是否开播',
-                        name: 'livestreamStatus',
-                        align: 'center',
-                        width: 30,
-                        sortable: false,
-                        formatter: function (value) {
-                            return transIsNot(value)
-                        }
-                    }, {
-                        label: '操作',
-                        width: 30,
-                        align: 'center',
-                        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') 
-                            let sceneNum = row.sceneNum
-                            return `<a style="color: #2db7f5;"  onclick="open_4dkankan('${liveRoomUrl}','${sceneNum}')" target="_blank">打开编辑器</a>`;
-                        }
-                    }
-                    // {
-                    //     label: '显示',align:'center', name: 'isShow', index: 'is_show', width: 80, formatter: function (value) {
-                    //         return transIsNot(value)
-                    //     }
-                    // },
-                ]
-            });
-        }
-    });
-
-
-});
+  Ajax.request({
+    url: '../brand/brandTypeList/',
+    async: true,
+    successCallback: function (r) {
+      types = r.list
+      $('#jqGrid').Grid({
+        // url: '../brand/list',
+        url: '../brand/brandBindList',
+        postData: {
+          deptId: _userInfo.deptId,
+          bindStatus: '',
+        },
+        rownumWidth: 60,
+        multiboxonly: true,
+        jsonReader: {
+          root: 'list',
+          page: 'curPage',
+          total: 'totalPageNum',
+          records: 'totalNum',
+        },
+        colModel: [
+          {
+            label: 'id',
+            name: 'id',
+            index: 'id',
+            key: true,
+            hidden: true,
+          },
+          // {
+          //     label: '场景码',
+          //     name: 'sceneNum',
+          //     index: 'sceneNum',
+          //     hidden: true
+          // },
+          {
+            label: '直播间名称',
+            name: 'name',
+            index: 'name',
+            width: 60,
+          },
+          {
+            label: '类型',
+            name: 'type',
+            index: 'type',
+            width: 20,
+            formatter: function (value) {
+              let tmp = types.filter((item) => item.brandType == value) || ''
+              return tmp.length > 0 ? tmp[0].name : '-'
+            },
+          },
+          {
+            label: '场景名称',
+            name: 'sceneName',
+            index: 'scene_name',
+            width: 40,
+          },
+          {
+            label: '场景地址',
+            name: 'liveRoomUrl',
+            index: 'scene_url',
+            width: 160,
+            formatter: function (value) {
+              if (value) {
+                return value
+              }
+              return ''
+            },
+          },
+          {
+            label: '直播间封面',
+            align: 'center',
+            name: 'appListPicUrl',
+            index: 'list_pic_url',
+            width: 60,
+            // formatter: function(value) {
+            //     return transImg(value, 100, 'auto');
+            // }
+            formatter: function (value) {
+              if (value == '' || !value) {
+                value = '../statics/img/pic_bg@2x.png'
+              }
+              return transImg(value, 100, 'auto')
+            },
+          },
+          {
+            label: '已绑定主播',
+            name: 'bindShowerNameList',
+            width: 100,
+            sortable: false,
+          },
+          {
+            label: '排序',
+            align: 'center',
+            name: 'sortOrder',
+            index: 'sort_order',
+            width: 40,
+          },
+          {
+            label: '是否开播',
+            name: 'livestreamStatus',
+            align: 'center',
+            width: 30,
+            sortable: false,
+            formatter: function (value) {
+              return transIsNot(value)
+            },
+          },
+          {
+            label: '操作',
+            width: 30,
+            align: 'center',
+            sortable: false,
+            hidden:
+              JSON.parse(localStorage.getItem('userInfo')).roleIdList[0] == 5 ||
+              (JSON.parse(localStorage.getItem('userInfo')).roleIdList[0] ==
+                8 &&
+                JSON.parse(localStorage.getItem('userInfo'))
+                  .isPlatformStreamer),
+            formatter: function (value, col, row) {
+              let liveRoomUrl = row.liveRoomUrl
+              liveRoomUrl = liveRoomUrl.replace('shop', 'epc')
+              let sceneNum = row.sceneNum
+              return `<a style="color: #2db7f5;"  onclick="open_4dkankan('${liveRoomUrl}','${sceneNum}')" target="_blank">打开编辑器</a>`
+            },
+          },
+          // {
+          //     label: '显示',align:'center', name: 'isShow', index: 'is_show', width: 80, formatter: function (value) {
+          //         return transIsNot(value)
+          //     }
+          // },
+        ],
+      })
+    },
+  })
+})
 
 function open_4dkankan(url, sceneNum) {
   // 用户点击时执行
@@ -155,13 +158,18 @@ function open_4dkankan(url, sceneNum) {
     }),
     contentType: 'application/json',
 
-        successCallback: function (r) {
-            console.log(r)
-            // 获取start_url成功后执行
-            newTab.location.href = url  + '&token=' + r.data
-            // window.open(url.toString())
-        }
-    });
+    successCallback: function (r) {
+      console.log(r)
+      if (r.code == 0) {
+        // 获取start_url成功后执行
+        newTab.location.href = url + '&menu=business&token=' + r.data
+        // window.open(url.toString())
+      } else {
+        alert(r.msg)
+      }
+    },
+    error: function (e) {},
+  })
 }
 const validateSceneUrlCheck = function (rule, value, callback) {
   //  var link1 ='https://test.4dkankan.com/eShopMobile.html?m='
@@ -11382,139 +11390,153 @@ var vm = new Vue({
             vm.brand.picList = []
           }
         },
-        open: function () {
-            var userId = getSelectedRow("#jqGrid");
-            if (userId == null) {
-                return
-            } else {
-                var data = getSelectedRowData("#jqGrid");
-                console.log(data)
-                openWindow({
-                    type: 2,
-                    title: '绑定主播',
-                    content: `../shop/selectUser.html?name=${data.name}&sceneName=${data.sceneName}&id=${data.id}&userName=${data.bindShowerNameList}`
-                })
-            }
-
-        },
-        reload: function (page) {
-            vm.showList = true;
-            if (isNaN(page)) {
-                page = $("#jqGrid").jqGrid('getGridParam', 'page');
-            }
-            $("#jqGrid").jqGrid('setGridParam', {
-                postData: {
-                    'sceneName': vm.q.name,
-                    'type': vm.q.type,
-                    'livestreamStatus': vm.q.livestreamStatus
-                },
-                // postData: {
-                //     'sceneName': vm.q.name,
-                //     'type': vm.q.type
-                // },
-                page: page
-            }).trigger("reloadGrid");
-            vm.handleReset('formValidate');
-        },
-        reload_bind: function (event) {
-            vm.showList = true;
-            var page = $("#jqGrid").jqGrid('getGridParam', 'page');
-            $("#jqGrid").jqGrid('setGridParam', {
-                postData: {
-                    sceneName: vm.q.sceneName,
-                    brandName: vm.q.brandName,
-                    bindStatus: vm.q.bindStatus
-                },
-                page: 1
-            }).trigger("reloadGrid");
-            // vm.getLessNum()
-            vm.handleReset('formValidate');
-        },
-        handleSuccessListPicUrl: function (res, file) {
-            // vm.brand.listPicUrl = file.response.url + window.fixImg + 'm_fixed,w_400,h_400';
-            vm.brand.appListPicUrl = file.response.url + window.fixImg + 'm_fixed,w_400,h_400';
-            //  vm.brand.listPicUrl = file.response.url;
-            //  vm.brand.appListPicUrl = file.response.url ;
-        },
-        handleSuccessVideoPicUrl: function (res, file) {
-            vm.brand.introduceVideoCover = file.response.url + window.fixImg + 'm_fixed,w_400,h_300';
-            // vm.brand.introduceVideoCover = file.response.url;
-
-        },
-        handleSuccessPicUrl: function (res, file) {
-            vm.brand.picUrl = file.response.url;
-        },
-        handleSuccessAppListPicUrl: function (res, file) {
-            vm.brand.appListPicUrl = file.response.url;
-        },
-        handleSuccessBrandPicUrl: function (res, file) {
-            this.loading = false
-            file.url = res.url + window.fixImg + 'm_fixed,w_450,h_400';
-            file.name = res.url + window.fixImg + 'm_fixed,w_450,h_400';
-            // file.url = res.url
-            // file.name =  res.url
-            this.brand.picList = this.$refs.upload.fileList
-        },
-        handleSuccessVideoUrl: function (res, file) {
-            this.loading = false
-            vm.brand.introduceVideo = file.response.data.video;
-            vm.brand.introduceVideoCover = file.response.data.image;
-        },
-        handleBeforeUpload() {
-            const check = this.$refs.upload.fileList.length < 15;
-            if (!check) {
-                this.$Notice.warning({
-                    title: '最多只能上传 15 张图片。'
-                });
-            }
-            return check;
-        },
-        handleBefore() {
-            this.loading = true
-        },
-        handleSuccessNewPicUrl: function (res, file) {
-            vm.brand.newPicUrl = file.response.url;
-        },
-        handleFormatError: function (file) {
-            this.loading = false
-            this.$Notice.warning({
-                title: '文件格式不正确',
-                desc: '文件 ' + file.name + ' 格式不正确。'
-            });
-        },
-        handleMaxSize: function (file) {
-            this.loading = false
-            this.$Notice.warning({
-                title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大。'
-            });
-        },
-        eyeImageListPicUrl: function () {
-            var url = vm.brand.appListPicUrl;
-            eyeImage(url);
-        },
-        eyeImagePicUrl: function () {
-            var url = vm.brand.picUrl;
-            eyeImage(url);
-        },
-        eyeImageAppListPicUrl: function () {
-            var url = vm.brand.appListPicUrl;
-            eyeImage(url);
-        },
-        eyeImageNewPicUrl: function () {
-            var url = vm.brand.newPicUrl;
-            eyeImage(url);
-        },
-        handleSubmit: function (name) {
-            console.log(this.brand.appListPicUrl)
-            handleSubmitValidate(this, name, function () {
-                vm.saveOrUpdate()
-            });
-        },
-        handleReset: function (name) {
-            vm.brand.introduceVideo = ''
-            handleResetForm(this, name);
-        }
+      })
+    },
+    open: function () {
+      var userId = getSelectedRow('#jqGrid')
+      if (userId == null) {
+        return
+      } 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=${name}&sceneName=${sceneName}&id=${data.id}&userName=${data.bindShowerNameList}`,
+          // content: `../shop/selectUser.html?` + params
+        })
+      }
+    },
+    reload: function (page) {
+      vm.showList = true
+      if (isNaN(page)) {
+        page = $('#jqGrid').jqGrid('getGridParam', 'page')
+      }
+      $('#jqGrid')
+        .jqGrid('setGridParam', {
+          postData: {
+            sceneName: vm.q.name,
+            type: vm.q.type,
+            livestreamStatus: vm.q.livestreamStatus,
+          },
+          // postData: {
+          //     'sceneName': vm.q.name,
+          //     'type': vm.q.type
+          // },
+          page: page,
+        })
+        .trigger('reloadGrid')
+      vm.handleReset('formValidate')
+    },
+    reload_bind: function (event) {
+      vm.showList = true
+      var page = $('#jqGrid').jqGrid('getGridParam', 'page')
+      $('#jqGrid')
+        .jqGrid('setGridParam', {
+          postData: {
+            sceneName: vm.q.sceneName,
+            brandName: vm.q.brandName,
+            bindStatus: vm.q.bindStatus,
+          },
+          page: 1,
+        })
+        .trigger('reloadGrid')
+      // vm.getLessNum()
+      vm.handleReset('formValidate')
+    },
+    handleSuccessListPicUrl: function (res, file) {
+      // vm.brand.listPicUrl = file.response.url + window.fixImg + 'm_fixed,w_400,h_400';
+      vm.brand.appListPicUrl =
+        file.response.url + window.fixImg + 'm_fixed,w_400,h_400'
+      //  vm.brand.listPicUrl = file.response.url;
+      //  vm.brand.appListPicUrl = file.response.url ;
+    },
+    handleSuccessVideoPicUrl: function (res, file) {
+      vm.brand.introduceVideoCover =
+        file.response.url + window.fixImg + 'm_fixed,w_400,h_300'
+      // vm.brand.introduceVideoCover = file.response.url;
+    },
+    handleSuccessPicUrl: function (res, file) {
+      vm.brand.picUrl = file.response.url
+    },
+    handleSuccessAppListPicUrl: function (res, file) {
+      vm.brand.appListPicUrl = file.response.url
+    },
+    handleSuccessBrandPicUrl: function (res, file) {
+      this.loading = false
+      file.url = res.url + window.fixImg + 'm_fixed,w_450,h_400'
+      file.name = res.url + window.fixImg + 'm_fixed,w_450,h_400'
+      // file.url = res.url
+      // file.name =  res.url
+      this.brand.picList = this.$refs.upload.fileList
+    },
+    handleSuccessVideoUrl: function (res, file) {
+      this.loading = false
+      vm.brand.introduceVideo = file.response.data.video
+      vm.brand.introduceVideoCover = file.response.data.image
+    },
+    handleBeforeUpload() {
+      const check = this.$refs.upload.fileList.length < 15
+      if (!check) {
+        this.$Notice.warning({
+          title: '最多只能上传 15 张图片。',
+        })
+      }
+      return check
+    },
+    handleBefore() {
+      this.loading = true
+    },
+    handleSuccessNewPicUrl: function (res, file) {
+      vm.brand.newPicUrl = file.response.url
+    },
+    handleFormatError: function (file) {
+      this.loading = false
+      this.$Notice.warning({
+        title: '文件格式不正确',
+        desc: '文件 ' + file.name + ' 格式不正确。',
+      })
+    },
+    handleMaxSize: function (file) {
+      this.loading = false
+      this.$Notice.warning({
+        title: '超出文件大小限制',
+        desc: '文件 ' + file.name + ' 太大。',
+      })
+    },
+    eyeImageListPicUrl: function () {
+      var url = vm.brand.appListPicUrl
+      eyeImage(url)
+    },
+    eyeImagePicUrl: function () {
+      var url = vm.brand.picUrl
+      eyeImage(url)
+    },
+    eyeImageAppListPicUrl: function () {
+      var url = vm.brand.appListPicUrl
+      eyeImage(url)
+    },
+    eyeImageNewPicUrl: function () {
+      var url = vm.brand.newPicUrl
+      eyeImage(url)
+    },
+    handleSubmit: function (name) {
+      console.log(this.brand.appListPicUrl)
+      handleSubmitValidate(this, name, function () {
+        vm.saveOrUpdate()
+      })
+    },
+    handleReset: function (name) {
+      vm.brand.introduceVideo = ''
+      handleResetForm(this, name)
     },
   },
   mounted() {

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

@@ -1,26 +1,29 @@
 let cacheData = []
 let cacheItems = []
-$(function() {
-    let userInfo = window.localStorage && JSON.parse(localStorage.getItem('_userInfo'))
-    let userName = getQueryString("userName");
-    let brandId = getQueryString("id");
+$(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')
 
-    $("#jqGrid").Grid({
-        url: '../sys/user/bindList',
-        rownumWidth: 60,
-        postData: {
-            deptId: userInfo.deptId,
-            brandId: brandId
-        },
-        prmNames: {
-            page: "pageNum",
-            rows: "pageSize",
-            order: "order"
-        },
-        onSelectAll: function() {
-            var grid = $('#jqGrid');
-            var rowKey = grid.getGridParam("selarrrow");
-            $('#selctedNum').html(rowKey.length)
+  $('#jqGrid').Grid({
+    url: '../sys/user/bindList',
+    rownumWidth: 60,
+    postData: {
+      deptId: userInfo.deptId,
+      brandId: brandId,
+    },
+    prmNames: {
+      page: 'pageNum',
+      rows: 'pageSize',
+      order: 'order',
+    },
+    onSelectAll: function () {
+      var grid = $('#jqGrid')
+      var rowKey = grid.getGridParam('selarrrow')
+      $('#selctedNum').html(rowKey.length)
 
       cacheData.forEach((item) => {
         $('#' + item.userId)
@@ -48,57 +51,100 @@ $(function() {
         cacheItems[idx] = item
       }
 
-            // cacheItems.indexOf(item)<=-1 && cacheItems.push(rowid)
-        },
-        onSelectRow: function() {
-            var grid = $('#jqGrid');
-            var rowKey = grid.getGridParam("selarrrow");
-            $('#selctedNum').html(rowKey.length)
-            cacheData.forEach(item => {
-                $('#' + item.userId).children('input').attr("disabled", true)
-            })
-            var data = getSelectedRowDatas("#jqGrid");
-            data.forEach(item => {
-                $('#' + item.userId).children('input').attr("disabled", false)
-            })
-        },
-        loadComplete: function() {
-            let arr = userName ? userName.split(';') : []
-            arr.forEach(item => {
-                $('#jqGrid').jqGrid('setSelection', item);
-            })
+      // cacheItems.indexOf(item)<=-1 && cacheItems.push(rowid)
+    },
+    onSelectRow: function () {
+      var grid = $('#jqGrid')
+      var rowKey = grid.getGridParam('selarrrow')
+      $('#selctedNum').html(rowKey.length)
+      cacheData.forEach((item) => {
+        $('#' + item.userId)
+          .children('input')
+          .attr('disabled', true)
+      })
+      var data = getSelectedRowDatas('#jqGrid')
+      data.forEach((item) => {
+        $('#' + item.userId)
+          .children('input')
+          .attr('disabled', false)
+      })
+    },
+    loadComplete: function () {
+      let arr = userName ? userName.split(';') : []
+      arr.forEach((item) => {
+        $('#jqGrid').jqGrid('setSelection', item)
+      })
+    },
+    height: 450,
+    jsonReader: {
+      root: 'list',
+      page: 'curPage',
+      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,
+        formatter: function (v, c, r) {
+          cacheData.push(r)
+          console.log(r)
+          var str = ''
+
+          if (r.roleId == 8 && r.isPlatformStreamer) {
+            str += `<span style="color:#009f95;">${r.roleName}</span>`
+          } else {
+            str += `<span>${r.roleName}</span>`
+          }
+          return str
         },
-        height: 450,
-        jsonReader: {
-            root: "list",
-            page: "curPage",
-            total: "totalPageNum",
-            records: "totalNum"
+      },
+      {
+        label: '手机号',
+        name: 'mobile',
+        index: 'mobile',
+        width: 75,
+      },
+      {
+        label: '绑定时间',
+        name: 'createTime',
+        index: 'create_time',
+        width: 100,
+        formatter: function (value) {
+          return transDate(value, 'yyyy-MM-dd')
         },
-        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) {
-                    return transDate(value, 'yyyy-MM-dd');
-                }
-            },
-            {
-                label: '是否同时开通一起逛',
-                name: 'canShow',
-                index: 'canShow',
-                width: 100,
-                sortable: false,
-                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':''}  >
+      },
+      {
+        label: '是否同时开通一起逛',
+        name: 'canShow',
+        index: 'canShow',
+        width: 100,
+        sortable: false,
+        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' : ''
+          }  >
                 <span style="margin-right:10px;">是</span>
                 <input  style="width:20px;height:20px;" name="${
                   row.userId
@@ -128,51 +174,66 @@ var setting = {
 }
 var ztree
 
-let id = getQueryString("id");
-let sceneName = getQueryString("sceneName");
-let name = getQueryString("name");
-
-const validatePhoneCheck = function(rule, value, callback) {
-    if (value === '' || !value) {
-        callback(new Error('手机号不能为空'));
-    } else if (!(/^1[3456789]\d{9}$/.test(value))) {
-        callback(new Error('手机号不正确'));
-    } else {
-        callback();
-    }
-};
+let id = getQueryString('id')
+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)) {
+    callback(new Error('手机号不正确'))
+  } else {
+    callback()
+  }
+}
 
 var vm = new Vue({
-    el: '#rrapp',
-    data: {
-        sceneName,
-        name,
-        brandId: id,
-        modal1: false,
-        q: {
-            key: ''
+  el: '#rrapp',
+  data: {
+    sceneName,
+    name,
+    brandId: id,
+    modal1: false,
+    q: {
+      key: '',
+    },
+    showList: true,
+    title: null,
+    roleList: {},
+    user: {
+      status: 1,
+      deptName: '',
+      roleIdList: [],
+      brandIdList: [],
+      brandList: [],
+    },
+    ruleValidate: {
+      username: [
+        {
+          required: true,
+          message: '姓名不能为空',
+          trigger: 'blur',
+        },
+      ],
+      email: [
+        {
+          required: true,
+          message: '邮箱不能为空',
+          trigger: 'blur',
         },
-        showList: true,
-        title: null,
-        roleList: {},
-        user: {
-            status: 1,
-            deptName: '',
-            roleIdList: [],
-            brandIdList: [],
-            brandList: []
+        {
+          type: 'email',
+          message: '邮箱格式不正确',
+          trigger: 'blur',
         },
-        ruleValidate: {
-            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',
         },
       ],
     },
@@ -212,189 +273,201 @@ var vm = new Vue({
         }
       })
 
-            if (parmas.length <= 0) {
-                return alert('操作成功', function(index) {
-                    vm.close(1)
-                });
-            }
-
-
-            Ajax.request({
-                url: "../brand/bindUser",
-                params: JSON.stringify(parmas),
-                contentType: "application/json",
-                type: 'POST',
-                successCallback: function() {
-                    alert('操作成功', function(index) {
-                        vm.close(1)
-                    });
-                }
-            });
+      if (parmas.length <= 0) {
+        return alert('操作成功', function (index) {
+          vm.close(1)
+        })
+      }
 
+      Ajax.request({
+        url: '../brand/bindUser',
+        params: JSON.stringify(parmas),
+        contentType: 'application/json',
+        type: 'POST',
+        successCallback: function () {
+          alert('操作成功', function (index) {
+            vm.close(1)
+          })
         },
-        close(isReload = '') {
-            let name = isReload ? 'closeReload' : 'close'
-            window.parent.postMessage(name, '*');
-        },
-        clickCheck: function(item, idx) {
-            item['checked'] = !item['checked']
-            this.$set(this.brandsList, idx, item)
-        },
-        ok: function() {
-            let temp = []
-            let tempid = []
-            var that = this
-            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)
-                    }
-                })
-            })
-            vm.user.brandList = temp
-            vm.user.brandIdList = tempid
-        },
-        cancel: function() {
-            this.cacheData = {}
-            this.modal1 = false
-        },
-        query: function() {
-            vm.reload(1);
-        },
-        add: function() {
-            vm.showList = false;
-            vm.title = "新增";
-            vm.roleList = {};
-            vm.user = { status: 1, roleIdList: [], brandIdList: [], deptId: '', deptName: '' };
+      })
+    },
+    close(isReload = '') {
+      let name = isReload ? 'closeReload' : 'close'
+      window.parent.postMessage(name, '*')
+    },
+    clickCheck: function (item, idx) {
+      item['checked'] = !item['checked']
+      this.$set(this.brandsList, idx, item)
+    },
+    ok: function () {
+      let temp = []
+      let tempid = []
+      var that = this
+      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)
+          }
+        })
+      })
+      vm.user.brandList = temp
+      vm.user.brandIdList = tempid
+    },
+    cancel: function () {
+      this.cacheData = {}
+      this.modal1 = false
+    },
+    query: function () {
+      vm.reload(1)
+    },
+    add: function () {
+      vm.showList = false
+      vm.title = '新增'
+      vm.roleList = {}
+      vm.user = {
+        status: 1,
+        roleIdList: [],
+        brandIdList: [],
+        deptId: '',
+        deptName: '',
+      }
 
-            //获取角色信息
-            this.getRoleList();
-            vm.getDept();
-        },
-        getDept: function() {
-            //加载部门树
-            Ajax.request({
-                url: '../sys/dept/list?name=',
-                async: true,
-                successCallback: function(r) {
-                    ztree = $.fn.zTree.init($("#deptTree"), setting, r.list);
-                    var node = ztree.getNodeByParam("deptId", vm.user.deptId);
-                    if (node != null) {
-                        ztree.selectNode(node);
+      //获取角色信息
+      this.getRoleList()
+      vm.getDept()
+    },
+    getDept: function () {
+      //加载部门树
+      Ajax.request({
+        url: '../sys/dept/list?name=',
+        async: true,
+        successCallback: function (r) {
+          ztree = $.fn.zTree.init($('#deptTree'), setting, r.list)
+          var node = ztree.getNodeByParam('deptId', vm.user.deptId)
+          if (node != null) {
+            ztree.selectNode(node)
 
             vm.user.deptName = node.name
           }
         },
-        pageChange: function(page) {
-            this.brandPage = page
-        },
+      })
+    },
+    pageChange: function (page) {
+      this.brandPage = page
+    },
 
-        update: function() {
-            var userId = getSelectedRow("#jqGrid");
-            if (userId == null) {
-                return;
-            }
+    update: function () {
+      var userId = getSelectedRow('#jqGrid')
+      if (userId == null) {
+        return
+      }
 
       vm.showList = false
       vm.title = '修改'
 
-            Ajax.request({
-                url: "../sys/user/info/" + userId,
-                async: true,
-                successCallback: function(r) {
-                    vm.user = r.user;
-                    //获取角色信息
-                    vm.getRoleList();
-                    vm.getDept();
-                }
-            });
-
+      Ajax.request({
+        url: '../sys/user/info/' + userId,
+        async: true,
+        successCallback: function (r) {
+          vm.user = r.user
+          //获取角色信息
+          vm.getRoleList()
+          vm.getDept()
         },
-        del: function() {
-            var userIds = getSelectedRows("#jqGrid");
-            if (userIds == null) {
-                return;
-            }
+      })
+    },
+    del: function () {
+      var userIds = getSelectedRows('#jqGrid')
+      if (userIds == null) {
+        return
+      }
 
-            confirm('确定要删除选中的记录？', function() {
-                Ajax.request({
-                    url: "../sys/user/delete",
-                    params: JSON.stringify(userIds),
-                    contentType: "application/json",
-                    type: 'POST',
-                    successCallback: function() {
-                        alert('操作成功', function(index) {
-                            vm.reload();
-                        });
-                    }
-                });
-            });
-        },
-        saveOrUpdate: function(event) {
-            if ($('#isSign').css("display") == 'block') {
-                return alert('手机号未在指房宝APP中进行注册')
-            }
-            var url = vm.user.userId == null ? "../sys/user/save" : "../sys/user/update";
-            Ajax.request({
-                url: url,
-                params: JSON.stringify(vm.user),
-                contentType: "application/json",
-                type: 'POST',
-                successCallback: function() {
-                    alert('操作成功', function(index) {
-                        vm.reload();
-                    });
-                }
-            });
-        },
-        getRoleList: function() {
-            Ajax.request({
-                url: '../sys/role/select',
-                async: true,
-                successCallback: function(r) {
-                    vm.roleList = r.list;
-                }
-            });
+      confirm('确定要删除选中的记录？', function () {
+        Ajax.request({
+          url: '../sys/user/delete',
+          params: JSON.stringify(userIds),
+          contentType: 'application/json',
+          type: 'POST',
+          successCallback: function () {
+            alert('操作成功', function (index) {
+              vm.reload()
+            })
+          },
+        })
+      })
+    },
+    saveOrUpdate: function (event) {
+      if ($('#isSign').css('display') == 'block') {
+        return alert('手机号未在指房宝APP中进行注册')
+      }
+      var url =
+        vm.user.userId == null ? '../sys/user/save' : '../sys/user/update'
+      Ajax.request({
+        url: url,
+        params: JSON.stringify(vm.user),
+        contentType: 'application/json',
+        type: 'POST',
+        successCallback: function () {
+          alert('操作成功', function (index) {
+            vm.reload()
+          })
         },
-        reload: function(p = '') {
-            vm.showList = true;
-            var page = $("#jqGrid").jqGrid('getGridParam', 'page');
-            $("#jqGrid").jqGrid('setGridParam', {
-                postData: { key: vm.q.key },
-                page: p || page
-            }).trigger("reloadGrid");
-            vm.handleReset('formValidate');
+      })
+    },
+    getRoleList: function () {
+      Ajax.request({
+        url: '../sys/role/select',
+        async: true,
+        successCallback: function (r) {
+          vm.roleList = r.list
         },
-        deptTree: function() {
-            openWindow({
-                title: "选择部门",
-                area: ['300px', '450px'],
-                content: jQuery("#deptLayer"),
-                btn: ['确定', '取消'],
-                btn1: function(index) {
-                    var node = ztree.getSelectedNodes();
-                    //选择上级部门
-                    vm.user.deptId = node[0].deptId;
-                    vm.user.deptName = node[0].name;
+      })
+    },
+    reload: function (p = '') {
+      vm.showList = true
+      var page = $('#jqGrid').jqGrid('getGridParam', 'page')
+      $('#jqGrid')
+        .jqGrid('setGridParam', {
+          postData: {
+            key: vm.q.key,
+          },
+          page: p || page,
+        })
+        .trigger('reloadGrid')
+      vm.handleReset('formValidate')
+    },
+    deptTree: function () {
+      openWindow({
+        title: '选择部门',
+        area: ['300px', '450px'],
+        content: jQuery('#deptLayer'),
+        btn: ['确定', '取消'],
+        btn1: function (index) {
+          var node = ztree.getSelectedNodes()
+          //选择上级部门
+          vm.user.deptId = node[0].deptId
+          vm.user.deptName = node[0].name
 
           layer.close(index)
         },
-        handleSubmit: function(name) {
-            handleSubmitValidate(this, name, function() {
-                vm.saveOrUpdate()
-            });
-        },
-        handleReset: function(name) {
-            handleResetForm(this, name);
-            this.cacheData = {}
-            this.user = {
-                status: 1,
-                deptName: '',
-                roleIdList: [],
-                brandIdList: [],
-                brandList: []
-            }
-        }
-    }
-});
+      })
+    },
+    handleSubmit: function (name) {
+      handleSubmitValidate(this, name, function () {
+        vm.saveOrUpdate()
+      })
+    },
+    handleReset: function (name) {
+      handleResetForm(this, name)
+      this.cacheData = {}
+      this.user = {
+        status: 1,
+        deptName: '',
+        roleIdList: [],
+        brandIdList: [],
+        brandList: [],
+      }
+    },
+  },
+})