Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-vue

package.json

@@ -75,6 +75,7 @@
     "vue-i18n": "7.3.2",
     "vue-infinite-scroll": "^2.0.2",
     "vue-multiselect": "2.0.8",
+    "vue-photo-preview": "^1.1.3",
     "vue-router": "3.0.1",
     "vue-splitpane": "1.0.2",
     "vuedraggable": "^2.23.0",

src/api/site/site.js

@@ -1347,4 +1347,13 @@ export function AddRotationVisibleForm(id,data){
        method:"Post",
        data:data,
     })
+}
+
+export function AddMagiclinkDataTwo(id,data){
+    console.log("data是什么",data)
+   return request({
+       url:"/api/site/addmagiclinkdatatwo?id="+id,
+       method:"Post",
+       data:data,
+   })
 }

src/assets/styles/common.css

@@ -0,0 +1,124 @@
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+canvas,
+details,
+embed,
+figure,
+figcaption,
+footer,
+header,
+hgroup,
+menu,
+nav,
+output,
+ruby,
+section,
+summary,
+time,
+mark,
+audio,
+video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+  display: block;
+}
+body {
+  line-height: 1;
+}
+ol,
+ul {
+  list-style: none;
+}
+blockquote,
+q {
+  quotes: none;
+}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+  content: "";
+  content: none;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}

src/assets/styles/iconfont.css

@@ -0,0 +1,19 @@
+@font-face {
+  font-family: "iconfont"; /* project id 1470572 */
+  src: url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.eot");
+  src: url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.eot?#iefix")
+      format("embedded-opentype"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.woff2") format("woff2"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.woff") format("woff"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.ttf") format("truetype"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.svg#iconfont") format("svg");
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased; /*字体清除锯齿效果*/
+  -webkit-text-stroke-width: 0.2px; /*文本外边框大小*/
+  -moz-osx-font-smoothing: grayscale;
+}

src/assets/styles/mixin.scss

@@ -0,0 +1,27 @@
+@mixin border-top {
+  position: relative;
+
+  &::before {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    content: "";
+    height: 1px;
+    background: #e0e0e0;
+  }
+}
+
+@mixin border-bottom {
+  position: relative;
+
+  &::after {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    content: "";
+    height: 1px;
+    background: #e0e0e0;
+  }
+}

src/lang/en.js

