权限更改

config/dev.env.js

@@ -1,8 +1,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
-  // BASE_API: '"http://localhost:9534"'
+  // BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
+   BASE_API: '"http://localhost:9534"'
   // BASE_API:'"http://api.scrm.kuyicloud.com"',//'"http://localhost:9534"'
   // BASE_API:'"http://localhost:9536"',
 

config/index.js

@@ -16,9 +16,9 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    host: "test1.sgjyun.com",
+    // host: "test1.sgjyun.com",
     //  host: 'microweb.kuyicloud.com',
-    // host: "localhost",
+     host: "localhost",
     // host: 'jk.kuyicloud.com',
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     // host: 'test1.sgjyun.com',

src/api/org/orginfo.js

@@ -1,32 +1,35 @@
 import request from '@/utils/request'
 
-export function GetOrgInfo(){
-    return request({
-        url:'/api/orginfo/getinfo',
-        method:'get',
-    })
+export function GetOrgInfo(params) {
+  console.log('params是什么', params)
+  return request({
+    url: '/api/orginfo/getinfo',
+    method: 'get',
+    params: params
+  })
 }
 
-export function SaveOrgGallery(data){
-    return request({
-        url:'/api/orginfo/savegallery',
-        method:'Post',
-        data:data,
-    })
+export function SaveOrgGallery(data) {
+  return request({
+    url: '/api/orginfo/savegallery',
+    method: 'Post',
+    data: data
+  })
 }
 
-export function EditOrgInfo(data){
-    return request({
-        url:'/api/orginfo/edit',
-        method:'Post',
-        data:data,
-    })
+export function EditOrgInfo(data) {
+  console.log('data是设么', data)
+  return request({
+    url: '/api/orginfo/edit',
+    method: 'Post',
+    data: data
+  })
 }
 
-export function DeleteOrgGallery(id){
-    return request({
-        url:'/api/orginfo/deletegallery',
-        method:'delete',
-        params:{id:id},
-    })
+export function DeleteOrgGallery(id) {
+  return request({
+    url: '/api/orginfo/deletegallery',
+    method: 'delete',
+    params: { id: id }
+  })
 }

src/api/qiniu.js

@@ -1,7 +1,6 @@
 import request from '@/utils/request'
 
 export function getToken() {
-  console.log("加地址")
   return request({
     url: '/api/qiniu/uptoken', // 假地址 自行替换
     method: 'get'

src/scrm_pages/members/components/CreateMemberForm.vue

@@ -328,6 +328,7 @@ export default {
             this.GetDistrict(id);
         },
         GetProvince:function(id) {  
+            
             GetDistrictsByUpid({id:id}).then(response=>{
                 var res = response.data;
                 if (res.state===1) {

src/scrm_pages/members/members.vue

@@ -258,16 +258,16 @@
 </template>
 
 <script>
-import { GetMembers, DeleteMembers } from "@/api/member/member";
-import BreadCrumb from "../components/bread-crumb";
-import { uParseTime } from "@/utils/tools";
-import CreateMemberForm from "./components/CreateMemberForm";
-import EditMemberForm from "./components/EditMemberForm";
-import EditMemberTagsForm from "./components/EditMemberTagsForm";
-import AddMembersTagsForm from "./components/AddMembersTagsForm";
-import EditMemberCardForm from "./components/EditMemberCardForm";
+import { GetMembers, DeleteMembers } from '@/api/member/member'
+import BreadCrumb from '../components/bread-crumb'
+import { uParseTime } from '@/utils/tools'
+import CreateMemberForm from './components/CreateMemberForm'
+import EditMemberForm from './components/EditMemberForm'
+import EditMemberTagsForm from './components/EditMemberTagsForm'
+import AddMembersTagsForm from './components/AddMembersTagsForm'
+import EditMemberCardForm from './components/EditMemberCardForm'
 export default {
-  name: "commentList",
+  name: 'commentList',
   components: {
     BreadCrumb,
     CreateMemberForm,
@@ -279,11 +279,11 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "会员管理" },
-        { path: false, name: "会员列表" }
+        { path: false, name: '会员管理' },
+        { path: false, name: '会员列表' }
       ],
-      time: "",
-      vip: "https://images.shengws.com/member-ship-card-vip.png",
+      time: '',
+      vip: 'https://images.shengws.com/member-ship-card-vip.png',
       checkAllStatus: false,
       active: true,
       levelType: 0,
@@ -296,26 +296,26 @@ export default {
       membersData: [],
       illnessOptions: [],
       memberData: {
-        name: "",
-        mobile: "",
+        name: '',
+        mobile: '',
         gender: 0,
-        birthday: "",
+        birthday: '',
         city: [],
         province_id: 0,
         city_id: 0,
         district_id: 0,
         illness: [],
-        ill_date: "",
-        treat_type: "",
+        ill_date: '',
+        treat_type: '',
         tags: [],
-        remark: "",
-        avatar: "",
+        remark: '',
+        avatar: '',
         id: 0,
         ids: []
       },
       cardFormData: {
         id: 0,
-        card_id: ""
+        card_id: ''
       },
       selectedMembers: [],
       memberIndex: -1,
@@ -323,48 +323,48 @@ export default {
       listQuery: {
         page: 1,
         limit: 10,
-        search: "",
-        start_time: "",
-        end_time: "",
+        search: '',
+        start_time: '',
+        end_time: '',
         source: 0,
         tag: 0,
         level: 0,
         init: 1
       }
-    };
+    }
   },
   methods: {
     GetMembers() {
       GetMembers(this.listQuery)
         .then(response => {
-          var res = response.data;
-          console.log("res是谁？", res);
+          var res = response.data
+          console.log('res是谁？', res)
           if (res.state == 1) {
-            this.membersData = res.data.members;
-            console.log("会员管理的数据", this.membersData);
-            this.total = res.data.total;
-            if (typeof res.data.cards != "undefined") {
-              this.levelCards = res.data.cards;
+            this.membersData = res.data.members
+            console.log('会员管理的数据', this.membersData)
+            this.total = res.data.total
+            if (typeof res.data.cards !== 'undefined') {
+              this.levelCards = res.data.cards
             }
-            if (typeof res.data.tags != "undefined") {
-              this.tagOptions = res.data.tags;
+            if (typeof res.data.tags !== 'undefined') {
+              this.tagOptions = res.data.tags
             }
-            if (typeof res.data.illness != "undefined") {
-              this.illnessOptions = res.data.illness;
+            if (typeof res.data.illness !== 'undefined') {
+              this.illnessOptions = res.data.illness
             }
-            this.listQuery.init = 0;
+            this.listQuery.init = 0
           } else {
-            this.$message.error(res.msg);
+            this.$message.error(res.msg)
           }
         })
-        .catch(e => {});
+        .catch(e => {})
     },
     openSendMessage() {
       if (this.selectedMembers.length == 0) {
-        this.$message.error("请选择会员");
-        return false;
+        this.$message.error('请选择会员')
+        return false
       }
-      var targets = [];
+      var targets = []
       for (const index in this.selectedMembers) {
         if (this.selectedMembers[index].mobile.length > 0) {
           targets.push({
@@ -372,250 +372,250 @@ export default {
             name: this.selectedMembers[index].name,
             name: this.selectedMembers[index].name,
             mobile: this.selectedMembers[index].mobile
-          });
+          })
         }
       }
       if (targets.length == 0) {
-        this.$message.error("由于所选的全部会员里，均无手机号，无法发送短信");
-        return false;
+        this.$message.error('由于所选的全部会员里，均无手机号，无法发送短信')
+        return false
       }
-      this.$store.dispatch("SMSSetTargets", targets);
-      this.$router.push({ path: "/sms/send" });
+      this.$store.dispatch('SMSSetTargets', targets)
+      this.$router.push({ path: '/sms/send' })
     },
     openAddMembersTags() {
       if (this.selectedMembers.length == 0) {
-        this.$message.error("请选择要添加标签的会员");
-        return false;
+        this.$message.error('请选择要添加标签的会员')
+        return false
       }
 
-      this.memberData.tags = [];
-      this.memberData.ids = [];
+      this.memberData.tags = []
+      this.memberData.ids = []
       for (const index in this.selectedMembers) {
-        this.memberData.ids.push(this.selectedMembers[index].id);
+        this.memberData.ids.push(this.selectedMembers[index].id)
       }
-      this.$refs.addMembersTagsForm.open();
+      this.$refs.addMembersTagsForm.open()
     },
     openDeleteMembers() {
       if (this.selectedMembers.length == 0) {
-        this.$message.error("请选择要删除的会员");
-        return false;
+        this.$message.error('请选择要删除的会员')
+        return false
       }
 
       this.$confirm(
-        "确认要删除所选的会员吗？<br>删除后，会员信息将无法恢复",
-        "删除提示",
+        '确认要删除所选的会员吗？<br>删除后，会员信息将无法恢复',
+        '删除提示',
         {
           dangerouslyUseHTMLString: true,
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
       )
         .then(() => {
-          var ids = [];
-          var idMap = {};
+          var ids = []
+          var idMap = {}
           for (const index in this.selectedMembers) {
-            ids.push(this.selectedMembers[index].id);
+            ids.push(this.selectedMembers[index].id)
             idMap[this.selectedMembers[index].id] = this.selectedMembers[
               index
-            ].id;
+            ].id
           }
           DeleteMembers({ ids: ids })
             .then(response => {
-              var res = response.data;
+              var res = response.data
               if (res.state === 1) {
-                var membersDataLength = this.membersData.length;
+                var membersDataLength = this.membersData.length
                 for (let index = membersDataLength - 1; index >= 0; index--) {
                   if (this.membersData[index].id in idMap) {
-                    this.membersData.splice(index, 1);
+                    this.membersData.splice(index, 1)
                   }
                 }
-                this.$message.success("删除会员成功");
+                this.$message.success('删除会员成功')
               } else {
-                this.$message.error(res.msg);
+                this.$message.error(res.msg)
               }
             })
-            .catch(e => {});
+            .catch(e => {})
         })
         .catch(() => {
-          return false;
-        });
+          return false
+        })
     },
     openDelete(row, index) {
       this.$confirm(
-        "确认要删除该会员吗？<br>删除后，该会员信息将无法恢复",
-        "删除提示",
+        '确认要删除该会员吗？<br>删除后，该会员信息将无法恢复',
+        '删除提示',
         {
           dangerouslyUseHTMLString: true,
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
       )
         .then(() => {
-          var ids = [];
-          ids.push(row.id);
+          var ids = []
+          ids.push(row.id)
           DeleteMembers({ ids: ids })
             .then(response => {
-              var res = response.data;
+              var res = response.data
               if (res.state === 1) {
-                this.membersData.splice(index, 1);
-                this.$message.success("删除会员成功");
+                this.membersData.splice(index, 1)
+                this.$message.success('删除会员成功')
               } else {
-                this.$message.error(res.msg);
+                this.$message.error(res.msg)
               }
             })
-            .catch(e => {});
+            .catch(e => {})
         })
         .catch(() => {
-          return false;
-        });
+          return false
+        })
     },
     openCard(row, index) {
-      this.cardFormData.id = row.id;
-      this.cardFormData.card_id = "";
-      this.memberIndex = index;
+      this.cardFormData.id = row.id
+      this.cardFormData.card_id = ''
+      this.memberIndex = index
       if (row.user_card && row.user_card.card) {
-        this.cardFormData.card_id = row.user_card.card_id;
+        this.cardFormData.card_id = row.user_card.card_id
       }
-      this.$refs.editMemberCardForm.open();
+      this.$refs.editMemberCardForm.open()
     },
     openTags(row, index) {
-      this.memberData.tags = [];
-      this.memberData.id = row.id;
-      let tags = row.tags;
+      this.memberData.tags = []
+      this.memberData.id = row.id
+      const tags = row.tags
       for (const index in tags) {
-        this.memberData.tags.push(tags[index].id);
+        this.memberData.tags.push(tags[index].id)
       }
 
-      this.memberIndex = index;
-      this.$refs.editMemberTagsForm.open();
+      this.memberIndex = index
+      this.$refs.editMemberTagsForm.open()
     },
     openEdit(row, index) {
-      this.memberData.tags = [];
-      this.memberData.illness = [];
-      this.memberData.city = [];
-      this.memberData.birthday = "";
-      this.memberData.ill_date = "";
-      this.memberData.treat_type = "";
+      this.memberData.tags = []
+      this.memberData.illness = []
+      this.memberData.city = []
+      this.memberData.birthday = ''
+      this.memberData.ill_date = ''
+      this.memberData.treat_type = ''
       for (const key in this.memberData) {
-        if (key === "illness" && row.illness) {
-          let illness = row.illness;
+        if (key === 'illness' && row.illness) {
+          const illness = row.illness
           for (const index in illness) {
-            this.memberData.illness.push(illness[index].illness_id);
+            this.memberData.illness.push(illness[index].illness_id)
           }
-        } else if (key === "tags" && row.tags) {
-          let tags = row.tags;
+        } else if (key === 'tags' && row.tags) {
+          const tags = row.tags
           for (const index in tags) {
-            this.memberData.tags.push(tags[index].id);
+            this.memberData.tags.push(tags[index].id)
           }
-        } else if (key === "treat_type" && row.treat_type > 0) {
-          this.memberData.treat_type = row.treat_type;
-        } else if (key === "city") {
+        } else if (key === 'treat_type' && row.treat_type > 0) {
+          this.memberData.treat_type = row.treat_type
+        } else if (key === 'city') {
           if (row.province_id > 0) {
-            this.memberData.city.push(row.province_id);
-            this.memberData.city.push(row.city_id);
-            this.memberData.city.push(row.district_id);
+            this.memberData.city.push(row.province_id)
+            this.memberData.city.push(row.city_id)
+            this.memberData.city.push(row.district_id)
           }
-        } else if (key === "birthday" && row.birthday != 0) {
-          this.memberData.birthday = uParseTime(row.birthday, "{y}-{m}-{d}");
-        } else if (key === "ill_date" && row.ill_date != 0) {
-          this.memberData.ill_date = uParseTime(row.ill_date, "{y}-{m}-{d}");
+        } else if (key === 'birthday' && row.birthday != 0) {
+          this.memberData.birthday = uParseTime(row.birthday, '{y}-{m}-{d}')
+        } else if (key === 'ill_date' && row.ill_date != 0) {
+          this.memberData.ill_date = uParseTime(row.ill_date, '{y}-{m}-{d}')
         } else if (key in row) {
-          this.memberData[key] = row[key];
+          this.memberData[key] = row[key]
         }
       }
       // this.memberData = row;
-      this.memberIndex = index;
-      this.$refs.editMemberForm.open();
+      this.memberIndex = index
+      this.$refs.editMemberForm.open()
     },
     openCreate() {
-      this.$refs.createMemberForm.open();
+      this.$refs.createMemberForm.open()
     },
     memberAvatar(row) {
       if (
-        typeof row.avatar == "undefined" ||
+        typeof row.avatar === 'undefined' ||
         !row.avatar ||
         row.avatar.length == 0
       ) {
         if (row.gender == 2) {
-          return "https://images.shengws.com/201809182128222.png";
+          return 'https://images.shengws.com/201809182128222.png'
         } else {
-          return "https://images.shengws.com/201809182128111.png";
+          return 'https://images.shengws.com/201809182128111.png'
         }
       } else {
-        return row.avatar;
+        return row.avatar
       }
     },
     memberLevel(row) {
       if (row.user_card && row.user_card.card) {
-        return row.user_card.card.card_name;
+        return row.user_card.card.card_name
       } else {
-        return "普通会员";
+        return '普通会员'
       }
     },
     memberCreateTime(time) {
-      return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
     },
     memberSource(source) {
       if (source in this.sourceOptions) {
-        return this.sourceOptions[source].name;
+        return this.sourceOptions[source].name
       } else {
-        return "--";
+        return '--'
       }
     },
     changeCheck() {
-      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.clearSelection()
       if (this.checkAllStatus) {
-        this.$refs.multipleTable.toggleAllSelection();
+        this.$refs.multipleTable.toggleAllSelection()
       }
     },
     handleSelectionChange(val) {
-      this.selectedMembers = val;
+      this.selectedMembers = val
     },
     cellStyleName({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 1) {
-        return "member-name-box";
+        return 'member-name-box'
       }
-      return "";
+      return ''
     },
     selectSource(id) {
-      this.listQuery.source = id;
-      this.sourceType = id;
-      this.GetMembers();
+      this.listQuery.source = id
+      this.sourceType = id
+      this.GetMembers()
     },
     selectLevel(id) {
-      this.listQuery.level = id;
-      this.levelType = id;
-      this.GetMembers();
+      this.listQuery.level = id
+      this.levelType = id
+      this.GetMembers()
     },
     selectTag(id) {
-      this.listQuery.tag = id;
-      this.tagType = id;
-      this.GetMembers();
+      this.listQuery.tag = id
+      this.tagType = id
+      this.GetMembers()
     },
     changeKey() {
-      this.GetMembers();
+      this.GetMembers()
     },
     changeTime() {
-      this.GetMembers();
+      this.GetMembers()
     },
     handleSizeChange(limit) {
-      this.listQuery.limit = limit;
-      this.GetMembers();
+      this.listQuery.limit = limit
+      this.GetMembers()
     },
     handleCurrentChange(page) {
-      this.listQuery.page = page;
-      this.GetMembers();
+      this.listQuery.page = page
+      this.GetMembers()
     }
   },
   created() {
-    this.sourceOptions = this.$store.getters.members.sources;
-    console.log("来源方式", this.sourceOptions);
-    this.treatTypeOptions = this.$store.getters.members.treat_type;
-    this.GetMembers();
+    this.sourceOptions = this.$store.getters.members.sources
+    console.log('来源方式', this.sourceOptions)
+    this.treatTypeOptions = this.$store.getters.members.treat_type
+    this.GetMembers()
   }
-};
+}
 </script>
 
 <style scoped>

src/scrm_pages/org/orginfo.vue

@@ -208,28 +208,28 @@
 </template>
 
 <script>
-import { getToken } from "@/api/qiniu";
+import { getToken } from '@/api/qiniu';
 import {
   GetOrgInfo,
   SaveOrgGallery,
   DeleteOrgGallery,
   EditOrgInfo
-} from "@/api/org/orginfo";
-import { GetDistrictsByUpid } from "@/api/district";
-import { getFileExtension } from "@/utils/tools";
-import Neditor from "@/components/Neditor";
-import BreadCrumb from "@/scrm_pages/components/bread-crumb";
+} from '@/api/org/orginfo';
+import { GetDistrictsByUpid } from '@/api/district';
+import { getFileExtension } from '@/utils/tools';
+import Neditor from '@/components/Neditor';
+import BreadCrumb from '@/scrm_pages/components/bread-crumb';
 export default {
-  name: "orginfo",
+  name: 'orginfo',
   data() {
     return {
-      crumbs: [{ path: false, name: "机构信息" }],
-      qiniuDomain: "https://images.shengws.com/",
+      crumbs: [{ path: false, name: '机构信息' }],
+      qiniuDomain: 'https://images.shengws.com/',
       formloading: false,
       uploading: false,
       guploading: false,
       formsubmit: false,
-      loadingText: "",
+      loadingText: '',
       illnessList: [],
       fileList: [],
       provinces: [],
@@ -238,87 +238,87 @@ export default {
       orgtypes: [],
       orgtypesMap: {},
       childtypes: [],
-      uploadData: { token: "", key: "" },
+      uploadData: { token: '', key: '' },
       operatingStateOptions: [
-        { value: 1, label: "正常营业" },
-        { value: 2, label: "暂未营业" }
+        { value: 1, label: '正常营业' },
+        { value: 2, label: '暂未营业' }
       ],
       weekOptions: [
-        "星期一",
-        "星期二",
-        "星期三",
-        "星期四",
-        "星期五",
-        "星期六",
-        "星期天"
+        '星期一',
+        '星期二',
+        '星期三',
+        '星期四',
+        '星期五',
+        '星期六',
+        '星期天'
       ],
       shangOptions: [
-        "1:00",
-        "2:00",
-        "3:00",
-        "4:00",
-        "5:00",
-        "6:00",
-        "7:00",
-        "8:00",
-        "9:00",
-        "10:00",
-        "11:00",
-        "12:00"
+        '1:00',
+        '2:00',
+        '3:00',
+        '4:00',
+        '5:00',
+        '6:00',
+        '7:00',
+        '8:00',
+        '9:00',
+        '10:00',
+        '11:00',
+        '12:00'
       ],
       xiaOptions: [
-        "13:00",
-        "14:00",
-        "15:00",
-        "16:00",
-        "17:00",
-        "18:00",
-        "19:00",
-        "20:00",
-        "21:00",
-        "22:00",
-        "23:00",
-        "24:00"
+        '13:00',
+        '14:00',
+        '15:00',
+        '16:00',
+        '17:00',
+        '18:00',
+        '19:00',
+        '20:00',
+        '21:00',
+        '22:00',
+        '23:00',
+        '24:00'
       ],
       illnessOptions: [],
       form: {
-        org_name: "",
-        contact_name: "",
-        org_introduction: "",
-        org_logo: "",
-        province: "",
-        city: "",
-        district: "",
-        address: "",
-        parent_type: "",
-        child_type: "",
-        org_type: "",
-        telephone: "",
-        operating_state: "",
-        business_week: "",
+        org_name: '',
+        contact_name: '',
+        org_introduction: '',
+        org_logo: '',
+        province: '',
+        city: '',
+        district: '',
+        address: '',
+        parent_type: '',
+        child_type: '',
+        org_type: '',
+        telephone: '',
+        operating_state: '',
+        business_week: '',
         business_week_select: [],
-        business_time_shange: "",
-        business_time_xia: "",
-        business_time: "",
-        illness: "",
+        business_time_shange: '',
+        business_time_xia: '',
+        business_time: '',
+        illness: '',
         illness_list: [],
         org_gallery: []
       },
       myConfig: {
         // 如果需要上传功能,找后端小伙伴要服务器接口地址
-        serverUrl: "/api/web/upload/ueditor",
+        serverUrl: '/api/web/upload/ueditor',
         // 你的UEditor资源存放的路径,相对于打包后的index.html
-        UEDITOR_HOME_URL: "/NEditor/",
+        UEDITOR_HOME_URL: '/NEditor/',
         // 编辑器不自动被内容撑高
         autoHeightEnabled: false,
         // 初始容器高度
         initialFrameHeight: 240,
         // 初始容器宽度
-        initialFrameWidth: "100%",
+        initialFrameWidth: '100%',
         // 关闭自动保存
         enableAutoSave: false
       }
-    };
+    }
   },
   components: {
     Neditor,
@@ -326,42 +326,42 @@ export default {
   },
   computed: {},
   created() {
-    this.formloading = true;
-    this.loadingText = "加载中...";
-    this.GetOrgInfo();
+    this.formloading = true
+    this.loadingText = '加载中...';
+    this.GetOrgInfo()
   },
   methods: {
     handleChangeIllness(values) {
-      this.form.illness = values.join(",");
+      this.form.illness = values.join(',')
     },
     handleChangeWeek(values) {
-      var selectweek = [];
+      var selectweek = []
       for (const index in values) {
         var item = {
           id: this.weekOptions.indexOf(values[index]),
           name: values[index]
-        };
-        selectweek.push(item);
+        }
+        selectweek.push(item)
       }
 
       if (selectweek.length == 0) {
-        this.form.business_week = "";
+        this.form.business_week = '';
       } else if (selectweek.length == 1) {
-        this.form.business_week = selectweek[0];
+        this.form.business_week = selectweek[0]
       } else {
         selectweek = selectweek.sort(function(a, b) {
-          return a.id - b.id;
-        });
-        var blen = selectweek.length;
+          return a.id - b.id
+        })
+        var blen = selectweek.length
         if (blen == selectweek[blen - 1].id - selectweek[0].id + 1) {
           this.form.business_week =
-            selectweek[0]["name"] + " — " + selectweek[blen - 1]["name"];
+            selectweek[0]['name'] + ' — ' + selectweek[blen - 1]['name']
         } else {
-          var tem = [];
+          var tem = []
           for (const index in selectweek) {
-            tem.push(selectweek[index].name);
+            tem.push(selectweek[index].name)
           }
-          this.form.business_week = tem.join("、");
+          this.form.business_week = tem.join('、')
         }
       }
     },
@@ -371,177 +371,179 @@ export default {
         this.form.business_time_xia.length > 0
       ) {
         this.form.business_time =
-          "上午" +
+          '上午' +
           this.form.business_time_shange +
-          "—下午" +
-          this.form.business_time_xia;
+          '—下午' +
+          this.form.business_time_xia
       } else if (this.form.business_time_shange.length > 0) {
-        this.form.business_time = "上午" + this.form.business_time_shange;
+        this.form.business_time = '上午' + this.form.business_time_shange
       } else if (this.form.business_time_xia.length > 0) {
-        this.form.business_time = "下午" + this.form.business_time_xia;
+        this.form.business_time = '下午' + this.form.business_time_xia
       } else {
-        this.form.business_time = "";
+        this.form.business_time = '';
       }
     },
     handleAvatarError(err, file, fileList) {
-      this.$message.error(err);
-      this.uploading = false;
-      return false;
+      this.$message.error(err)
+      this.uploading = false
+      return false
     },
     handleAvatarSuccess(res, file) {
-      this.form.org_logo = this.qiniuDomain + res.url;
-      this.uploading = false;
+      this.form.org_logo = this.qiniuDomain + res.url
+      this.uploading = false
     },
     beforeAvatarUpload(file) {
-      var fileType = file.type;
-      const isJPG = fileType.indexOf("image") > -1;
-      const isLt2M = file.size / 1024 / 1024 < 2;
+      var fileType = file.type
+      const isJPG = fileType.indexOf('image') > -1
+      const isLt2M = file.size / 1024 / 1024 < 2
 
       if (!isJPG) {
-        this.$message.error("只能上传图片");
-        return false;
+        this.$message.error('只能上传图片')
+        return false
       }
       if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
-        return false;
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+        return false
       }
 
-      var date = new Date();
-      var ext = getFileExtension(file.name);
+      var date = new Date()
+      var ext = getFileExtension(file.name)
       var key =
-        "" +
+        '' +
         date.getFullYear() +
         (date.getMonth() + 1) +
         date.getDate() +
         date.getHours() +
         date.getMinutes() +
         date.getSeconds() +
-        "_o_" +
+        '_o_' +
         file.uid +
-        "." +
-        ext;
-      this.uploading = true;
-      this.loadingText = "机构头像上传中";
+        '.' +
+        ext
+      this.uploading = true
+      this.loadingText = '机构头像上传中';
 
-      const _self = this;
+      const _self = this
       return new Promise((resolve, reject) => {
         getToken()
           .then(response => {
-            const token = response.data.data.uptoken;
-            _self._data.uploadData.token = token;
-            _self._data.uploadData.key = key;
-            resolve(true);
+            const token = response.data.data.uptoken
+            _self._data.uploadData.token = token
+            _self._data.uploadData.key = key
+            resolve(true)
           })
           .catch(err => {
-            reject(false);
-            this.uploading = false;
-          });
-      });
+            reject(false)
+            this.uploading = false
+          })
+      })
     },
     handleGalleryError(err, file, fileList) {
-      this.$message.error(err);
-      this.guploading = false;
-      return false;
+      this.$message.error(err)
+      this.guploading = false
+      return false
     },
     handleGallerySuccess(res, file) {
-      var data = { type: 1, url: this.qiniuDomain + res.url };
+      var data = { type: 1, url: this.qiniuDomain + res.url }
       SaveOrgGallery(data)
         .then(response => {
-          var res = response.data;
+          var res = response.data
           if (res.state == 1) {
-            this.$message.success("上传成功");
+            this.$message.success('上传成功')
           } else {
-            this.$message.error("上传失败");
+            this.$message.error('上传失败')
           }
         })
-        .catch(e => {});
-      this.guploading = false;
+        .catch(e => {})
+      this.guploading = false
     },
     beforeGalleryUpload(file) {
-      var fileType = file.type;
-      const isJPG = fileType.indexOf("image") > -1;
-      const isLt100M = file.size / 1024 / 1024 < 100;
+      var fileType = file.type
+      const isJPG = fileType.indexOf('image') > -1
+      const isLt100M = file.size / 1024 / 1024 < 100
 
       if (!isJPG) {
-        this.$message.error("只能上传图片");
-        return false;
+        this.$message.error('只能上传图片')
+        return false
       }
       if (!isLt100M) {
-        this.$message.error("上传图片大小不能超过 100MB!");
-        return false;
+        this.$message.error('上传图片大小不能超过 100MB!')
+        return false
       }
 
-      var date = new Date();
-      var ext = getFileExtension(file.name);
+      var date = new Date()
+      var ext = getFileExtension(file.name)
       var key =
-        "" +
+        '' +
         date.getFullYear() +
         (date.getMonth() + 1) +
         date.getDate() +
         date.getHours() +
         date.getMinutes() +
         date.getSeconds() +
-        "_g_" +
+        '_g_' +
         file.uid +
-        "." +
-        ext;
-      this.guploading = true;
-      this.loadingText = "机构图册上传中";
+        '.' +
+        ext
+      this.guploading = true
+      this.loadingText = '机构图册上传中';
 
-      const _self = this;
+      const _self = this
       return new Promise((resolve, reject) => {
         getToken()
           .then(response => {
-            const token = response.data.data.uptoken;
-            _self._data.uploadData.token = token;
-            _self._data.uploadData.key = key;
-            resolve(true);
+            const token = response.data.data.uptoken
+            _self._data.uploadData.token = token
+            _self._data.uploadData.key = key
+            resolve(true)
           })
           .catch(err => {
-            reject(false);
-            this.guploading = false;
-          });
-      });
+            reject(false)
+            this.guploading = false
+          })
+      })
     },
 
     handleRemove(file, fileList) {
       DeleteOrgGallery(file.id)
         .then(response => {
-          var res = response.data;
+          var res = response.data
           if (res.state == 1) {
-            this.$message.success("删除成功");
+            this.$message.success('删除成功')
           } else {
-            this.$message.error("删除失败");
+            this.$message.error('删除失败')
           }
         })
-        .catch(e => {});
-      console.log("handleRemove", file, fileList);
+        .catch(e => {})
+      console.log('handleRemove', file, fileList)
     },
     GetOrgInfo() {
       GetOrgInfo()
         .then(response => {
-          var res = response.data;
+          var res = response.data
+          console.log('res是什么', res)
           if (res.state === 1) {
-            this.form.org_name = res.data.orginfo.org_name;
-            this.form.contact_name = res.data.orginfo.contact_name;
-            this.form.org_introduction = res.data.orginfo.org_introduction;
-            this.form.org_logo = res.data.orginfo.org_logo;
-            this.form.province = res.data.orginfo.province;
-            this.form.city = res.data.orginfo.city;
-            this.form.district = res.data.orginfo.district;
-            this.form.address = res.data.orginfo.address;
-            this.form.org_type = res.data.orginfo.org_type;
-            this.form.telephone = res.data.orginfo.telephone;
-            this.form.operating_state = res.data.orginfo.operating_state;
-            this.form.business_week = res.data.orginfo.business_week;
-            this.form.business_week_select = [];
-            this.form.business_time = res.data.orginfo.business_time;
-            this.form.business_time_shange = "";
-            this.form.business_time_xia = "";
-            this.form.illness = res.data.orginfo.illness;
-            this.form.illness_list = [];
-            this.form.org_gallery = res.data.orginfo.org_gallery;
-            this.fileList = [];
+            this.form.org_name = res.data.orginfo.org_name
+            this.form.contact_name = res.data.orginfo.contact_name
+            this.form.org_introduction = res.data.orginfo.org_introduction
+            this.form.org_logo = res.data.orginfo.org_logo
+            this.form.province = res.data.orginfo.province
+            this.form.city = res.data.orginfo.city
+            this.form.district = res.data.orginfo.district
+            this.form.address = res.data.orginfo.address
+            this.form.org_type = res.data.orginfo.org_type
+            console.log('机构类型', res.data.orginfo.org_type)
+            this.form.telephone = res.data.orginfo.telephone
+            this.form.operating_state = res.data.orginfo.operating_state
+            this.form.business_week = res.data.orginfo.business_week
+            this.form.business_week_select = []
+            this.form.business_time = res.data.orginfo.business_time
+            this.form.business_time_shange = '';
+            this.form.business_time_xia = '';
+            this.form.illness = res.data.orginfo.illness
+            this.form.illness_list = []
+            this.form.org_gallery = res.data.orginfo.org_gallery
+            this.fileList = []
             for (const index in this.form.org_gallery) {
               var image = {
                 id: this.form.org_gallery[index].id,
@@ -550,180 +552,183 @@ export default {
                   this.form.org_gallery[index].type == 1
                     ? this.form.org_gallery[index].url
                     : this.form.org_gallery[index].url +
-                      "?vframe/jpg/offset/0/w/100/h/100"
-              };
-              this.fileList.push(image);
+                      '?vframe/jpg/offset/0/w/100/h/100'
+              }
+              this.fileList.push(image)
             }
 
-            var illness = res.data.orginfo.illness.split(",");
+            var illness = res.data.orginfo.illness.split(',')
             for (const index in illness) {
-              var iid = parseInt(illness[index]);
+              var iid = parseInt(illness[index])
               if (isNaN(iid) || iid <= 0) {
-                continue;
+                continue
               }
-              this.form.illness_list.push(iid);
+              this.form.illness_list.push(iid)
             }
-            var business_week = this.form.business_week;
-            var business_week_tem = business_week.split(" — ");
+            var business_week = this.form.business_week
+            var business_week_tem = business_week.split(' — ')
             if (business_week_tem.length == 2) {
-              var fromIndex = this.weekOptions.indexOf(business_week_tem[0]);
-              var toIndex = this.weekOptions.indexOf(business_week_tem[1]);
+              var fromIndex = this.weekOptions.indexOf(business_week_tem[0])
+              var toIndex = this.weekOptions.indexOf(business_week_tem[1])
               if (fromIndex >= 0 && toIndex >= 0) {
                 for (const index in this.weekOptions) {
                   if (index >= fromIndex && index <= toIndex) {
                     this.form.business_week_select.push(
                       this.weekOptions[index]
-                    );
+                    )
                   }
                 }
               }
             } else {
-              business_week_tem = business_week.split("、");
+              business_week_tem = business_week.split('、')
               for (const index in business_week_tem) {
                 if (business_week_tem[index].length > 0) {
-                  this.form.business_week_select.push(business_week_tem[index]);
+                  this.form.business_week_select.push(business_week_tem[index])
                 }
               }
             }
-            var business_time = this.form.business_time;
-            var business_time_tem = business_time.split("—");
+            var business_time = this.form.business_time
+            var business_time_tem = business_time.split('—')
+            // eslint-disable-next-line eqeqeq
             if (business_time_tem.length == 2) {
               this.form.business_time_shange = business_time_tem[0].substring(
                 2
-              );
-              this.form.business_time_xia = business_time_tem[1].substring(2);
+              )
+              this.form.business_time_xia = business_time_tem[1].substring(2)
             } else {
-              var selectTime = business_time_tem[0].substring(2);
+              var selectTime = business_time_tem[0].substring(2)
               if (this.shangOptions.indexOf(selectTime) > -1) {
-                this.form.business_time_shange = selectTime;
+                this.form.business_time_shange = selectTime
               } else if (this.xiaOptions.indexOf(selectTime) > -1) {
-                this.form.business_time_xia = selectTime;
+                this.form.business_time_xia = selectTime
               }
             }
 
-            this.provinces = res.data.provinces;
-            this.citys = res.data.citys ? res.data.citys : [];
-            this.districts = res.data.districts ? res.data.districts : [];
+            this.provinces = res.data.provinces
+            console.log('省', res.data.provinces)
+            this.citys = res.data.citys ? res.data.citys : []
+            this.districts = res.data.districts ? res.data.districts : []
 
             this.orgtypes = [];
-            (this.orgtypesMap = {}), (this.childtypes = []);
-            var orgtypes = res.data.orgtypes;
+            (this.orgtypesMap = {}), (this.childtypes = [])
+            var orgtypes = res.data.orgtypes
+            console.log('orgtypes', orgtypes)
             for (const index in orgtypes) {
               if (orgtypes[index].pid > 0) {
                 if (!(orgtypes[index].pid in this.orgtypesMap)) {
-                  this.orgtypesMap[orgtypes[index].pid] = [];
+                  this.orgtypesMap[orgtypes[index].pid] = []
                 }
-                this.orgtypesMap[orgtypes[index].pid].push(orgtypes[index]);
+                this.orgtypesMap[orgtypes[index].pid].push(orgtypes[index])
                 if (orgtypes[index].id == this.form.org_type) {
-                  this.form.child_type = orgtypes[index].id;
-                  this.form.parent_type = orgtypes[index].pid;
+                  this.form.child_type = orgtypes[index].id
+                  this.form.parent_type = orgtypes[index].pid
                 }
               } else {
-                this.orgtypes.push(orgtypes[index]);
+                this.orgtypes.push(orgtypes[index])
                 if (orgtypes[index].id == this.form.org_type) {
-                  this.form.parent_type = orgtypes[index].id;
+                  this.form.parent_type = orgtypes[index].id
                 }
               }
             }
             if (this.form.parent_type in this.orgtypesMap) {
-              this.childtypes = this.orgtypesMap[this.form.parent_type];
+              this.childtypes = this.orgtypesMap[this.form.parent_type]
             } else {
-              this.childtypes = [];
+              this.childtypes = []
             }
-            this.illnessOptions = res.data.illness ? res.data.illness : [];
-            this.formloading = false;
+            this.illnessOptions = res.data.illness ? res.data.illness : []
+            this.formloading = false
           } else {
-            this.$message.error(resp.msg);
+            this.$message.error(resp.msg)
           }
         })