@@ -60,7 +60,6 @@ export default {
     theme: 'Theme',
     clipboardDemo: 'Clipboard',
     i18n: 'I18n',
-    permissionManage: 'Permission Manage',
     adminManage: 'Admin Manage',
     roleManage: 'Role Manage',
     dialysis: 'Dialysis',
@@ -115,13 +114,14 @@ export default {
     activityList: "activity list",
     activityPublish: "publish activity",
     activityModify: "edit activity",
-    systemsetting:'Systemsetting',
     activityDetail: "activity detail",
     activityShare: "activity share",
     activityPreview: "activity preview",
     activitySignupList: "activity sign up list",
     SMSManage: "sms manage",
     SMSSend: "sms send",
+    permissionManage: 'Permission Manage',
+    systemsetting:'Systemsetting',
   },
   navbar: {
     logOut: 'Log Out',

src/lang/zh.js

@@ -72,7 +72,6 @@ export default {
     theme: '换肤',
     clipboardDemo: 'Clipboard',
     i18n: '国际化',
-    permissionManage: '权限管理',
     adminManage: '用户管理',
     roleManage: '角色管理',
     dialysis: '透析管理',
@@ -169,7 +168,6 @@ export default {
     activityList: "活动列表",
     activityPublish: "发布活动",
     activityModify: "编辑活动",
-    systemsetting:'系统设置',
     staffmanagement:'医护管理',
     activityDetail: "活动详情",
     activityShare: "活动分享",
@@ -179,6 +177,8 @@ export default {
     SMSSend: "群发短信",
     site:"微网站",
     preview:"预览",
+    permissionManage: '权限管理',
+    systemsetting:'系统设置',
   },
   navbar: {
     logOut: '退出登录',

src/main.js

@@ -1,7 +1,8 @@
 import Vue from 'vue'
 
 import 'normalize.css/normalize.css'// A modern alternative to CSS resets
-
+import "./assets/styles/iconfont.css";
+import "./assets/styles/common.css";
 import Element from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import '@/utils/directives.js'
@@ -27,7 +28,9 @@ import 'swiper/dist/css/swiper.min.css';
 //引入mint-ui
 import Mint from 'mint-ui';
 Vue.use(Mint);
-
+import preview from "vue-photo-preview";
+import "vue-photo-preview/dist/skin.css";
+Vue.use(preview);
 //引入无线滚条
 
 import { read } from 'fs';

src/router/index.js

@@ -84,9 +84,9 @@ var _asy_router_map = [
   article,
   marketing_tool,
   org,
-  system,
   site,
   role,
+  system,
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/scrm_pages/article/articleList.vue

@@ -230,8 +230,6 @@
             });
            },
            editArticles(id,articletype){
-              //  console.log("文章id",id);
-              //  console.log("文章内型",articletype)
                if(articletype == 1){
                   this.$router.push("/articles/editArticle/"+id);
                }

src/scrm_pages/article/commentList.vue

@@ -114,8 +114,13 @@ import { copyFile } from 'fs';
         getReplyAllComents(){
           getReplyAllComents(this.form).then(response=>{
                if(response.data.state ==1){
-                var comments =  response.data.data.comments;
-                this.comments =  response.data.data.comments;
+                var comments =  response.data.data.comments;          
+                for (let index = 0; index < comments.length; index++) {
+                   if(comments[index].comment_user_avater == ""){
+                      comments[index].comment_user_avater = "https://images.shengws.com/201809182128222.png";
+                   }                
+                }
+                this.comments = comments;
                  console.log("评论列表",comments)
                 var total =  response.data.data.total;
                  this.total =  response.data.data.total;

src/scrm_pages/article/createArticle.vue

@@ -22,8 +22,11 @@
                 </keep-alive>
               </el-form-item>
               <el-form-item label="封面图片:">
-                  <el-radio v-model="radio" label="1" @click.native.prevent="select()" >单图</el-radio>
-                  <el-radio v-model="radio" label="2" @click.native.prevent="clickitem()" >三图</el-radio>
+                  <!-- <el-radio v-model="form.radio" label="1" @click.native.prevent="select()" >单图</el-radio>
+                  <el-radio v-model="form.radio" label="2" @click.native.prevent="clickitem()" >三图</el-radio> -->
+                     <el-radio-group v-model="form.radio">
+                            <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="selectGender(gender.id)">{{gender.name}}</el-radio>
+                    </el-radio-group>
               </el-form-item>
               <el-form-item required prop="org_logo">
                 <el-col :span="3">
@@ -253,7 +256,12 @@
           vio_upload:"",
           vid_name:"",
           vid_type:"",
+          radio:1,
         },
+           genderOptions:[
+            {id:1, name:'单图'},
+            {id:2, name:'三图'},
+          ],
          acttypes:[],
          imageUrl:'',
          imageUrlLast:'',
@@ -455,9 +463,12 @@
              this.$message.error("视频上传失败")
          },
         beforeUploadFile(file) {
-        const isLt2M = file.size / 1024 / 1024 < 2048;
+        const isLt2M = file.size / 1024 / 1024 <= 2048;
+        console.log("视频大小",file.size/1024/1024)
+        console.log("isLt2M是什么",isLt2M)
         if (!isLt2M) {
           this.$message.error('上传视频大小不能超过 2G!');
+          return false;
         }
             var date = new Date()
             var ext = getFileExtension(file.name)
@@ -503,11 +514,13 @@
                 })
             })
        },
-      select(){
-        this.picshow = false
-      },
-      clickitem(){
-        this.picshow = true
+      selectGender(id){
+        if(id == 1){
+          this.picshow = false;
+        }
+        if(id == 2){
+          this.picshow = true;
+        }
       },
       handleRemove(file, fileList) {
         console.log(file, fileList);

src/scrm_pages/article/edit_vido.vue

@@ -129,9 +129,9 @@
           this.form.file =  file.raw
         }, 
         handleSuccess(res,file,fileList){  
-            this.$message.success("视频上传成功")       
-            this.form.vid_pic = "",        
-             this.form.vio_upload = this.qiniuDomain + res.url;           
+            this.$message.success("视频上传成功")          
+             this.form.vio_upload = this.qiniuDomain + res.url; 
+              this.form.vid_pic = this.form.vio_upload+"?vframe/jpg/offset/1/w/300/h/200",               
              console.log("上传之后是什么",this.form.vio_upload)
 
              this.show=false;
@@ -221,6 +221,7 @@
                  var vidos = response.data.data.vidos;
                  this.form.vid_name = vidos.title;
                  this.form.vid_pic = vidos.imgs;
+                 this.form.vio_upload = vidos.video_url;
                  console.log("得到的是什么?",this.form.vid_pic)
                  this.form.vid_type =  vidos.class_id
                  console.log("视频vidos",vidos)
@@ -241,7 +242,10 @@
        SumitVido(forName){
              const id = this.$route.params && this.$route.params.id;
              console.log("id是多少?",id)
-             this.form.vid_pic = this.form.vio_upload;
+             console.log("视频是什么",this.form.vio_upload)
+             if(this.form.vio_upload == ""){
+                this.form.vid_pic = this.form.vio_upload;
+             }
           this.$refs[forName].validate((valid)=>{
               if(valid){
                  updataVidoInfo(id,this.form).then(response=>{

src/scrm_pages/site/components/add-contact.vue

@@ -29,7 +29,7 @@
                 </li>
                 <li @click="type = true">
                     <span>
-                        <img :src="new1" alt="" style="width:40px;height:40px">
+                        <img :src="new5" alt="" style="width:40px;height:40px">
                         <p>乘车方式</p>  
                     </span>
                 </li>
@@ -293,7 +293,7 @@
  <!-- 编辑图片 -->
  <el-dialog
      class="avatar-uploader"
-     title="编辑图片3"
+     title="编辑图片"
      :visible.sync="addVisible"
      width="30%"
      center>
@@ -501,11 +501,11 @@ export default {
       qiniuDomain: 'https://images.shengws.com/',
       Data: { token:'',key: '' },
       rotationData: { token:'',key: '' },
-      new1: require("../../../assets/preview/u481.png"),
-      new2: require("../../../assets/preview/u493.png"),
-      new3: require("../../../assets/preview/u496.png"),
-      new4: require("../../../assets/preview/u488.png"),
-      new5: require("../../../assets/preview/u500.png"),    
+      new1: require("../../../assets/preview/轮播图.png"),
+      new2: require("../../../assets/preview/医院地址.png"),
+      new3: require("../../../assets/preview/联系方式.png"),
+      new4: require("../../../assets/preview/工作时间.png"),
+      new5: require("../../../assets/preview/公交.png"),    
       form: {
         name: "",
         sort:"",
@@ -910,6 +910,9 @@ export default {
         this.hostaddress = true;
       },
       addrotationpic(formName){
+        if(this.picform.linkid == ""){
+           this.picform.linkid = 0;
+        }
          var sorts = this.picform.sort
          var sort = parseInt(sorts)
          this.picform.sort = sort

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

@@ -761,15 +761,15 @@
        </el-form-item>
        <el-form-item label="跳转设置" required prop="jumpset">
          <el-radio-group v-model="editmarginform.jumpset">
-            <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="selectGender(gender.id)">{{gender.name}}</el-radio>
+            <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="rotationGender(gender.id)">{{gender.name}}</el-radio>
           </el-radio-group>
        </el-form-item>
        <el-form-item>
          <el-col :span="15">
-           <el-input style="width:300px" v-model="editmarginform.marginaddress" v-show="define"></el-input>
+           <el-input style="width:300px" v-model="editmarginform.marginaddress" v-show="definefive" :disabled="true"></el-input>
         </el-col>
         <el-col :span="4">
-         <el-button size="medium" @click="magicVisible=true" v-show="define">设置链接</el-button>
+         <el-button size="medium" @click="magicVisible=true" v-show="definefive">设置链接</el-button>
         </el-col>
        </el-form-item>
      </el-form>
@@ -780,7 +780,7 @@
 </el-dialog> 
 
 <el-dialog
-  title="设置链接地址"
+  title="设置链接地址6"
   :visible.sync="magicVisible"
   width="30%"
   center>
@@ -809,7 +809,7 @@
   </el-form>
   <span slot="footer" class="dialog-footer">
     <el-button @click="magicVisible = false">取 消</el-button>
-    <el-button type="primary" @click="AddMagiclinkData('maclinkform');">确 定</el-button>
+    <el-button type="primary" @click="AddMagiclinkDataTwo('maclinkform');">确 定</el-button>
   </span>
 </el-dialog>
 
@@ -837,7 +837,7 @@
       </el-form-item>
       <el-form-item label="图片链接:">
           <el-radio-group v-model="editrotationform.piclink">
-           <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="select(gender.id)">{{gender.name}}</el-radio>
+           <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderPicLink" :key="index" @change="select(gender.id)">{{gender.name}}</el-radio>
         </el-radio-group>
       </el-form-item>
        <el-form-item label="链接地址:" v-show="selectone">
@@ -869,7 +869,7 @@
   </el-form>
   <span slot="footer" class="dialog-footer">
     <el-button @click="rotationVisible = false">取 消</el-button>
-    <el-button type="primary" @click="AddRotationVisibleForm('rotationvisibleform');rotationVisible = false">确 定</el-button>
+    <el-button type="primary" @click="AddRotationVisibleForm('rotationvisibleform');">确 定</el-button>
   </span>
 </el-dialog>
 </div>
@@ -880,7 +880,7 @@
    getQueryDoCHead,editDoctor,saveDocInfo,deleteDoctor,AddImageslink,getEditImages,AddMagicNavi,getMagicImages,AddMarginChart,
    deleteRotations,editRotationImages,updateRotionImages,addActiveform,deleteMargin,getEditImagesDetail,UpdateEditMacgin,getArticleType
    ,AddArticeList,getEnImages,EditEnvirImages,AddtwoImages,deleteOfficeById,GetArticleById,GetAllActivity,AddLinkAddress,AddMagiclinkData,
-   getMacLinkAddress,getCountImages,getAllModelTitle, GetMagicLinkAddressByID,GetRotationVisibleByLinkId,AddRotationVisibleForm} from '@/api/site/site'  
+   getMacLinkAddress,getCountImages,getAllModelTitle, GetMagicLinkAddressByID,GetRotationVisibleByLinkId,AddRotationVisibleForm,AddMagiclinkDataTwo} from '@/api/site/site'  
    import { getToken } from '@/api/qiniu'
    import { getFileExtension} from '@/utils/tools'
    import { isIP, isIPv4 } from 'net';
@@ -974,11 +974,8 @@ export default {
        maclinkform:{
          linkType:'',
          instationlink:'',
-         articeType:'',
-         title:'',
          phone:'',
          outstationlink:'',
-         linkaddress:'',
        },
        articeTypelist:[],
        acticeNamelist:[],
@@ -987,6 +984,7 @@ export default {
        definetwo:false,
        definethree:false,
        definefour:false,
+       definefive:true,
        selectone:false,
        rotationVisible:false,
        officeVisible:false,
@@ -1017,14 +1015,14 @@ export default {
          gender:"",
        },
        value: '',
-      new1: require("../../../assets/preview/u481.png"),
-      new2: require("../../../assets/preview/u493.png"),
-      new3: require("../../../assets/preview/u496.png"),
-      new4: require("../../../assets/preview/u488.png"),
-      new5: require("../../../assets/preview/u500.png"),
-      new6: require("../../../assets/preview/u504.png"),
-      new7: require("../../../assets/preview/u508.png"),
-      new8: require("../../../assets/preview/u512.png"),
+      new1: require("../../../assets/preview/轮播图.png"),
+      new2: require("../../../assets/preview/医院介绍.png"),
+      new3: require("../../../assets/preview/科室介绍.png"),
+      new4: require("../../../assets/preview/名医介绍.png"),
+      new5: require("../../../assets/preview/科室环境.png"),
+      new6: require("../../../assets/preview/文章列表.png"),
+      new7: require("../../../assets/preview/活动列表.png"),
+      new8: require("../../../assets/preview/魔方导航.png"),
       dialogVisible: false,
       dialogRotationVisible: false,
       editcenterDialogVisible: false,
@@ -1119,7 +1117,7 @@ export default {
         margtitle:"",
         margImage:"",
         marginaddress:"",
-        jumpset:"",
+        jumpset:1,
         linkid:"",
       },
       keform:{
@@ -1132,7 +1130,7 @@ export default {
         id:"",
         imageUrl:"",
         sort:"",
-        imagelink:"",
+        imagelink:1,
         linkaddress:"",
       },
 
@@ -1339,10 +1337,6 @@ export default {
             this.file = '';
       },
      
-      define(){
-         alert("aa")
-      },
-
       handleAvatarSuccess(res, file) {
          this.eidtDoctorform.dochead = this.qiniuDomain + res.url;  
       },
@@ -1929,6 +1923,14 @@ export default {
            this.define = false;
         }
      },
+     rotationGender(id){
+        if(id == 1){
+            this.definefive = true;
+        }
+        if(id == 2){
+           this.definefive = false;
+        }
+     },
      selectItem(id){
        if(id == 1){
          this.definetwo = false;
@@ -1973,8 +1975,6 @@ export default {
          this.definethree = false;
          this.definefour = false;
          this.maclinkform.instationlink = '';
-         this.maclinkform.articeType = '';
-         
          this.maclinkform.phone = '';
          this.maclinkform.outstationlink = '';
         
@@ -1984,26 +1984,24 @@ export default {
           this.definetwo = true;
           this.definethree = false;
           this.definefour = false;
-          this.maclinkform.phone = '';
-          this.maclinkform.outstationlink = '';
+          this.maclinkform.phone = "";
+          this.maclinkform.outstationlink = "";
        }
 
        if(id==3){
          this.definethree = true;
          this.definetwo = false;
          this.definefour = false;
-         this.maclinkform.instationlink = '';
-         this.maclinkform.articeType = '';
-         this.maclinkform.outstationlink = '';
+         this.maclinkform.instationlink = ""
+         this.maclinkform.outstationlink = "";
        }
 
        if(id==4){
          this.definefour = true;
          this.definetwo = false;
          this.definethree = false;
-         this.maclinkform.instationlink = '';
-         this.maclinkform.articeType = '' ;
-         this.maclinkform.phone = '';
+         this.maclinkform.instationlink = "";
+         this.maclinkform.phone = "";
        }
      },
         
@@ -2051,13 +2049,16 @@ export default {
      },
 
      AddMagicNavi(formName){
+         if(this.editmarginform.linkid == ""){
+            this.editmarginform.linkid = 0;
+         }
         this.$refs[formName].validate((valid)=>{
           if(valid){
             AddMagicNavi(this.editmarginform).then(response=>{
               if(response.data.state == 1){
-               this.editmarginform.marginaddress = "";
-               this.getMagicImages();
-               var editmargin  = response.data.data.editmargin;
+                this.editmarginform.marginaddress = "";
+                this.getMagicImages();
+                var editmargin  = response.data.data.editmargin;
                 this.isEmpty = true;
                 this.editmarginform.margtitle = "";
                 this.editmarginform.margImage = "";
@@ -2186,8 +2187,15 @@ export default {
      editImages(id){
       getEditImagesDetail(id,this.editmacform).then(response=>{
           if(response.data.state == 1){
-             this.editmacform = response.data.data.editmargin;
+           
              var editmargin = response.data.data.editmargin;
+             if(editmargin.jumpset == 1){
+                 this.define = true;
+             }
+             if(editmargin.jumpset == 2){
+                this.define = false;
+             }
+             this.editmacform = editmargin;
              console.log("返回导航数据",editmargin)
           }
       })
@@ -2270,44 +2278,71 @@ export default {
          
         }
      },
-  
-     AddMagiclinkData(formName){
-    
+     AddMagiclinkDataTwo(formName){
          if(this.maclinkform.instationlink == ""){
-            this.maclinkform.instationlink = 0;
+                this.maclinkform.instationlink = 0;
          }
-         var instationlink =  this.maclinkform.instationlink;
-         var instationlinks = parseInt(instationlink);
-         this.maclinkform.instationlink = instationlinks;
-         var articeType = this.maclinkform.articeType;
-         var articeTypes =  parseInt(articeType);
-         this.maclinkform.articeType = articeTypes;
-
-       if(this.maclinkform.title == ""){
-          this.maclinkform.title = 0;
-       }
-  
-       this.maclinkform.linkaddress = this.maclinkform.instationlink ;
         this.$refs[formName].validate((valid)=>{
           if(valid){
-            AddMagiclinkData(this.maclinkform).then(response=>{
-                if(response.data.state == 1){
-                  var magiclink =  response.data.data.magiclink;
-                  var patientMagiclink  = response.data.data.patientMagiclink;
-                 this.editmarginform.marginaddress = magiclink.linkaddress;
-                 this.editmarginform.linkid =  magiclink.id
-                  this.magicVisible = false;
-                  console.log("链接返回数据",magiclink)
-                  // this.maclinkform.articeType = "";
-                  this.maclinkform.instationlink = "";
-                  this.maclinkform.phone = "";
-                  this.maclinkform.outstationlink = "";
-                  // this.maclinkform.title = "";
-                }
+            AddMagiclinkDataTwo(this.maclinkform).then(response=>{
+              if(response.data.state == 1){
+                console.log("hhehheehehehheh")
+                 this.magicVisible = false;
+              }
             })
           }
         })
      },
+
+    //  AddMagiclinkData(formName){ 
+    //     this.$refs[formName].validate((valid)=>{
+    //       if(valid){
+    //        if(this.maclinkform.instationlink == ""){
+    //         this.maclinkform.instationlink = 0;
+    //      }
+    //      var instationlink =  this.maclinkform.instationlink;
+    //      var instationlinks = parseInt(instationlink);
+    //      this.maclinkform.instationlink = instationlinks;
+    //         AddMagiclinkData(this.maclinkform).then(response=>{
+    //             if(response.data.state == 1){
+    //                 this.magicVisible = false;
+    //               var magiclink =  response.data.data.magiclink;
+    //                console.log("链接返回数据",magiclink)
+    //               var model =  response.data.data.model;
+    //               console.log("model是什么",model)
+    //            if(model.mode_type == 1){
+    //                 this.editmacform.marginaddress = "javascript:;";
+    //             } 
+    //             if(model.mode_type == 2){
+    //                   this.editmarginform.marginaddress = "http://microweb.kuyicloud.com/#/hospitalIntroduction?id="+model.id+"&orgid="+this.$store.getters.xt_user.org_id;
+    //             }
+    //             if(model.mode_type == 3){
+    //                    this.editmarginform.marginaddress = "http://microweb.kuyicloud.com/#/officeIntroduction?id="+model.id+"&orgid="+this.$store.getters.xt_user.org_id;
+    //             }
+    //              if(model.mode_type == 4){
+    //                    this.editmarginform.marginaddress = "http://microweb.kuyicloud.com/#/medicalTeam?id="+model.id+"&orgid="+this.$store.getters.xt_user.org_id;
+    //             }
+    //            if(model.mode_type == 5){
+    //                 this.editmacform.marginaddress = "javascript:;";
+    //             }
+    //             if(model.mode_type == 6){
+    //                 this.editmarginform.marginaddress = "http://microweb.kuyicloud.com/#/news?id="+model.id+"&orgid="+this.$store.getters.xt_user.org_id;
+    //             }
+    //              if(model.mode_type == 7){
+    //                 this.editmarginform.marginaddress = "http://microweb.kuyicloud.com/#/activity?id="+model.id+"&orgid="+this.$store.getters.xt_user.org_id;
+    //             }
+    //             if(model.mode_type == 8){
+    //               this.editmacform.marginaddress = "javascript:;";
+    //             }
+    //              this.editmarginform.linkid =  magiclink.id
+    //               this.maclinkform.instationlink = "";
+    //               this.maclinkform.phone = "";
+    //               this.maclinkform.outstationlink = "";
+    //             }
+    //         })
+    //       }
+    //     })
+    //  },
      getMacLinkAddress(){
        getMacLinkAddress().then(response=>{
           if(response.data.state ==1){
@@ -2317,15 +2352,15 @@ export default {
           }
        })
      },
-     getCountImages(){
-       getCountImages().then(response=>{
-          if(response.data.state == 1){
-           var total =  response.data.data.total;
-           this.totalImages = total;
-           console.log("total是什么",total)
-          }
-       })
-     },
+    //  getCountImages(){
+    //    getCountImages().then(response=>{
+    //       if(response.data.state == 1){
+    //        var total =  response.data.data.total;
+    //        this.totalImages = total;
+    //        console.log("total是什么",total)
+    //       }
+    //    })
+    //  },
      getAllModelTitle(){
        getAllModelTitle().then(response=>{
           if(response.data.state == 1){
@@ -2359,6 +2394,7 @@ export default {
          if(valid){
           AddRotationVisibleForm(this.rotationvisibleform.id,this.rotationvisibleform).then(response=>{
                if(response.data.state == 1){
+                 this.rotationVisible = false;
                  var linkaddress =  response.data.data.linkaddress;
                  console.log("linkaddress",linkaddress);
                  this.editrotationform.linkaddress = linkaddress.defineaddress;
@@ -2377,7 +2413,7 @@ export default {
      this.getArticleType();
      this.getEnImages();
      this.getMacLinkAddress();
-     this.getCountImages();
+    //  this.getCountImages();
      this.getAllModelTitle();
    },
  

src/scrm_pages/site/index.vue

@@ -47,9 +47,9 @@
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
-import QRCode from "qrcodejs2";
-import { GetDefaultData, GetUserOrgid } from "@/api/site/site";
-import Vue from "vue";
+import QRCode from 'qrcodejs2';
+// import {GetDefaultData,GetUserOrgid} from '@/api/site/site';
+import Vue from 'vue';
 export default {
   name: "site",
   components: {
@@ -61,7 +61,9 @@ export default {
       codeImg: require("../../assets/home/wei.jpg"),
       usreOrgID: "",
       // url:"http://microweb.kuyicloud.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
-      url: "http://microweb.kuyicloud.com/#/microHome?orgid=3877"
+       url:"http://jk.test.sgjyun.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
+      // url:"http://microweb.kuyicloud.com/#/microHome?orgid=3877",
+
     };
   },
   methods: {
@@ -69,9 +71,8 @@ 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'
         // foreground: '#ff0'
@@ -113,7 +114,7 @@ export default {
   },
   created() {
     // this.GetUserOrgid();
-  }
+   }
 };
 </script>
 

src/styles/common.css

@@ -0,0 +1,124 @@
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+canvas,
+details,
+embed,
+figure,
+figcaption,
+footer,
+header,
+hgroup,
+menu,
+nav,
+output,
+ruby,
+section,
+summary,
+time,
+mark,
+audio,
+video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+  display: block;
+}
+body {
+  line-height: 1;
+}
+ol,
+ul {
+  list-style: none;
+}
+blockquote,
+q {
+  quotes: none;
+}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+  content: "";
+  content: none;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}

src/styles/iconfont.css

@@ -0,0 +1,19 @@
+@font-face {
+  font-family: "iconfont"; /* project id 1470572 */
+  src: url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.eot");
+  src: url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.eot?#iefix")
+      format("embedded-opentype"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.woff2") format("woff2"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.woff") format("woff"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.ttf") format("truetype"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.svg#iconfont") format("svg");
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased; /*字体清除锯齿效果*/
+  -webkit-text-stroke-width: 0.2px; /*文本外边框大小*/
+  -moz-osx-font-smoothing: grayscale;
+}

src/styles/mixin.1.scss

@@ -0,0 +1,27 @@
+@mixin border-top {
+  position: relative;
+
+  &::before {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    content: "";
+    height: 1px;
+    background: #e0e0e0;
+  }
+}
+
+@mixin border-bottom {
+  position: relative;
+
+  &::after {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    content: "";
+    height: 1px;
+    background: #e0e0e0;
+  }
+}