-        .catch(e => {});
+        .catch(e => {})
     },
     myTrim(x) {
-      return x.replace(/^\s+|\s+$/gm, "");
+      return x.replace(/^\s+|\s+$/gm, '')
     },
     changeProvince(id) {
-      this.citys = [];
-      this.districts = [];
-      this.form.city = "";
-      this.form.district = "";
-      var upid = parseInt(id);
+      this.citys = []
+      this.districts = []
+      this.form.city = '';
+      this.form.district = '';
+      var upid = parseInt(id)
       if (isNaN(upid) || upid <= 0) {
-        return false;
+        return false
       }
       GetDistrictsByUpid({ id: upid })
         .then(response => {
-          var res = response.data;
+          var res = response.data
           if (res.state === 1) {
-            this.citys = res.data.citys ? res.data.citys : [];
+            this.citys = res.data.citys ? res.data.citys : []
           }
         })
-        .catch(e => {});
+        .catch(e => {})
     },
     changeCity(id) {
-      this.districts = [];
-      this.form.district = "";
-      var upid = parseInt(id);
+      this.districts = []
+      this.form.district = '';
+      var upid = parseInt(id)
       if (isNaN(upid) || upid <= 0) {
-        return false;
+        return false
       }
       GetDistrictsByUpid({ id: upid })
         .then(response => {
-          var res = response.data;
+          var res = response.data
           if (res.state === 1) {
-            this.districts = res.data.citys ? res.data.citys : [];
+            this.districts = res.data.citys ? res.data.citys : []
           }
         })
-        .catch(e => {});
+        .catch(e => {})
     },
     changeParentType(id) {
-      id = parseInt(id);
-      this.childtypes = [];
-      this.form.child_type = "";
-      this.form.org_type = 0;
+      id = parseInt(id)
+      this.childtypes = []
+      this.form.child_type = '';
+      this.form.org_type = 0
 
       if (isNaN(id) || id <= 0) {
-        return false;
+        return false
       }
       if (id in this.orgtypesMap) {
-        this.childtypes = this.orgtypesMap[id];
+        this.childtypes = this.orgtypesMap[id]
       } else {
-        this.childtypes = [];
+        this.childtypes = []
       }
 
-      this.form.org_type = id;
+      this.form.org_type = id
     },
     changeChildType(id) {
-      this.form.org_type = id;
+      this.form.org_type = id
     },
     submitForm() {
-      this.form.org_introduction = this.$refs.neditor.content;
-      this.formloading = true;
-      this.formsubmit = true;
-      this.loadingText = "正在保存...";
+      this.form.org_introduction = this.$refs.neditor.content
+      this.formloading = true
+      this.formsubmit = true
+      this.loadingText = '正在保存...';
       EditOrgInfo(this.form)
         .then(response => {
-          var res = response.data;
+          var res = response.data
           if (res.state == 1) {
-            this.$store.dispatch("ModifyOrgInfo", {
+            this.$store.dispatch('ModifyOrgInfo', {
               org_name: this.form.org_name,
               contact_name: this.form.org_name
-            });
+            })
 
-            this.$message.success("修改成功");
+            this.$message.success('修改成功')
           } else {
-            this.$message.error(res.msg);
+            this.$message.error(res.msg)
           }
 
-          this.formloading = false;
-          this.formsubmit = false;
+          this.formloading = false
+          this.formsubmit = false
         })
         .catch(e => {
-          this.formloading = false;
-          this.formsubmit = false;
-        });
+          this.formloading = false
+          this.formsubmit = false
+        })
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" >

src/scrm_pages/role/EditPerview.vue

@@ -64,7 +64,7 @@ export default {
       var resp = rs.data
       if (resp.state === 1) {
         this.purviews.push(...resp.data.purviews)
-
+        console.log('是什么东西啊', resp.data.purviews)
         // 初始化默认选中项
         var role_purview_ids = resp.data.role_purview_ids
         // role_purview_ids = '48,49,50'

src/scrm_pages/site/components/new-feature.vue

@@ -933,7 +933,7 @@ export default {
          {id:2,name:'无'},
        ],
       defineOptions:[
-        {id:1,name:'无'},
+        // {id:1,name:'无'},
         {id:2,name:'站内链接'},
         {id:3,name:'电话'},
         {id:4,name:'站外链接'},
@@ -2409,7 +2409,8 @@ export default {
  };
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
+<style rel="stylesheet/scss" lang="scss">
+
      .tpic{
        margin-left: 50px;
      }

src/scrm_pages/site/index.vue

@@ -60,8 +60,8 @@ export default {
       crumbs: [{ path: false, name: "微网站" }],
       codeImg: require("../../assets/home/wei.jpg"),
       usreOrgID: "",
-      //  url:"http://microweb.kuyicloud.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
-       url: "http://jk.test.sgjyun.com/#/microHome?orgid=" +  this.$store.getters.xt_user.org_id
+     // url:"http://microweb.kuyicloud.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
+      url: "http://jk.test.sgjyun.com/#/microHome?orgid=" +  this.$store.getters.xt_user.org_id
     };
   },
   methods: {
@@ -69,7 +69,7 @@ export default {
       let qrcode = new QRCode("qrcode", {
         width: 100,
         height: 100, // 高度
-        // text: 'http://microweb.kuyicloud.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
+       //  text: 'http://microweb.kuyicloud.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
          text:"http://jk.test.sgjyun.com/#/microHome?orgid=" + this.$store.getters.xt_user.org_id // 二维码内容
         // render: 'canvas' // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
         // background: '#f0f'

src/scrm_pages/sms/sms_send.vue

@@ -140,7 +140,7 @@ export default {
                 var resp = rs.data
                 if (resp.state == 1) {
                     this.tags = resp.data.tags;
-                    // console.log("this.tags是什么",this.tags)
+                    console.log("this.tags是什么",this.tags)
                     this.sms_content = resp.data.default_content
 
                 } else {
@@ -201,13 +201,15 @@ export default {
             }
         },
         cancelSelectTagAction: function(tag) {
-            for (let index = 0; index < this.selecting_tags.length; index++) {
-                if (this.selecting_tags[index].id == tag.id) {
-                    this.selecting_tags.splice(index, 1)
-                    this.getTagCustomerCount()
-                    break
-                }
-            }
+            console.log("tag是什么",tag)
+            // for (let index = 0; index < this.selecting_tags.length; index++) {
+            //     if (this.selecting_tags[index].id == tag.id) {
+            //         this.selecting_tags.splice(index, 1)
+            //         this.getTagCustomerCount()
+            //         break
+            //     }
+            // }
+            this.tags.splice(this.tags.indexOf(tag),1)
         },
 
         isSMSContentValid: function() {

src/scrm_pages/systemsetting/components/EditStaffForm.vue

@@ -234,6 +234,7 @@
           },    
           
           SaveStaffInfo(forname){
+            this.form.content = this.$refs.neditor.content;
              this.$refs[forname].validate((valid)=>{
                  if(valid){
                     SaveStaffInfo(this.form.id,this.form).then(response=>{

src/xt_permission.js

@@ -5,19 +5,19 @@ import 'nprogress/nprogress.css'// progress bar style
 
 NProgress.configure({ showSpinner: false })// NProgress Configuration
 
-const loginWhiteList = ['/token/verify', '/401', '/404', "/activity/preview"] // 登录验证白名单
+const loginWhiteList = ['/token/verify', '/401', '/404', '/activity/preview'] // 登录验证白名单
 const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  //  return
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
 
   NProgress.start()